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

improve settings tab UI

pull/461/head
andrekir 2022-07-29 19:33:40 -03:00
rodzic 277db36a46
commit 6071fec804
1 zmienionych plików z 4 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package com.geeksville.mesh.ui package com.geeksville.mesh.ui
import android.annotation.SuppressLint
import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothDevice
import android.companion.CompanionDeviceManager import android.companion.CompanionDeviceManager
import android.content.* import android.content.*
@ -62,8 +61,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
private val myActivity get() = requireActivity() as MainActivity private val myActivity get() = requireActivity() as MainActivity
@SuppressLint("MissingPermission") private val associationResultLauncher = registerForActivityResult(
val associationResultLauncher = registerForActivityResult(
ActivityResultContracts.StartIntentSenderForResult() ActivityResultContracts.StartIntentSenderForResult()
) { ) {
it.data it.data
@ -210,7 +208,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
spinner.isEnabled = true spinner.isEnabled = true
// If actively connected possibly let the user update firmware // If actively connected possibly let the user update firmware
refreshUpdateButton(region != ConfigProtos.Config.LoRaConfig.RegionCode.Unset) refreshUpdateButton(model.isConnected())
// Update the status string (highest priority messages first) // Update the status string (highest priority messages first)
val info = model.myNodeInfo.value val info = model.myNodeInfo.value
@ -220,12 +218,9 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
(permissionsWarning != null) -> (permissionsWarning != null) ->
statusText.text = permissionsWarning statusText.text = permissionsWarning
region == ConfigProtos.Config.LoRaConfig.RegionCode.Unset ->
statusText.text = getString(R.string.must_set_region)
connected == MeshService.ConnectionState.CONNECTED -> { connected == MeshService.ConnectionState.CONNECTED -> {
val fwStr = info?.firmwareString ?: "unknown" statusText.text = if (region.number == 0) getString(R.string.must_set_region)
statusText.text = getString(R.string.connected_to).format(fwStr) else getString(R.string.connected_to).format(info?.firmwareString ?: "unknown")
} }
connected == MeshService.ConnectionState.DISCONNECTED -> connected == MeshService.ConnectionState.DISCONNECTED ->
statusText.text = getString(R.string.not_connected) statusText.text = getString(R.string.not_connected)