summaryrefslogtreecommitdiff
path: root/android-app/app/src/main/kotlin
diff options
context:
space:
mode:
authorPeter Stone <thepeterstone@gmail.com>2026-04-06 18:03:39 +0000
committerPeter Stone <thepeterstone@gmail.com>2026-04-06 18:03:39 +0000
commitd98b441f2f9ca8b11a04406240dd19ecc0cac7ab (patch)
treeabb88ca0c20f2a2f5b171ad5b679bd19c219aa7d /android-app/app/src/main/kotlin
parent676314e3b5ad2445e64120c691fd1c2671076ebb (diff)
feat(nav): replace Map+Instruments with Map+Layers in bottom nav
Layers acts as an action button — shows LayerPickerSheet and snaps back to Map so it never stays selected. Instruments tab removed; sheet expand/collapse via swipe as before. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'android-app/app/src/main/kotlin')
-rw-r--r--android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt15
1 files changed, 11 insertions, 4 deletions
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
index de1f4dd..0309364 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
@@ -130,10 +130,17 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener {
bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
true
}
- R.id.nav_instruments -> {
- hideOverlays()
- bottomSheetBehavior.isHideable = false
- bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+ R.id.nav_layers -> {
+ // Action button — show picker then snap back to Map
+ val currentStyle = loadedStyleFlow.value
+ if (currentStyle != null) {
+ LayerPickerSheet(
+ manager = layerManager,
+ onBaseChanged = { preset -> layerManager.setBasePreset(currentStyle, preset) },
+ onWindChanged = { enabled -> layerManager.setWindEnabled(currentStyle, enabled) }
+ ).show(supportFragmentManager, "layer_picker")
+ }
+ bottomNav.post { bottomNav.selectedItemId = R.id.nav_map }
true
}
R.id.nav_log -> {