Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Fixed the drawer buttons' enable/disable behaviour

Arty Bishop1c1845a29dae
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt
index efb225ef..df6c343c 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt
@@ -33,6 +33,7 @@ import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.navigateUp
@@ -42,6 +43,8 @@ import com.rtbishop.look4sat.MainViewModel
import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.databinding.ActivityMainBinding
import com.rtbishop.look4sat.databinding.DrawerHeaderBinding
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
class MainActivity : AppCompatActivity() {
@@ -105,18 +108,6 @@ class MainActivity : AppCompatActivity() {
private fun setupObservers() {
viewModel.getDebugMessage().observe(this, Observer { message ->
Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
- when (message) {
- getString(R.string.update_loc_success) -> drawerBinding.drawerBtnLoc.isEnabled =
- true
- getString(R.string.update_tle_success) -> drawerBinding.drawerBtnTle.isEnabled =
- true
- getString(R.string.update_trans_success) -> drawerBinding.drawerBtnTrans.isEnabled =
- true
- getString(R.string.update_failure) -> {
- drawerBinding.drawerBtnTle.isEnabled = true
- drawerBinding.drawerBtnTrans.isEnabled = true
- }
- }
})
viewModel.getGSP().observe(this, Observer { gsp ->
@@ -129,16 +120,16 @@ class MainActivity : AppCompatActivity() {
private fun setupDrawer() {
drawerBinding.drawerBtnLoc.setOnClickListener {
- it.isEnabled = false
requestLocationUpdate()
+ it.lockButton()
}
drawerBinding.drawerBtnTle.setOnClickListener {
- it.isEnabled = false
viewModel.updateAndSaveTleFile()
+ it.lockButton()
}
drawerBinding.drawerBtnTrans.setOnClickListener {
- it.isEnabled = false
viewModel.updateTransmittersDatabase()
+ it.lockButton()
}
drawerBinding.drawerBtnGithub.setOnClickListener {
val githubIntent = Intent(Intent.ACTION_VIEW, Uri.parse(githubUrl))
@@ -147,6 +138,14 @@ class MainActivity : AppCompatActivity() {
drawerBinding.drawerBtnExit.setOnClickListener { finish() }
}
+ private fun View.lockButton() {
+ lifecycleScope.launch {
+ delay(3000)
+ }
+ }
+
private fun requestLocationUpdate() {
if (ContextCompat.checkSelfPermission(this, permLocation) != permGranted) {
if (ActivityCompat.shouldShowRequestPermissionRationale(this, permLocation)) {