Fix marker info window covering search bar and filter row

Part of #12
AaroKoinsaari · Nov 6, 2024 · 0e6210b · 0e6210b
1 parent b886b66
commit 0e6210b
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 42 deletions.
diff --git a/app/src/main/java/com/aarokoinsaari/accessibilitymap/view/screens/MapScreen.kt b/app/src/main/java/com/aarokoinsaari/accessibilitymap/view/screens/MapScreen.kt
@@ -74,6 +74,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import com.aarokoinsaari.accessibilitymap.R
 import com.aarokoinsaari.accessibilitymap.intent.MapIntent
 import com.aarokoinsaari.accessibilitymap.model.AccessibilityInfo
@@ -204,8 +205,12 @@ fun MapScreen(
                 onClusterItemClick = { clusterItem ->
                     onIntent(MapIntent.MapClick(clusterItem))
                     coroutineScope.launch {
+                        val adjustedPosition = LatLng(
+                            clusterItem.position.latitude + 0.003,
+                            clusterItem.position.longitude
+                        )
                         cameraPositionState.animate(
-                            update = CameraUpdateFactory.newLatLng(clusterItem.position),
+                            update = CameraUpdateFactory.newLatLng(adjustedPosition),
                             durationMs = 200
                         )
                     }
@@ -231,6 +236,42 @@ fun MapScreen(
             )
         }
 
+        // Since ClusterItem info windows currently cannot be customized,
+        // for now the only reasonable solution is to insert the custom info
+        // window according to the selected cluster item. This should be changed
+        // when the issue mentioned above is closed and Marker Composables can be used instead.
+        state.selectedClusterItem?.let { selectedItem ->
+            val screenPosition =
+                cameraPositionState.projection?.toScreenLocation(selectedItem.position)
+
+            if (screenPosition != null) {
+                var popupSize by remember { mutableStateOf(IntSize.Zero) }
+                val markerHeight =
+                    with(LocalDensity.current) { 24.dp.roundToPx() }
+
+                MarkerInfoWindow(
+                    item = selectedItem,
+                    onClick = { onIntent(MapIntent.SelectPlace(selectedItem.placeData)) },
+                    modifier = Modifier
+                        .onGloballyPositioned { coordinates ->
+                            popupSize = coordinates.size
+                        }
+                        .offset {
+                            IntOffset(
+                                x = screenPosition.x - (popupSize.width / 2),
+                                y = screenPosition.y - popupSize.height - markerHeight
+                            )
+                        }
+                        .background(
+                            color = Color.White,
+                            shape = RoundedCornerShape(16.dp)
+                        )
+                        .padding(16.dp)
+                        .clickable { onIntent(MapIntent.SelectPlace(selectedItem.placeData)) }
+                )
+            }
+        }
+
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -263,7 +304,9 @@ fun MapScreen(
                         )
                     }
                 },
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .zIndex(1f)
             )
 
             FilterChipRow(
@@ -273,6 +316,7 @@ fun MapScreen(
                     .fillMaxWidth()
                     .background(Color.Transparent)
                     .padding(horizontal = 12.dp, vertical = 4.dp)
+                    .zIndex(1f)
             )
         }
 
@@ -304,42 +348,6 @@ fun MapScreen(
                 )
             }
         }
-
-        // Since ClusterItem info windows currently cannot be customized,
-        // for now the only reasonable solution is to insert the custom info
-        // window according to the selected cluster item. This should be changed
-        // when the issue mentioned above is closed and Marker Composables can be used instead.
-        state.selectedClusterItem?.let { selectedItem ->
-            val screenPosition =
-                cameraPositionState.projection?.toScreenLocation(selectedItem.position)
-
-            if (screenPosition != null) {
-                var popupSize by remember { mutableStateOf(IntSize.Zero) }
-                val markerHeight =
-                    with(LocalDensity.current) { 24.dp.roundToPx() }
-
-                MarkerInfoWindow(
-                    item = selectedItem,
-                    onClick = { onIntent(MapIntent.SelectPlace(selectedItem.placeData)) },
-                    modifier = Modifier
-                        .onGloballyPositioned { coordinates ->
-                            popupSize = coordinates.size
-                        }
-                        .offset {
-                            IntOffset(
-                                x = screenPosition.x - (popupSize.width / 2),
-                                y = screenPosition.y - popupSize.height - markerHeight
-                            )
-                        }
-                        .background(
-                            color = Color.White,
-                            shape = RoundedCornerShape(16.dp)
-                        )
-                        .padding(16.dp)
-                        .clickable { onIntent(MapIntent.SelectPlace(selectedItem.placeData)) }
-                )
-            }
-        }
     }
 }
 
@@ -555,10 +563,10 @@ private fun moveCameraToUserLocation(
 
 private fun AccessibilityStatus?.getAccessibilityStatusStringRes(): Int =
     when (this) {
-        FULLY_ACCESSIBLE -> R.string.wheelchair_access_fully_accessible
-        LIMITED_ACCESSIBILITY -> R.string.wheelchair_access_limited_accessibility
-        NOT_ACCESSIBLE -> R.string.wheelchair_access_not_accessible
-        else -> R.string.wheelchair_access_unknown
+        FULLY_ACCESSIBLE -> R.string.accessibility_status_yes
+        LIMITED_ACCESSIBILITY -> R.string.accessibility_status_limited
+        NOT_ACCESSIBLE -> R.string.no
+        else -> R.string.accessibility_status_unknown
     }
 
 private fun AccessibilityStatus.getAccessibilityColor(): Color =

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -54,4 +54,5 @@
     <string name="place_details_basic_details_headline">Accessibility</string>
     <string name="place_details_basic_details_parking">Parking:</string>
     <string name="place_details_basic_details_floor">On floor:</string>
+    <string name="accessibility_status_limited">limited</string>
 </resources>