feat(iOS): Elevator alerts on nearby & unfiltered

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -131,6 +131,7 @@
 		9A320F962CD3E4CF0096D7B1 /* UpcomingTripAccessibilityFormatters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A320F952CD3E4CF0096D7B1 /* UpcomingTripAccessibilityFormatters.swift */; };
 		9A3739942D3AD67200BBE127 /* InfoIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3739932D3AD67200BBE127 /* InfoIcon.swift */; };
 		9A3739962D3AEC4500BBE127 /* AlertCardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3739952D3AEC4500BBE127 /* AlertCardTests.swift */; };
+		9A3739982D41450100BBE127 /* SettingsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3739972D41450100BBE127 /* SettingsExtension.swift */; };
 		9A37F3052BACCC40001714FE /* DoubleRoundedExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A37F3042BACCC40001714FE /* DoubleRoundedExtension.swift */; };
 		9A37F3072BACCCA5001714FE /* CoordinateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A37F3062BACCCA5001714FE /* CoordinateExtension.swift */; };
 		9A392C972CC0497C00DE1FBE /* ErrorBannerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A392C962CC0497C00DE1FBE /* ErrorBannerViewModel.swift */; };
@@ -435,6 +436,7 @@
 		9A320F952CD3E4CF0096D7B1 /* UpcomingTripAccessibilityFormatters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpcomingTripAccessibilityFormatters.swift; sourceTree = "<group>"; };
 		9A3739932D3AD67200BBE127 /* InfoIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoIcon.swift; sourceTree = "<group>"; };
 		9A3739952D3AEC4500BBE127 /* AlertCardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertCardTests.swift; sourceTree = "<group>"; };
+		9A3739972D41450100BBE127 /* SettingsExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsExtension.swift; sourceTree = "<group>"; };
 		9A37F3042BACCC40001714FE /* DoubleRoundedExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoubleRoundedExtension.swift; sourceTree = "<group>"; };
 		9A37F3062BACCCA5001714FE /* CoordinateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoordinateExtension.swift; sourceTree = "<group>"; };
 		9A392C962CC0497C00DE1FBE /* ErrorBannerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorBannerViewModel.swift; sourceTree = "<group>"; };
@@ -1116,6 +1118,7 @@
 				9A18DEAC2D07DDC800DA0A3B /* RouteExtension.swift */,
 				9A4850562CB56A1500F50EE7 /* RouteTypeExtension.swift */,
 				6EFEE42C2BED0FA800810319 /* ScenePhaseChangeModifier.swift */,
+				9A3739972D41450100BBE127 /* SettingsExtension.swift */,
 				8CE0141A2BBF059A00918FAE /* SheetNavigationStackEntry.swift */,
 				9ADB84A12BAE37C0006581CE /* StopExtension.swift */,
 				8C0923A62C210C8C00813454 /* Typography.swift */,
@@ -1544,6 +1547,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9A3739982D41450100BBE127 /* SettingsExtension.swift in Sources */,
 				6EC6F18F2CE665DB0022799F /* StopDetailsDownstreamAlert.swift in Sources */,
 				9A6A51EF2C652BB100E3AC13 /* AlertActivePeriodFormattingExtension.swift in Sources */,
 				9AF29DF82CF5454E005AA4A3 /* StopDetailsFilteredView.swift in Sources */,

iosApp/iosApp/ComponentViews/AlertCard.swift

