From 34923ce743691930946a0804a8f01ffec089c036 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Tue, 29 Apr 2025 15:47:37 +1000
Subject: [PATCH] fix: add search bar padding for maps

---
 .../kotlin/moe/lava/banksia/native/maps/Maps.android.kt       | 4 ++--
 composeApp/src/commonMain/kotlin/moe/lava/banksia/App.kt      | 2 +-
 .../commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt    | 3 ++-
 .../iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt   | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt b/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt
index 2ba3497..ce9cab3 100644
--- a/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt
+++ b/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt
@@ -54,7 +54,7 @@ actual fun Maps(
     polylines: List<Polyline>,
     newCameraPosition: Pair<Point, Pair<Point, Point>?>?,
     cameraPositionUpdated: () -> Unit,
-    extInsets: Int,
+    extInsets: WindowInsets,
 ) {
     var camPos = rememberCameraPositionState()
     val ctx = LocalContext.current
@@ -93,7 +93,7 @@ actual fun Maps(
             myLocationButtonEnabled = false,
             mapToolbarEnabled = false,
         ),
-        contentPadding = WindowInsets.safeDrawing.add(WindowInsets(bottom = extInsets)).asPaddingValues()
+        contentPadding = WindowInsets.safeDrawing.add(extInsets).asPaddingValues()
     ) {
         for (marker in markers) {
             Marker(
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/banksia/App.kt b/composeApp/src/commonMain/kotlin/moe/lava/banksia/App.kt
index b1229bf..fc027af 100644
--- a/composeApp/src/commonMain/kotlin/moe/lava/banksia/App.kt
+++ b/composeApp/src/commonMain/kotlin/moe/lava/banksia/App.kt
@@ -158,7 +158,7 @@ fun App() {
                 modifier = Modifier.fillMaxSize(),
                 newCameraPosition = newCameraPosition,
                 cameraPositionUpdated = { newCameraPosition = null },
-                extInsets = extInsets,
+                extInsets = WindowInsets(top = with(LocalDensity.current) { 56.dp.roundToPx() }, bottom = extInsets),
                 polylines = polylines,
             )
             Searcher(
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt b/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt
index b2afb24..509174a 100644
--- a/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt
+++ b/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt
@@ -1,5 +1,6 @@
 package moe.lava.banksia.native.maps
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -21,5 +22,5 @@ expect fun Maps(
     // <Centre: Point, Bounds?: <Northeast, Southwest>>
     newCameraPosition: Pair<Point, Pair<Point, Point>?>? = Pair(Point(-37.8136, 144.9631), null),
     cameraPositionUpdated: () -> Unit,
-    extInsets: Int,
+    extInsets: WindowInsets,
 )
diff --git a/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt b/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt
index eb20020..cf22226 100644
--- a/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt
+++ b/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt
@@ -1,5 +1,6 @@
 package moe.lava.banksia.native.maps
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -20,7 +21,7 @@ actual fun Maps(
     polylines: List<Polyline>,
     newCameraPosition: Pair<Point, Pair<Point, Point>?>?,
     cameraPositionUpdated: () -> Unit,
-    extInsets: Int,
+    extInsets: WindowInsets,
 ) {
     TODO("Not yet implemented")
 }