diff --git a/.idea/misc.xml b/.idea/misc.xml
index 861f27d..18d8717 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,9 @@
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index dae1b73..1876569 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.pm.PackageManager
+import android.os.BatteryManager
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
@@ -17,54 +18,44 @@ import com.sudo.androidd20.databinding.ActivityMainBinding
class MainActivity : AppCompatActivity() {
private lateinit var binding: ActivityMainBinding
private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(this)
- requestLocationPermission()
- registerReceiver(this.batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+ binding.btLocation.setOnClickListener() {
+ requestLocation()
+ }
+ registerReceiver(this.mBatteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
}
- private fun requestLocationPermission() {
+ private val mBatteryReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+ override fun onReceive(context: Context?, intent: Intent?) {
+ val power = intent?.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
+ binding.tvBattery.text = power.toString() + "%"
+ }
+
+ }
+ private fun requestLocation() {
val task = fusedLocationProviderClient.lastLocation
if (ActivityCompat.checkSelfPermission(
this,
android.Manifest.permission.ACCESS_FINE_LOCATION
- ) !=
- PackageManager.PERMISSION_GRANTED &&
- ActivityCompat.checkSelfPermission(
- this,
- android.Manifest.permission.ACCESS_COARSE_LOCATION
- ) !=
- PackageManager.PERMISSION_GRANTED
+ ) != PackageManager.PERMISSION_GRANTED
) {
ActivityCompat.requestPermissions(
this,
arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION),
- 101
+ 1
)
return
}
-
- binding.buttonBasic.setOnClickListener {
- task.addOnSuccessListener {
- val locationStr = "Latitude: ${it.latitude} Longitude:${it.longitude}"
- if (it != null) {
- Toast.makeText(this, locationStr, Toast.LENGTH_LONG).show()
- binding.tvLocation.text = locationStr
- } else
- Toast.makeText(this, "No location found", Toast.LENGTH_LONG).show()
- }
+ task.addOnSuccessListener {
+ val location = "None Gps Location"
+ binding.tvLocation.text = location
}
}
- private val batteryReceiver: BroadcastReceiver = object : BroadcastReceiver() {
- override fun onReceive(context: Context, intent: Intent) {
- val level = intent.getIntExtra("level", 0)
- val bat = "$level%"
- binding.tvBattery.text = bat
- }
- }
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8fe51a8..23c248d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,10 +7,10 @@
tools:context=".MainActivity">