@@ -13,6 +13,7 @@ enum AlertCardSpec {
     case major
     case downstream
     case secondary
+    case elevator
 }
 
 struct AlertCard: View {
@@ -44,6 +45,7 @@ struct AlertCard: View {
                 ex. "[Detour] ahead", "[Shuttle buses] ahead"
                 """
             ), effectName)
+        case .elevator: alert.header ?? effectName
         default: effectName
         }
     }
@@ -54,8 +56,10 @@ struct AlertCard: View {
             HStack(spacing: 16) {
                 AlertIcon(alertState: alert.alertState, color: color)
                     .frame(width: iconSize, height: iconSize)
+                    .frame(maxHeight: spec == .elevator ? .infinity : iconSize, alignment: .top)
                 Text(headerString)
                     .font(spec == .major ? Typography.title2Bold : Typography.bodySemibold)
+                    .multilineTextAlignment(.leading)
                 if spec != .major {
                     Spacer()
                     InfoIcon(size: infoIconSize)

iosApp/iosApp/ComponentViews/AlertIcon.swift

@@ -19,6 +19,7 @@ struct AlertIcon: View {
     }
 
     private static let iconNames: [StopAlertState: String] = [
+        .elevator: "accessibility-icon-inaccessible",
         .issue: "alert-borderless-issue",
         .shuttle: "alert-borderless-shuttle",
         .suspension: "alert-borderless-suspension",

iosApp/iosApp/ContentView.swift

@@ -56,7 +56,7 @@
         .onAppear {
             Task { await contentVM.loadFeaturePromos() }
             Task { await contentVM.loadOnboardingScreens() }
-            Task { await nearbyVM.loadDebugSetting() }
+            Task { await nearbyVM.loadSettings() }
             analytics.recordSession(colorScheme: colorScheme)
             analytics.recordSession(voiceOver: voiceOver)
             analytics.recordSession(hideMaps: contentVM.hideMaps)
@@ -69,7 +69,7 @@
             } catch {}
         }
         .onChange(of: selectedTab) { _ in
-            Task { await nearbyVM.loadDebugSetting() }
+            Task { await nearbyVM.loadSettings() }
         }
         .onChange(of: scenePhase) { newPhase in
             if newPhase == .active {
@@ -369,7 +369,7 @@
         }
     }
 
     private func recenterOnVehicleButtonInfo() -> (RouteType, Vehicle, Stop)? {
         guard case let .stopDetails(stopId: _, stopFilter: stopFilter, tripFilter: tripFilter) = nearbyVM
             .navigationStack.lastSafe(),
             let selectedVehicle = mapVM.selectedVehicle, tripFilter?.vehicleId == selectedVehicle.id,
@@ -384,8 +384,8 @@
         let entry = coverIdentityEntry.stackEntry
         return NavigationStack {
             switch entry {
-            case let .alertDetails(alertId, line, routes):
-                AlertDetailsPage(alertId: alertId, line: line, routes: routes, nearbyVM: nearbyVM)
+            case let .alertDetails(alertId, line, routes, stop):
+                AlertDetailsPage(alertId: alertId, line: line, routes: routes, stop: stop, nearbyVM: nearbyVM)
             default:
                 EmptyView()
             }
@@ -406,4 +406,4 @@
             content.presentationBackgroundInteraction(.enabled(upThrough: .halfScreen))
         }
     }
 }

iosApp/iosApp/Localizable.xcstrings

@@ -3524,6 +3524,47 @@
         }
       }
     },
+    "Elevator Closure" : {
+      "comment" : "Possible alert effect",
+      "localizations" : {
+        "es" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Cierre del Ascensor"
+          }
+        },
+        "ht" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Fèmti Asansè"
+          }
+        },
+        "pt-BR" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Fechamento de elevador"
+          }
+        },
+        "vi" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Đóng thang máy"
+          }
+        },
+        "zh-Hans-CN" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "电梯关闭"
+          }
+        },
+        "zh-Hant-TW" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "電梯關閉"
+          }
+        }
+      }
+    },
     "End" : {
       "comment" : "Label for the end date of a disruption",
       "localizations" : {

iosApp/iosApp/Pages/AlertDetails/AlertDetails.swift

@@ -9,11 +9,12 @@
 import shared
 import SwiftUI
 
 struct AlertDetails: View {
     var analytics: Analytics = AnalyticsProvider.shared
     var alert: shared.Alert
     var line: Line?
     var routes: [Route]?
+    var stop: Stop?
     var affectedStops: [Stop]
     var stopId: String?
     var now: Date
@@ -23,8 +24,12 @@
 
     @State var areStopsExpanded = false
 
-    private var routeLabel: String {
-        line?.longName ?? routes?.first?.label ?? ""
+    private var routeLabel: String? {
+        line?.longName ?? routes?.first?.label
+    }
+
+    private var stopLabel: String? {
+        stop?.name
     }
 
     private var effectLabel: String? {
@@ -99,16 +104,26 @@
         }
     }
 
-    @ViewBuilder
-    private var alertTitle: some View {
-        VStack(alignment: .leading, spacing: 10) {
-            if let effectLabel {
+    @ViewBuilder var effectTitle: some View {
+        if let effectLabel {
+            if let routeLabel {
                 Text("\(routeLabel) \(effectLabel)",
                      comment: """
                      First value is the route label, second value is an alert effect, \
                      resulting in something like 'Red Line Suspension' or 'Green Line Shuttle'
-                     """).font(.title2).bold()
+                     """)
+            } else if let stopLabel {
+                Text("\(stopLabel) \(effectLabel)")
+            } else {
+                Text(effectLabel)
             }
