chore: Upgrade build Xcode version to 26.2 (#1522)

* chore: Upgrade build Xcode version to 26.2

* fix: iOS 26 sheet height inconsistency

* chore: Upgrade ViewInspector

* test: Fix broken tests

Author: EmmaSimon

.github/actions/setup/action.yml

@@ -125,7 +125,7 @@ runs:
       if: steps.settings.outputs.xcode == 'true'
       shell: bash
       run: |
-        sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer
+        sudo xcode-select --switch /Applications/Xcode_26.2.app/Contents/Developer
     - name: Generate Xcode project
       if: steps.settings.outputs.xcode == 'true'
       shell: bash

fastlane/Fastfile

@@ -214,7 +214,7 @@ platform :ios do
     run_tests(
       workspace: 'iosApp/iosApp.xcworkspace',
       scheme: 'Staging',
-      device: 'iPhone 16 (18.5)',
+      device: 'iPhone 16 (26.2)',
       testplan: 'iosAppRetries',
       output_directory: options[:output_directory],
       include_simulator_logs: true,

iosApp/iosApp.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -52,12 +52,13 @@ struct ContentView: View {
     }
 
     var body: some View {
-        GeometryReader { proxy in
-            VStack {
-                contents
-            }
-            .onAppear { contentHeight = proxy.size.height }
-            .onChange(of: proxy.size.height) { contentHeight = $0 }
+        VStack {
+            contents
+        }
+        .onGeometryChange(for: CGFloat.self) { proxy in
+            proxy.frame(in: .global).height
+        } action: { height in
+            contentHeight = height
         }
         .onReceive(inspection.notice) { inspection.visit(self, $0) }
         .onAppear {
@@ -336,8 +337,8 @@ struct ContentView: View {
                         )
                         .toolbar(.hidden, for: .tabBar)
                     }
-                    // Set id per trip so that transitioning from one trip to another is handled by removing
-                    // the existing trip view & creating a new one
+                    // Set id per trip so that transitioning from one trip to another is handled
+                    // by removing the existing trip view & creating a new one
                     .id(filter.tripId)
                     .transition(transition)
                     .animation(.easeOut, value: filter.tripId)
@@ -519,37 +520,38 @@ struct ContentView: View {
                         && contentVM.onboardingScreensPending != nil
                 ),
                 content: {
-                    GeometryReader { proxy in
-                        VStack {
-                            navSheetContents
-                                .presentationDetents([.small, .medium, .almostFull], selection: $selectedDetent)
-                                .interactiveDismissDisabled()
-                                .modifier(AllowsBackgroundInteraction())
-                        }
-                        // within the sheet to prevent issues on iOS 16 with two modal views open at once
-                        .fullScreenCover(
-                            item: .constant(nav.coverItemIdentifiable()),
-                            onDismiss: {
-                                // Don't navigate back if hideMaps has been changed and the cover is being switched over
-                                if hideMaps { return }
-                                switch nearbyVM.navigationStack.last {
-                                case .alertDetails, .more, .saveFavorite: nearbyVM.goBack()
-                                default: break
-                                }
-                            },
-                            content: coverContents
-                        )
-                        .onChange(of: sheetRoute) { [oldSheetRoute = sheetRoute] newSheetRoute in
-                            if let oldSheetRoute,
-                               let newSheetRoute,
-                               SheetRoutes.companion.shouldResetSheetHeight(first: oldSheetRoute,
-                                                                            second: newSheetRoute) {
-                                selectedDetent = .medium
+                    VStack {
+                        navSheetContents
+                            .presentationDetents([.small, .medium, .almostFull], selection: $selectedDetent)
+                            .interactiveDismissDisabled()
+                            .modifier(AllowsBackgroundInteraction())
+                    }
+                    // within the sheet to prevent issues on iOS 16 with two modal views open at once
+                    .fullScreenCover(
+                        item: .constant(nav.coverItemIdentifiable()),
+                        onDismiss: {
+                            // Don't navigate back if hideMaps has been changed and the cover is being switched over
+                            if hideMaps { return }
+                            switch nearbyVM.navigationStack.last {
+                            case .alertDetails, .more, .saveFavorite: nearbyVM.goBack()
+                            default: break
                             }
-                            errorBannerVM.setSheetRoute(sheetRoute: newSheetRoute)
+                        },
+                        content: coverContents
+                    )
+                    .onChange(of: sheetRoute) { [oldSheetRoute = sheetRoute] newSheetRoute in
+                        if let oldSheetRoute,
+                           let newSheetRoute,
+                           SheetRoutes.companion.shouldResetSheetHeight(first: oldSheetRoute,
+                                                                        second: newSheetRoute) {
+                            selectedDetent = .medium
                         }
-                        .onAppear { recordSheetHeight(proxy.size.height) }
-                        .onChange(of: proxy.size.height) { newValue in recordSheetHeight(newValue) }
+                        errorBannerVM.setSheetRoute(sheetRoute: newSheetRoute)
+                    }
+                    .onGeometryChange(for: CGFloat.self) { proxy in
+                        proxy.frame(in: .global).height
+                    } action: { height in
+                        recordSheetHeight(height)
                     }
                 }
             )
@@ -682,7 +684,13 @@ struct ContentView: View {
          Only update this if we're less than half way up the users screen. Otherwise,
          the entire map is blocked by the sheet anyway, so it doesn't need to respond to height changes
          */
-        guard newSheetHeight < ((contentHeight - 8) * PresentationDetent.mediumDetentFraction) else { return }
+
+        let mediumSheetHeight = if #available(iOS 26, *) {
+            (contentHeight * PresentationDetent.mediumDetentFraction) - 17
+        } else {
+            (contentHeight * PresentationDetent.mediumDetentFraction) - 5
+        }
+        guard newSheetHeight < mediumSheetHeight else { return }
         sheetHeight = newSheetHeight
     }
 

iosApp/iosApp/ContentView.swift

@@ -63,6 +63,10 @@ struct AnnotatedMap: View {
         self.viewportProvider = viewportProvider
     }
 
+    var bottomSheetInsetPadding: CGFloat {
+        if #available(iOS 26, *) { 4.0 } else { 0.0 }
+    }
+
     var body: some View {
         map
             .gestureOptions(.init(
@@ -89,8 +93,7 @@ struct AnnotatedMap: View {
                     handleStyleLoaded()
                 }
             }
-
-            .additionalSafeAreaInsets(.bottom, sheetHeight)
+            .additionalSafeAreaInsets(.bottom, sheetHeight + bottomSheetInsetPadding)
             .additionalSafeAreaInsets(.top, 20)
             .ignoresSafeArea(.all)
             .onChange(of: showPuck) { _ in handleStyleLoaded() }

iosApp/iosApp/Pages/Map/AnnotatedMap.swift

@@ -35,7 +35,7 @@ final class ContentViewTests: XCTestCase {
 
         ViewHosting.host(view: sut)
 
-        try sut.inspect().find(ContentView.self).find(ViewType.GeometryReader.self)
+        try sut.inspect().find(ContentView.self).find(ViewType.VStack.self)
             .callOnChange(newValue: ScenePhase.background)
         wait(for: [disconnectedExpectation], timeout: 5)
     }
@@ -54,10 +54,10 @@ final class ContentViewTests: XCTestCase {
 
         ViewHosting.host(view: sut)
 
-        try sut.inspect().find(ContentView.self).find(ViewType.GeometryReader.self)
+        try sut.inspect().find(ContentView.self).find(ViewType.VStack.self)
             .callOnChange(newValue: ScenePhase.background)
         wait(for: [disconnectedExpectation], timeout: 1)
-        try sut.inspect().find(ContentView.self).find(ViewType.GeometryReader.self)
+        try sut.inspect().find(ContentView.self).find(ViewType.VStack.self)
             .callOnChange(newValue: ScenePhase.active)
         wait(for: [connectedExpectation], timeout: 1)
     }
@@ -80,7 +80,7 @@ final class ContentViewTests: XCTestCase {
 
         ViewHosting.host(view: sut)
 
-        try sut.inspect().find(ContentView.self).find(ViewType.GeometryReader.self)
+        try sut.inspect().find(ContentView.self).find(ViewType.VStack.self)
             .callOnChange(newValue: ScenePhase.active)
         wait(for: [joinAlertsExp], timeout: 5)
     }
@@ -99,7 +99,7 @@ final class ContentViewTests: XCTestCase {
 
         ViewHosting.host(view: sut)
 
-        try sut.inspect().find(ContentView.self).find(ViewType.GeometryReader.self)
+        try sut.inspect().find(ContentView.self).find(ViewType.VStack.self)
             .callOnChange(newValue: ScenePhase.background)
         wait(for: [leavesAlertsExp], timeout: 5)
     }

iosApp/iosAppTests/Views/ContentViewTests.swift

@@ -97,7 +97,7 @@ packages:
     from: 1.5.1
   ViewInspector:
     url: https://github.com/nalexn/ViewInspector
-    from: 0.10.2
+    from: 0.10.3
 targets:
   iosApp:
     type: application