fix(iOS): Make map padding uniform (#717)

mbta · Feb 7, 2025 · 97fe0b0 · 97fe0b0
1 parent e962754
commit 97fe0b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/iosApp/iosApp/Pages/Map/AnnotatedMap.swift b/iosApp/iosApp/Pages/Map/AnnotatedMap.swift
@@ -48,7 +48,10 @@ struct AnnotatedMap: View {
             .debugOptions(devDebugMode ? .camera : [])
             .cameraBounds(.init(maxZoom: 18, minZoom: 6))
             .onCameraChanged { change in handleCameraChange(change) }
-            .ornamentOptions(.init(scaleBar: .init(visibility: .hidden)))
+            .ornamentOptions(.init(
+                scaleBar: .init(visibility: .hidden),
+                attributionButton: .init(margins: .init(x: 0, y: 8))
+            ))
             .onLayerTapGesture(StopLayerGenerator.shared.stopLayerId, perform: handleTapStopLayer)
             .onLayerTapGesture(StopLayerGenerator.shared.stopTouchTargetLayerId, perform: handleTapStopLayer)
             .onStyleLoaded { _ in
@@ -61,7 +64,8 @@ struct AnnotatedMap: View {
                     handleStyleLoaded()
                 }
             }
-            .additionalSafeAreaInsets(.bottom, sheetHeight)
+            .additionalSafeAreaInsets(.bottom, sheetHeight + 8)
+            .additionalSafeAreaInsets(.top, 20)
             .accessibilityIdentifier("transitMap")
             .onReceive(viewportProvider.cameraStatePublisher) { newCameraState in
                 zoomLevel = newCameraState.zoom

diff --git a/iosApp/iosApp/Pages/Map/HomeMapView.swift b/iosApp/iosApp/Pages/Map/HomeMapView.swift
@@ -208,9 +208,9 @@ struct HomeMapView: View {
 
     private var crosshairs: some View {
         VStack {
-            Image("map-nearby-location-cursor")
+            Image(.mapNearbyLocationCursor)
             Spacer()
-                .frame(height: sheetHeight)
+                .frame(height: sheetHeight - 12)
         }
     }