+        }
+    }
+
+    @ViewBuilder
+    private var alertTitle: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            effectTitle.font(Typography.title2Bold)
             if let causeLabel { Text(causeLabel).font(.body).bold() }
         }
     }

iosApp/iosApp/Pages/AlertDetails/AlertDetailsPage.swift

@@ -13,6 +13,7 @@ struct AlertDetailsPage: View {
     var alertId: String
     var line: Line?
     var routes: [Route]?
+    var stop: Stop?
     var nearbyVM: NearbyViewModel
     var errorBannerRepository: IErrorBannerStateRepository = RepositoryDI().errorBanner
     var globalRepository: IGlobalRepository = RepositoryDI().global
@@ -73,6 +74,10 @@ struct AlertDetailsPage: View {
                     .aspectRatio(contentMode: .fit)
                     .scaledToFit()
                     .frame(maxHeight: modeIconHeight, alignment: .topLeading)
+            } else if alert?.effect == .elevatorClosure {
+                AlertIcon(alertState: .elevator)
+                    .scaledToFit()
+                    .frame(maxHeight: modeIconHeight, alignment: .topLeading)
             }
             Text("Alert Details", comment: "Header on the alert details page").font(.headline)
             Spacer()
@@ -93,6 +98,7 @@ struct AlertDetailsPage: View {
                     alert: alert,
                     line: line,
                     routes: routes,
+                    stop: stop,
                     affectedStops: affectedStops,
                     stopId: nearbyVM.navigationStack.lastStopId,
                     now: now
@@ -140,7 +146,7 @@ struct AlertDetailsPage: View {
         // navigate back to the previous page.
         if alert == nil, nextAlert == nil {
             nearbyVM.navigationStack.removeAll { nav in
-                if case let .alertDetails(alertId, _, _) = nav {
+                if case let .alertDetails(alertId, _, _, _) = nav {
                     alertId == self.alertId
                 } else {
                     false

iosApp/iosApp/Pages/LegacyStopDetails/StopDetailsFilteredRouteView.swift

@@ -177,7 +177,8 @@
                                                 pushNavEntry(.alertDetails(
                                                     alertId: alert.id,
                                                     line: patternsByStop.line,
-                                                    routes: patternsByStop.routes
+                                                    routes: patternsByStop.routes,
+                                                    stop: patternsByStop.stop
                                                 ))
                                                 analytics.tappedAlertDetailsLegacy(
                                                     routeId: patternsByStop.routeIdentifier,
@@ -197,7 +198,8 @@
                                                 pushNavEntry(.alertDetails(
                                                     alertId: alert.id,
                                                     line: patternsByStop.line,
-                                                    routes: patternsByStop.routes
+                                                    routes: patternsByStop.routes,
+                                                    stop: patternsByStop.stop
                                                 ))
                                                 analytics.tappedAlertDetailsLegacy(
                                                     routeId: patternsByStop.routeIdentifier,
@@ -227,7 +229,7 @@
                                                 routeType: patternsByStop.representativeRoute.type,
                                                 noTrips: noTrips
                                             )
                                         }) {
                                             HeadsignRowView(
                                                 headsign: row.headsign,
                                                 predictions: row.formatted,

iosApp/iosApp/Pages/NearbyTransit/NearbyRouteView.swift

@@ -15,13 +15,15 @@ struct NearbyRouteView: View {
     let onPin: (String) -> Void
     let pushNavEntry: (SheetNavigationStackEntry) -> Void
     let now: Instant
+    let showElevatorAccessibility: Bool
 
     var body: some View {
         RouteCard(route: nearbyRoute.route, pinned: pinned, onPin: onPin) {
             ForEach(Array(nearbyRoute.patternsByStop.enumerated()), id: \.element.stop.id) { index, patternsAtStop in
                 VStack(spacing: 0) {
                     NearbyStopView(
                         patternsAtStop: patternsAtStop,
+                        showElevatorAccessibility: showElevatorAccessibility,
                         now: now,
                         pushNavEntry: pushNavEntry,
                         pinned: pinned

iosApp/iosApp/Pages/NearbyTransit/NearbyStopView.swift

@@ -13,32 +13,57 @@ struct NearbyStopView: View {
     var analytics: Analytics = AnalyticsProvider.shared
     let patternsAtStop: PatternsByStop
     let condenseHeadsignPredictions: Bool
+    let showElevatorAccessibility: Bool
     let now: Instant
     let pushNavEntry: (SheetNavigationStackEntry) -> Void
     let pinned: Bool
 
     init(
         patternsAtStop: PatternsByStop,
         condenseHeadsignPredictions: Bool = false,
+        showElevatorAccessibility: Bool = false,
         now: Instant,
         pushNavEntry: @escaping (SheetNavigationStackEntry) -> Void,
         pinned: Bool
     ) {
         self.patternsAtStop = patternsAtStop
         self.condenseHeadsignPredictions = condenseHeadsignPredictions
+        self.showElevatorAccessibility = showElevatorAccessibility
         self.now = now
         self.pushNavEntry = pushNavEntry
         self.pinned = pinned
     }
 
+    var elevatorAlerts: Int {
+        patternsAtStop.elevatorAlerts.count
+    }
+
+    var hasElevatorAlerts: Bool {
+        elevatorAlerts > 0
+    }
+
     var body: some View {
-        Text(patternsAtStop.stop.name)
-            .font(Typography.callout)
-            .foregroundStyle(Color.text)
-            .padding(.horizontal, 16)
-            .padding(.vertical, 10)
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .background(Color.fill2)
+        VStack(alignment: .leading, spacing: 8) {
+            HStack(spacing: 8) {
+                if showElevatorAccessibility, hasElevatorAlerts {
+                    Image(.accessibilityIconInaccessible)
+                        .accessibilityHidden(true)
+                }
+                Text(patternsAtStop.stop.name)
+                    .font(Typography.callout)
+                    .foregroundStyle(Color.text)
+            }
+            if showElevatorAccessibility, hasElevatorAlerts {
+                Text(
+                    "\(elevatorAlerts, specifier: "%ld") elevator closures",
+                    comment: "Header displayed when elevators are not working at a station"
+                )
+            }
+        }
+        .padding(.horizontal, 16)
+        .padding(.vertical, 12)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .background(Color.fill2)
         StopDeparturesSummaryList(
             patternsByStop: patternsAtStop,
             condenseHeadsignPredictions: condenseHeadsignPredictions,

iosApp/iosApp/Pages/NearbyTransit/NearbyTransitView.swift

@@ -13,7 +13,7 @@
 import shared
 import SwiftUI
 
 struct NearbyTransitView: View {
     var analytics: Analytics = AnalyticsProvider.shared
     var togglePinnedUsecase = UsecaseDI().toggledPinnedRouteUsecase
     var pinnedRouteRepository = RepositoryDI().pinnedRoutes
@@ -125,15 +125,17 @@
                                     pinned: pinnedRoutes.contains(nearbyRoute.route.id),
                                     onPin: { id in toggledPinnedRoute(id) },
                                     pushNavEntry: { entry in nearbyVM.pushNavEntry(entry) },
-                                    now: now.toKotlinInstant()
+                                    now: now.toKotlinInstant(),
+                                    showElevatorAccessibility: nearbyVM.showElevatorAccessibility
                                 )
                             case let .withLine(nearbyLine):
                                 NearbyLineView(
                                     nearbyLine: nearbyLine,
                                     pinned: pinnedRoutes.contains(nearbyLine.line.id),
                                     onPin: { id in toggledPinnedRoute(id) },
                                     pushNavEntry: { entry in nearbyVM.pushNavEntry(entry) },
-                                    now: now.toKotlinInstant()
+                                    now: now.toKotlinInstant(),
+                                    showElevatorAccessibility: nearbyVM.showElevatorAccessibility
                                 )
                             }
                         }
@@ -157,7 +159,8 @@
                         pinned: false,
                         onPin: { _ in },
                         pushNavEntry: { _ in },
-                        now: now.toKotlinInstant()
+                        now: now.toKotlinInstant(),
+                        showElevatorAccessibility: false
                     )
                     .loadingPlaceholder()
                 }
@@ -530,7 +533,8 @@
                 pinned: false,
                 onPin: { _ in },
                 pushNavEntry: { _ in },
-                now: Date.now.toKotlinInstant()
+                now: Date.now.toKotlinInstant(),
+                showElevatorAccessibility: true
             )
             NearbyRouteView(
                 nearbyRoute: StopsAssociated.WithRoute(
@@ -558,8 +562,9 @@
                 pinned: true,
                 onPin: { _ in },
                 pushNavEntry: { _ in },
-                now: Date.now.toKotlinInstant()
+                now: Date.now.toKotlinInstant(),
+                showElevatorAccessibility: true
             )
         }.font(Typography.body).previewDisplayName("NearbyRouteView")
     }
 }