kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
Minor tweaks
rodzic
b1291e28a7
commit
edec10a550
|
@ -112,11 +112,14 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
|
||||||
binding.mapStyleButton.setOnClickListener {
|
binding.mapStyleButton.setOnClickListener {
|
||||||
chooseMapStyle()
|
chooseMapStyle()
|
||||||
}
|
}
|
||||||
|
if (binding.cacheLayout.visibility == View.GONE) {
|
||||||
model.nodeDB.nodes.value?.let { nodes ->
|
model.nodeDB.nodes.value?.let { nodes ->
|
||||||
onNodesChanged(nodes.values)
|
onNodesChanged(nodes.values)
|
||||||
drawOverlays()
|
drawOverlays()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (binding.cacheLayout.visibility == View.GONE) {
|
||||||
// Any times nodes change update our map
|
// Any times nodes change update our map
|
||||||
model.nodeDB.nodes.observe(viewLifecycleOwner) { nodes ->
|
model.nodeDB.nodes.observe(viewLifecycleOwner) { nodes ->
|
||||||
onNodesChanged(nodes.values)
|
onNodesChanged(nodes.values)
|
||||||
|
@ -127,6 +130,7 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
|
||||||
onWaypointChanged(it.values)
|
onWaypointChanged(it.values)
|
||||||
drawOverlays()
|
drawOverlays()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
zoomToNodes(mapController)
|
zoomToNodes(mapController)
|
||||||
}
|
}
|
||||||
downloadBtn.setOnClickListener(this)
|
downloadBtn.setOnClickListener(this)
|
||||||
|
@ -309,6 +313,9 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
|
||||||
Toast.makeText(activity, "Download complete!", Toast.LENGTH_LONG)
|
Toast.makeText(activity, "Download complete!", Toast.LENGTH_LONG)
|
||||||
.show()
|
.show()
|
||||||
writer.onDetach()
|
writer.onDetach()
|
||||||
|
binding.downloadButton.show()
|
||||||
|
binding.cacheLayout.visibility = View.GONE
|
||||||
|
setupMapProperties()
|
||||||
drawOverlays()
|
drawOverlays()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue