fix(ui): move the my location fab in a bit

fixes: #2182

Author: growse

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Fix slow start caused by replacing the map SDK on every resume.
 - Fixed map to show a sensible view when the activity is being resumed
+- My location fab now has a little more space from the edge of the display
 
 ## Version 2.5.6
 

project/app/src/main/java/org/owntracks/android/ui/map/MapActivity.kt

@@ -107,6 +107,7 @@ class MapActivity :
       )
   private var service: BackgroundService? = null
   private var bottomSheetBehavior: BottomSheetBehavior<LinearLayoutCompat>? = null
+  private var navBarInset: Int = 0
   private var menu: Menu? = null
   private var sensorManager: SensorManager? = null
   private var orientationSensor: Sensor? = null
@@ -299,11 +300,20 @@ class MapActivity :
           // Apply bottom insets to FABs to avoid navigation bar
           ViewCompat.setOnApplyWindowInsetsListener(mapCoordinatorLayout) { _, windowInsets ->
             val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val fabMargin = resources.getDimensionPixelSize(R.dimen.fab_margin)
+
+            navBarInset = insets.bottom
 
             fabMapLayers.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-              bottomMargin = insets.bottom + resources.getDimensionPixelSize(R.dimen.fab_margin)
+              bottomMargin = insets.bottom + fabMargin
+            }
+
+            fabMyLocation.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+              marginEnd = insets.right + fabMargin
             }
 
+            bottomSheetBehavior?.state?.let { updateFabMyLocationPosition(it) }
+
             windowInsets
           }
         }
@@ -819,9 +829,9 @@ class MapActivity :
       bottomMargin =
           when (bottomSheetState) {
             BottomSheetBehavior.STATE_COLLAPSED -> {
-              bottomSheetBehavior?.peekHeight ?: bottom
+              (bottomSheetBehavior?.peekHeight ?: 0) + navBarInset
             }
-            else -> bottom
+            else -> navBarInset
           }
     }
   }