mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-01 19:33:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Looking into why boolean is not being set

Browse Source
This commit is contained in:
PWRxPSYCHO
2022-03-10 09:38:56 -05:00
parent e58e12ad5e
commit 262808e952
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
View File

@@ -98,7 +98,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
private var tileRegionDownloadSuccess = false
private var stylePackDownloadSuccess = false
private val userTouchPosition = GeoJsonSource(GeoJsonSource.Builder(userTouchPositionId))
@@ -574,29 +573,28 @@ class MapFragment : ScreenFragment("Map"), Logging {
R.string.save_btn, null
)
.setNeutralButton(R.string.view_region_btn) { _, _ ->
if (tileRegionDownloadSuccess && stylePackDownloadSuccess) {
mapView?.getMapboxMap().also {
it?.flyTo(
CameraOptions.Builder()
.zoom(ZOOM)
.center(point)
.build(),
MapAnimationOptions.mapAnimationOptions { duration(1000) })
if (userStyleURI != null) {
it?.loadStyleUri(userStyleURI.toString())
} else {
it?.getStyle().also { style ->
style?.removeStyleImage(userPointImageId)
}
mapView?.getMapboxMap().also {
it?.flyTo(
CameraOptions.Builder()
.zoom(ZOOM)
.center(point)
.build(),
MapAnimationOptions.mapAnimationOptions { duration(1000) })
if (userStyleURI != null) {
it?.loadStyleUri(userStyleURI.toString())
} else {
it?.getStyle().also { style ->
style?.removeStyleImage(userPointImageId)
}
}
} else {
Toast.makeText(
requireContext(),
R.string.no_download_region_alert,
Toast.LENGTH_SHORT
).show()
}
// } else {
// Toast.makeText(
// requireContext(),
// R.string.no_download_region_alert,
// Toast.LENGTH_SHORT
// ).show()
// }
}
.setNegativeButton(
R.string.cancel