Overlay menu in NavigationBarLayer

Author: bailuk

aat-android/src/main/kotlin/ch/bailu/aat/map/MapFactory.kt

@@ -39,7 +39,7 @@ class MapFactory(private val m: MapsForgeViewBase, activityContext: ActivityCont
 
     private fun base() {
         m.add(CurrentLocationLayer(mc, d))
-        m.add(NavigationBarLayer(c, mc, d, 4))
+        m.add(NavigationBarLayer(appContext, c, mc, d))
     }
 
     fun split(usageTracker: UsageTrackerInterface): MapsForgeViewBase {
@@ -113,7 +113,7 @@ class MapFactory(private val m: MapsForgeViewBase, activityContext: ActivityCont
         m.add(GpxDynLayer(s, mc, ser, d, InfoID.FILE_VIEW))
         m.add(CurrentLocationLayer(mc, d))
         m.add(GridDynLayer(ser, s, mc))
-        m.add(NavigationBarLayer(c, mc, d))
+        m.add(NavigationBarLayer(appContext, c, mc, d))
         m.add(InformationBarLayer(appContext, c, mc, d))
         return m
     }

aat-android/src/main/kotlin/ch/bailu/aat/map/layer/InformationBarLayer.kt

@@ -9,7 +9,6 @@ import ch.bailu.aat.menus.MapQueryMenu
 import ch.bailu.aat.util.ui.theme.AppTheme
 import ch.bailu.aat.util.ui.tooltip.ToolTip
 import ch.bailu.aat.views.bar.ControlBar
-import ch.bailu.aat.views.preferences.dialog.SolidCheckListDialog
 import ch.bailu.aat_lib.api.nominatim.NominatimReverseController
 import ch.bailu.aat_lib.app.AppContext
 import ch.bailu.aat_lib.dispatcher.DispatcherInterface
@@ -19,11 +18,10 @@ import ch.bailu.aat_lib.map.edge.Position
 import ch.bailu.aat_lib.preferences.StorageInterface
 import ch.bailu.aat_lib.preferences.map.SolidLegend
 import ch.bailu.aat_lib.preferences.map.SolidMapGrid
-import ch.bailu.aat_lib.preferences.map.overlay.SolidOverlayList
 import ch.bailu.aat_lib.resources.Res
 
 class InformationBarLayer(
-    private val appContext: AppContext,
+    appContext: AppContext,
     private val context: Context,
     private val mcontext: MapContext,
     dispatcher: DispatcherInterface
@@ -35,7 +33,6 @@ class InformationBarLayer(
     private val map = bar.addImageButton(R.drawable.open_menu)
     private val search = bar.addImageButton(R.drawable.edit_find)
     private val location = bar.addImageButton(R.drawable.find_location)
-    private val overlays = bar.addImageButton(R.drawable.view_paged)
     private val selector = NodeViewLayer(appContext, context, mcontext)
     private val reverseController = NominatimReverseController(appContext, mcontext.getMapView())
 
@@ -49,7 +46,6 @@ class InformationBarLayer(
         ToolTip.set(grid, Res.str().tt_info_grid())
         ToolTip.set(legend, Res.str().tt_info_legend())
         ToolTip.set(location, Res.str().tt_info_location())
-        ToolTip.set(overlays, Res.str().p_overlay())
 
         dispatcher.addTarget(selector, InfoID.ALL)
         reverseController.addToDispatcher(dispatcher)
@@ -63,8 +59,6 @@ class InformationBarLayer(
             MapQueryMenu(context, mcontext).showAsPopup(v.getContext(), v)
         } else if (v === location) {
             LocationMenu(context, mcontext.getMapView(), reverseController).showAsPopup(v.getContext(), location)
-        } else if (v === overlays) {
-            SolidCheckListDialog(context, SolidOverlayList.createMapOverlayList(appContext))
         }
     }
 

aat-android/src/main/kotlin/ch/bailu/aat/map/layer/NavigationBarLayer.kt

@@ -12,6 +12,8 @@ import ch.bailu.aat.util.ui.AppLayout
 import ch.bailu.aat.util.ui.theme.AppTheme
 import ch.bailu.aat.util.ui.tooltip.ToolTip
 import ch.bailu.aat.views.bar.ControlBar
+import ch.bailu.aat.views.preferences.dialog.SolidCheckListDialog
+import ch.bailu.aat_lib.app.AppContext
 import ch.bailu.aat_lib.dispatcher.DispatcherInterface
 import ch.bailu.aat_lib.dispatcher.TargetInterface
 import ch.bailu.aat_lib.dispatcher.usage.UsageTrackerAlwaysEnabled
@@ -21,29 +23,33 @@ import ch.bailu.aat_lib.map.MapContext
 import ch.bailu.aat_lib.map.edge.Position
 import ch.bailu.aat_lib.map.layer.BoundingCycler
 import ch.bailu.aat_lib.preferences.map.SolidPositionLock
+import ch.bailu.aat_lib.preferences.map.overlay.SolidOverlayList
+import ch.bailu.aat_lib.resources.Res
 
-class NavigationBarLayer(context: Context,
+class NavigationBarLayer(private val appContext: AppContext,
+                         private val context: Context,
                          private val mcontext: MapContext,
-                         d: DispatcherInterface,
-                         i: Int = AppLayout.DEFAULT_VISIBLE_BUTTON_COUNT) : ControlBarLayer(
-    mcontext, ControlBar(context, getOrientation(Position.BOTTOM), AppTheme.bar, i), Position.BOTTOM
+                         d: DispatcherInterface) : ControlBarLayer(
+    mcontext, ControlBar(context, getOrientation(Position.BOTTOM), AppTheme.bar, 5), Position.BOTTOM
 ), TargetInterface {
 
     private val buttonPlus: View = bar.addImageButton(R.drawable.zoom_in)
     private val buttonMinus: View = bar.addImageButton(R.drawable.zoom_out)
-    private val buttonFrame: View
+    private val lock = bar.addSolidIndexButton(
+        SolidPositionLock(Storage(context), mcontext.getSolidKey())
+    )
+    private val buttonFrame: View = bar.addImageButton(R.drawable.zoom_fit_best)
+    private val overlays = bar.addImageButton(R.drawable.view_paged)
 
     private val boundingCycler = BoundingCycler(UsageTrackerAlwaysEnabled())
 
     init {
-        val lock = bar.addSolidIndexButton(
-            SolidPositionLock(Storage(context), mcontext.getSolidKey())
-        )
-        buttonFrame = bar.addImageButton(R.drawable.zoom_fit_best)
         ToolTip.set(buttonPlus, R.string.tt_map_zoomin)
         ToolTip.set(buttonMinus, R.string.tt_map_zoomout)
         ToolTip.set(buttonFrame, R.string.tt_map_frame)
         ToolTip.set(lock, R.string.tt_map_home)
+        ToolTip.set(overlays, Res.str().p_overlay())
+
         d.addTarget(this, InfoID.ALL)
         val volumeView = VolumeView(context)
         volumeView.visibility = View.INVISIBLE
@@ -58,6 +64,8 @@ class NavigationBarLayer(context: Context,
             mcontext.getMapView().zoomOut()
         } else if (v === buttonFrame) {
             boundingCycler.onAction(mcontext)
+        }else if (v === overlays) {
+            SolidCheckListDialog(context, SolidOverlayList.createMapOverlayList(appContext))
         }
     }
 
@@ -77,7 +85,8 @@ class NavigationBarLayer(context: Context,
         override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {}
 
         override fun onHardwareButtonPressed(code: Int, type: AbsHardwareButtons.EventType): Boolean {
-            if (To.view(mcontext.getMapView())!!.visibility == VISIBLE) {
+            val view = To.view(mcontext.getMapView())
+            if (view is View && view.visibility == VISIBLE) {
                 if (code == KeyEvent.KEYCODE_VOLUME_UP) {
                     if (type === AbsHardwareButtons.EventType.DOWN) mcontext.getMapView().zoomIn()
                     return true