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

don't briefly pop up fields with "null" as content

pull/234/head
Kevin Hester 2021-02-07 11:27:37 +08:00
rodzic 97b2b3c471
commit d3a1107cd3
1 zmienionych plików z 8 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -574,6 +574,10 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
/// Setup the ui widgets unrelated to BLE scanning /// Setup the ui widgets unrelated to BLE scanning
private fun initCommonUI() { private fun initCommonUI() {
// We want to leave these visible in the IDE, but make sure they default to not visible until we have valid data
binding.positionBroadcastPeriodView.visibility = View.GONE
binding.lsSleepView.visibility = View.GONE
model.ownerName.observe(viewLifecycleOwner, { name -> model.ownerName.observe(viewLifecycleOwner, { name ->
binding.usernameEditText.setText(name) binding.usernameEditText.setText(name)
}) })
@ -587,8 +591,10 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
model.isConnected.observe(viewLifecycleOwner, Observer { connectionState -> model.isConnected.observe(viewLifecycleOwner, Observer { connectionState ->
val connected = connectionState == MeshService.ConnectionState.CONNECTED val connected = connectionState == MeshService.ConnectionState.CONNECTED
binding.usernameView.isEnabled = connected binding.usernameView.isEnabled = connected
binding.positionBroadcastPeriodView.isEnabled = connected
binding.lsSleepView.isEnabled = connected // Don't even show advanced fields until after we have a connection
binding.positionBroadcastPeriodView.visibility = if (connected) View.VISIBLE else View.GONE
binding.lsSleepView.visibility = if (connected) View.VISIBLE else View.GONE
if (connectionState == MeshService.ConnectionState.DISCONNECTED) if (connectionState == MeshService.ConnectionState.DISCONNECTED)
model.ownerName.value = "" model.ownerName.value = ""