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

Minor tweaks

pull/489/head
PWRxPSYCHO 2022-10-06 17:18:11 -04:00
rodzic b1291e28a7
commit edec10a550
1 zmienionych plików z 18 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
Wyświetl plik

@ -112,20 +112,24 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
binding.mapStyleButton.setOnClickListener {
chooseMapStyle()
}
model.nodeDB.nodes.value?.let { nodes ->
if (binding.cacheLayout.visibility == View.GONE) {
model.nodeDB.nodes.value?.let { nodes ->
onNodesChanged(nodes.values)
drawOverlays()
}
}
}
if (binding.cacheLayout.visibility == View.GONE) {
// Any times nodes change update our map
model.nodeDB.nodes.observe(viewLifecycleOwner) { nodes ->
onNodesChanged(nodes.values)
drawOverlays()
}
}
// Any times nodes change update our map
model.nodeDB.nodes.observe(viewLifecycleOwner) { nodes ->
onNodesChanged(nodes.values)
drawOverlays()
}
model.waypoints.observe(viewLifecycleOwner) {
debug("New waypoints received: ${it.size}")
onWaypointChanged(it.values)
drawOverlays()
model.waypoints.observe(viewLifecycleOwner) {
debug("New waypoints received: ${it.size}")
onWaypointChanged(it.values)
drawOverlays()
}
}
zoomToNodes(mapController)
}
@ -309,6 +313,9 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
Toast.makeText(activity, "Download complete!", Toast.LENGTH_LONG)
.show()
writer.onDetach()
binding.downloadButton.show()
binding.cacheLayout.visibility = View.GONE
setupMapProperties()
drawOverlays()
}