meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: improve connection status feedback using new wantConfig state

Browse source
This commit is contained in:
andrekir 2024-05-01 09:23:54 -03:00 • committed by Andre K
parent 78d99e44d0
commit a12c5052bc
5 changed files with 58 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -188,32 +188,24 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
updateNodeInfo()
}
model.localConfig.asLiveData().observe(viewLifecycleOwner) {
if (!model.isConnected()) {
val configCount = it.allFields.size
val configTotal = ConfigProtos.Config.getDescriptor().fields.size
if (configCount > 0)
scanModel.setErrorText("Device config ($configCount / $configTotal)")
} else updateNodeInfo()
}
model.wantConfigState.asLiveData().observe(viewLifecycleOwner) {
if (model.isConnected()) return@observe
val configTotal = ConfigProtos.Config.getDescriptor().fields.size
val moduleTotal = ModuleConfigProtos.ModuleConfig.getDescriptor().fields.size
model.moduleConfig.asLiveData().observe(viewLifecycleOwner) {
if (!model.isConnected()) {
val moduleCount = it.allFields.size
val moduleTotal = ModuleConfigProtos.ModuleConfig.getDescriptor().fields.size
if (moduleCount > 0)
scanModel.setErrorText("Module config ($moduleCount / $moduleTotal)")
} else updateNodeInfo()
}
model.channels.asLiveData().observe(viewLifecycleOwner) {
if (!model.isConnected()) {
val maxChannels = model.maxChannels
if (!it.hasLoraConfig() && it.settingsCount > 0)
scanModel.setErrorText("Channels (${it.settingsCount} / $maxChannels)")
binding.scanStatusText.text = when {
it.moduleCount > 0 -> "Module config (${it.moduleCount} / $moduleTotal)"
it.configCount > 0 -> "Device config (${it.configCount} / $configTotal)"
it.channelCount > 0 -> "Channels (${it.channelCount} / ${model.maxChannels})"
it.nodeCount > 0 -> "Nodes (${it.nodeCount} / 100)"
else -> return@observe
}
}
model.localConfig.asLiveData().observe(viewLifecycleOwner) {
if (model.isConnected()) updateNodeInfo()
}
// Also watch myNodeInfo because it might change later
model.myNodeInfo.asLiveData().observe(viewLifecycleOwner) {
updateNodeInfo()