mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix region changes not updating UI

pull/458/head
andrekir 2022-07-26 22:28:19 -03:00
rodzic 436ac1af47
commit 9cdaf6f79a
1 zmienionych plików z 10 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
Wyświetl plik

@ -145,13 +145,19 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
private fun updateNodeInfo() { private fun updateNodeInfo() {
val connected = model.connectionState.value val connected = model.connectionState.value
val isConnected = connected == MeshService.ConnectionState.CONNECTED binding.nodeSettings.visibility = if (model.isConnected()) View.VISIBLE else View.GONE
binding.nodeSettings.visibility = if (isConnected) View.VISIBLE else View.GONE binding.provideLocationCheckbox.visibility = if (model.isConnected()) View.VISIBLE else View.GONE
binding.provideLocationCheckbox.visibility = if (isConnected) View.VISIBLE else View.GONE
if (connected == MeshService.ConnectionState.DISCONNECTED) if (connected == MeshService.ConnectionState.DISCONNECTED)
model.setOwner("") model.setOwner("")
if (model.gpsDisabled) {
model.provideLocation.value = false
binding.provideLocationCheckbox.isChecked = false
} else {
binding.provideLocationCheckbox.isEnabled = isGooglePlayAvailable(requireContext())
}
// update the region selection from the device // update the region selection from the device
val region = model.region val region = model.region
val spinner = binding.regionSpinner val spinner = binding.regionSpinner
@ -243,12 +249,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
} }
model.localConfig.observe(viewLifecycleOwner) { model.localConfig.observe(viewLifecycleOwner) {
binding.provideLocationCheckbox.isEnabled = updateNodeInfo()
isGooglePlayAvailable(requireContext()) && !model.gpsDisabled
if (model.gpsDisabled) {
model.provideLocation.value = false
binding.provideLocationCheckbox.isChecked = false
}
} }
// Also watch myNodeInfo because it might change later // Also watch myNodeInfo because it might change later