Merge branch 'refs/heads/main' into kb-xcode-16-bumps

mbta · Oct 16, 2024 · 5308b5c · 5308b5c
2 parents a390dee + a92d47b
commit 5308b5c
Show file tree

Hide file tree

Showing 55 changed files with 880 additions and 476 deletions.
diff --git a/...src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitPageTest.kt b/...src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitPageTest.kt
@@ -195,6 +195,8 @@ class NearbyTransitPageTest : KoinTest {
 
                         override var lastUpdated: Instant? = null
 
+                        override fun shouldForgetPredictions(predictionCount: Int) = false
+
                         override fun disconnect() {
                             /* no-op */
                         }

diff --git a/...src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitViewTest.kt b/...src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitViewTest.kt
@@ -189,6 +189,8 @@ class NearbyTransitViewTest : KoinTest {
 
                         override var lastUpdated: Instant? = null
 
+                        override fun shouldForgetPredictions(predictionCount: Int) = false
+
                         override fun disconnect() {
                             /* no-op */
                         }

diff --git a/...App/src/androidTest/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsViewTest.kt b/...App/src/androidTest/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsViewTest.kt
@@ -135,6 +135,8 @@ class StopDetailsViewTest {
 
                         override var lastUpdated: Instant? = null
 
+                        override fun shouldForgetPredictions(predictionCount: Int) = false
+
                         override fun disconnect() {
                             /* no-op */
                         }

diff --git a/...App/src/androidTest/java/com/mbta/tid/mbta_app/android/util/SubscribeToPredictionsTest.kt b/...App/src/androidTest/java/com/mbta/tid/mbta_app/android/util/SubscribeToPredictionsTest.kt
@@ -59,6 +59,8 @@ class SubscribeToPredictionsTest {
 
                 override var lastUpdated: Instant? = null
 
+                override fun shouldForgetPredictions(predictionCount: Int) = false
+
                 override fun disconnect() {
                     check(isConnected) { "called disconnect when not connected" }
                     isConnected = false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidx-navigationCompose = "2.8.1"
 agp = "8.5.2"
 # see https://developer.android.com/develop/ui/compose/bom/bom-mapping
 # and https://developer.android.com/jetpack/androidx/releases/compose for release notes
-compose-bom = "2024.09.00"
+compose-bom = "2024.09.03"
 datastorePreferencesCore = "1.1.1"
 kotlin = "2.0.20"
 javaphoenixclient = "1.3.1"
@@ -18,7 +18,7 @@ mapbox = "11.3.0"
 mapboxTurf = "6.15.0"
 mokkery = "2.3.0"
 okhttp = "4.12.0"
-okio = "3.9.0"
+okio = "3.9.1"
 sentry = "0.9.0"
 skie = "0.9.2"
 spatialk = "0.3.0"

diff --git a/iosApp/iosApp/ComponentViews/ErrorBanner.swift b/iosApp/iosApp/ComponentViews/ErrorBanner.swift
@@ -13,9 +13,12 @@ struct ErrorBanner: View {
     var repo: IErrorBannerStateRepository
     @State var state: ErrorBannerState?
 
+    let loadingWhenPredictionsStale: Bool
+
     let inspection = Inspection<Self>()
 
-    init(repo: IErrorBannerStateRepository = RepositoryDI().errorBanner) {
+    init(loadingWhenPredictionsStale: Bool, repo: IErrorBannerStateRepository = RepositoryDI().errorBanner) {
+        self.loadingWhenPredictionsStale = loadingWhenPredictionsStale
         self.repo = repo
         state = repo.state.value
     }
@@ -42,17 +45,21 @@ struct ErrorBanner: View {
                 }))
             }
         case let .stalePredictions(state):
-            IconCard(
-                iconName: "clock.arrow.circlepath",
-                details: Text("Updated \(state.minutesAgo(), specifier: "%ld") minutes ago")
-            ) {
-                AnyView(Button(action: {
-                    repo.clearState()
-                    state.action()
-                }, label: {
-                    Image(systemName: "arrow.clockwise")
-                        .accessibilityLabel("Refresh predictions")
-                }))
+            if loadingWhenPredictionsStale {
+                ProgressView()
+            } else {
+                IconCard(
+                    iconName: "clock.arrow.circlepath",
+                    details: Text("Updated \(state.minutesAgo(), specifier: "%ld") minutes ago")
+                ) {
+                    AnyView(Button(action: {
+                        repo.clearState()
+                        state.action()
+                    }, label: {
+                        Image(systemName: "arrow.clockwise")
+                            .accessibilityLabel("Refresh predictions")
+                    }))
+                }
             }
         case nil:
             // for some reason, .collect on an EmptyView doesn't work
@@ -62,7 +69,15 @@ struct ErrorBanner: View {
 }
 
 #Preview {
-    ErrorBanner(repo: MockErrorBannerStateRepository(
-        state: .StalePredictions(lastUpdated: Date.now.addingTimeInterval(-2 * 60).toKotlinInstant(), action: {})
-    ))
+    VStack(spacing: 16) {
+        ErrorBanner(loadingWhenPredictionsStale: false, repo: MockErrorBannerStateRepository(
+            state: .DataError(action: {})
+        ))
+        ErrorBanner(loadingWhenPredictionsStale: false, repo: MockErrorBannerStateRepository(
+            state: .StalePredictions(lastUpdated: Date.now.addingTimeInterval(-2 * 60).toKotlinInstant(), action: {})
+        ))
+        ErrorBanner(loadingWhenPredictionsStale: true, repo: MockErrorBannerStateRepository(
+            state: .StalePredictions(lastUpdated: Date.now.addingTimeInterval(-2 * 60).toKotlinInstant(), action: {})
+        ))
+    }
 }
diff --git a/iosApp/iosApp/ContentView.swift b/iosApp/iosApp/ContentView.swift
@@ -1,8 +1,8 @@
 import CoreLocation
+@_spi(Experimental) import MapboxMaps
 import shared
 import SwiftPhoenixClient
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 struct ContentView: View {
     @Environment(\.scenePhase) private var scenePhase

diff --git a/iosApp/iosApp/ContentViewModel.swift b/iosApp/iosApp/ContentViewModel.swift
@@ -7,8 +7,8 @@
 //
 
 import Foundation
-import shared
 @_spi(Experimental) import MapboxMaps
+import shared
 
 class ContentViewModel: ObservableObject {
     @Published var configResponse: ApiResult<ConfigResponse>?

diff --git a/iosApp/iosApp/Fetchers/ViewportProvider.swift b/iosApp/iosApp/Fetchers/ViewportProvider.swift
@@ -7,10 +7,9 @@
 //
 
 import Combine
-import shared
-import SwiftUI
 @_spi(Experimental) import MapboxMaps
 import shared
+import SwiftUI
 
 class ViewportProvider: ObservableObject {
     enum Defaults {

diff --git a/iosApp/iosApp/Localizable.xcstrings b/iosApp/iosApp/Localizable.xcstrings
@@ -347,6 +347,9 @@
     },
     "select location" : {
 
+    },
+    "Service Change" : {
+      "comment" : "Possible alert effect"
     },
     "Service ended" : {
 

diff --git a/iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift b/iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift
@@ -32,6 +32,7 @@ struct AlertDetails: View {
         switch alert.effect {
         case .detour: NSLocalizedString("Detour", comment: "Possible alert effect")
         case .dockClosure: NSLocalizedString("Dock Closure", comment: "Possible alert effect")
+        case .serviceChange: NSLocalizedString("Service Change", comment: "Possible alert effect")
         case .shuttle: NSLocalizedString("Shuttle", comment: "Possible alert effect")
         case .stationClosure: NSLocalizedString("Station Closure", comment: "Possible alert effect")
         case .stopClosure: NSLocalizedString("Stop Closure", comment: "Possible alert effect")

diff --git a/iosApp/iosApp/Pages/Map/AnnotatedMap.swift b/iosApp/iosApp/Pages/Map/AnnotatedMap.swift
@@ -6,9 +6,9 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
+@_spi(Experimental) import MapboxMaps
 import shared
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 struct AnnotatedMap: View {
     static let annotationTextZoomThreshold = 19.0
@@ -28,6 +28,7 @@ struct AnnotatedMap: View {
 
     @ObservedObject var viewportProvider: ViewportProvider
     @Environment(\.colorScheme) var colorScheme
+    @Environment(\.scenePhase) var scenePhase
 
     var handleCameraChange: (CameraChanged) -> Void
     var handleStyleLoaded: () -> Void
@@ -53,13 +54,18 @@ struct AnnotatedMap: View {
                 // The initial run of this happens before any required data is loaded, so it does nothing and
                 // handleTryLayerInit always performs the first layer creation, but once the data is in place,
                 // this handles any time the map is reloaded again, like for a light/dark mode switch.
-                handleStyleLoaded()
+                if scenePhase == .active {
+                    // onStyleLoaded was unexpectedly called when app moved to background because the colorScheme
+                    // changes twice while backgrounding. Ensure it is only called when the app is active.
+                    handleStyleLoaded()
+                }
             }
             .additionalSafeAreaInsets(.bottom, sheetHeight)
             .accessibilityIdentifier("transitMap")
             .onReceive(viewportProvider.cameraStatePublisher) { newCameraState in
                 zoomLevel = newCameraState.zoom
             }
+            .withScenePhaseHandlers(onActive: onActive)
             .task {
                 do {
                     mapDebug = try await getSettingUsecase.execute(setting: .map).boolValue
@@ -69,6 +75,11 @@ struct AnnotatedMap: View {
             }
     }
 
+    func onActive() {
+        // re-load styles in case the colorScheme changed while in the background
+        handleStyleLoaded()
+    }
+
     private var allVehicles: [Vehicle]? {
         switch (vehicles, selectedVehicle) {
         case (.none, .none): nil

diff --git a/iosApp/iosApp/Pages/Map/AnnotationLabel.swift b/iosApp/iosApp/Pages/Map/AnnotationLabel.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
-import SwiftUI
 @_spi(Experimental) import MapboxMaps
+import SwiftUI
 
 extension View {
     func annotationLabel<Content: View>(_ content: Content) -> ModifiedContent<Self, FloatingLabel<Content>> {

diff --git a/iosApp/iosApp/Pages/Map/HomeMapView.swift b/iosApp/iosApp/Pages/Map/HomeMapView.swift
@@ -6,10 +6,10 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
+@_spi(Experimental) import MapboxMaps
 import os
 import shared
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 struct HomeMapView: View {
     var analytics: NearbyTransitAnalytics = AnalyticsProvider.shared
@@ -34,8 +34,6 @@ struct HomeMapView: View {
     @State var vehiclesRepository: IVehiclesRepository
     @State var vehiclesData: [Vehicle]?
 
-    @State var upcomingRoutePatterns: Set<String> = .init()
-
     @StateObject var locationDataManager: LocationDataManager
     @Binding var sheetHeight: CGFloat
 

diff --git a/iosApp/iosApp/Pages/Map/HomeMapViewHandlerExtension.swift b/iosApp/iosApp/Pages/Map/HomeMapViewHandlerExtension.swift
@@ -6,9 +6,9 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
+@_spi(Experimental) import MapboxMaps
 import shared
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 /*
  Functions for handling interactions with the map, like prop change, navigation, and tapping.
@@ -101,7 +101,9 @@ extension HomeMapView {
         leaveVehiclesChannel()
         vehiclesRepository.connect(routeId: routeId, directionId: directionId) { outcome in
             if case let .ok(result) = onEnum(of: outcome) {
-                vehiclesData = Array(result.data.vehicles.values)
+                if let departures = nearbyVM.departures {
+                    vehiclesData = Array(departures.filterVehiclesByUpcoming(vehicles: result.data).values)
+                }
             }
         }
     }

diff --git a/iosApp/iosApp/Pages/Map/HomeMapViewLayerExtension.swift b/iosApp/iosApp/Pages/Map/HomeMapViewLayerExtension.swift
@@ -6,9 +6,9 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
+@_spi(Experimental) import MapboxMaps
 import shared
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 /*
  Functions for manipulating the layers displayed on the map.
@@ -60,13 +60,13 @@ extension HomeMapView {
 
     func refreshMap() {
         if let layerManager = mapVM.layerManager {
+            updateGlobalMapDataSources()
             if layerManager.currentScheme != colorScheme {
                 layerManager.addIcons(recreate: true)
                 addLayers(layerManager, recreate: true)
             } else {
                 addLayers(layerManager)
             }
-            updateGlobalMapDataSources()
         }
     }
 

diff --git a/iosApp/iosApp/Pages/Map/MapLayerManager.swift b/iosApp/iosApp/Pages/Map/MapLayerManager.swift
@@ -6,10 +6,10 @@
 //  Copyright © 2024 MBTA. All rights reserved.
 //
 
+@_spi(Experimental) import MapboxMaps
 import os
 import shared
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 protocol IMapLayerManager {
     var currentScheme: ColorScheme? { get }
@@ -56,6 +56,13 @@ class MapLayerManager: IMapLayerManager {
         }
     }
 
+    /*
+     Adds persistent layers so that they are persisted even if the underlying map style changes. To intentionally
+     re-create the layers due to a change that corresponds with a style change (such as colorScheme changing),
+     set recreate to true.
+
+     https://docs.mapbox.com/ios/maps/api/11.5.0/documentation/mapboxmaps/stylemanager/addpersistentlayer(_:layerposition:)
+     */
     func addLayers(colorScheme: ColorScheme, recreate: Bool = false) {
         let colorPalette = getColorPalette(colorScheme: colorScheme)
         currentScheme = colorScheme
@@ -76,9 +83,9 @@ class MapLayerManager: IMapLayerManager {
                 }
 
                 if map.layerExists(withId: "puck") {
-                    try map.addLayer(layer, layerPosition: .below("puck"))
+                    try map.addPersistentLayer(layer, layerPosition: .below("puck"))
                 } else {
-                    try map.addLayer(layer)
+                    try map.addPersistentLayer(layer)
                 }
             } catch {
                 Logger().error("Failed to add layer \(layer.id)\n\(error)")

diff --git a/iosApp/iosApp/Pages/Map/MapViewModel.swift b/iosApp/iosApp/Pages/Map/MapViewModel.swift
@@ -8,8 +8,8 @@
 
 import Combine
 import Foundation
-import shared
 @_spi(Experimental) import MapboxMaps
+import shared
 
 class MapViewModel: ObservableObject {
     @Published var selectedVehicle: Vehicle?

diff --git a/iosApp/iosApp/Pages/NearbyTransit/NearbyTransitPageView.swift b/iosApp/iosApp/Pages/NearbyTransit/NearbyTransitPageView.swift
@@ -8,16 +8,17 @@
 
 import Combine
 import CoreLocation
+@_spi(Experimental) import MapboxMaps
 import os
 import shared
 import SwiftUI
-@_spi(Experimental) import MapboxMaps
 
 struct NearbyTransitPageView: View {
     @ObservedObject var nearbyVM: NearbyViewModel
     @ObservedObject var viewportProvider: ViewportProvider
 
     @State var location: CLLocationCoordinate2D?
+    @State var isReturningFromBackground = false
 
     let inspection = Inspection<Self>()
 
@@ -34,7 +35,7 @@ struct NearbyTransitPageView: View {
             Color.fill1.ignoresSafeArea(.all)
             VStack {
                 SheetHeader(title: String(localized: "Nearby Transit", comment: "Header for nearby transit sheet"))
-                ErrorBanner()
+                ErrorBanner(loadingWhenPredictionsStale: isReturningFromBackground)
                 if viewportProvider.isManuallyCentering {
                     LoadingCard { Text("select location") }
                 } else {
@@ -44,6 +45,7 @@ struct NearbyTransitPageView: View {
                         },
                         state: $nearbyVM.nearbyState,
                         location: $location,
+                        isReturningFromBackground: $isReturningFromBackground,
                         nearbyVM: nearbyVM
                     )