@iternio/react-native-auto-play 0.1.18 → 0.2.0-alpha.2

package/ios/templates/MapTemplate.swift

@@ -11,7 +11,7 @@ struct NavigationAlertWrapper {
     let config: NitroNavigationAlert
 }
 
-class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
+class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
     CPMapTemplateDelegate
 {
     let template: CPMapTemplate
@@ -29,11 +29,11 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
         }
     }
 
-    var autoDismissMs: Double? {
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
 
-    func getTemplate() -> CPTemplate {
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -44,11 +44,6 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     var currentTripId: String?
 
     var tripSelectorVisible = false
-    /**
-     this avoids a race condition when invalidating the template that causes an App Hang (main‑thread stall)
-     when using CPMapTemplate.isPanningInterfaceVisible
-     */
-    private var isPanningInterfaceVisible = false
 
     init(config: MapTemplateConfig) {
         self.config = config
@@ -63,7 +58,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                 width: width,
                 height: height
             )
-        } else {
+        }
+        else {
             screenDimensions = CGSize(width: 0, height: 0)
         }
 
@@ -73,9 +69,10 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     }
 
     func onPanButtonPress() {
-        if isPanningInterfaceVisible {
+        if template.isPanningInterfaceVisible {
             template.dismissPanningInterface(animated: true)
-        } else {
+        }
+        else {
             template.showPanningInterface(animated: true)
         }
     }
@@ -124,13 +121,13 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     }
 
     @MainActor
-    func invalidate() {
+    override func _invalidate() {
         if tripSelectorVisible {
             // ignore invalidate calls to not break the trip selectors back button
             return
         }
 
-        if isPanningInterfaceVisible {
+        if template.isPanningInterfaceVisible {
             // while panning interface is shown we only provide a back button on the header
             // and all map buttons except the pan button
             // reason is that you can have a max of 2 map buttons while panning interface is shown
@@ -158,27 +155,28 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
         }
     }
 
-    func onWillAppear(animated: Bool) {
+    override func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    func onDidAppear(animated: Bool) {
+    override func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    func onWillDisappear(animated: Bool) {
+    override func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    func onDidDisappear(animated: Bool) {
+    override func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    func onPopped() {
+    override func onPopped() {
         config.onPopped?()
     }
 
-    func traitCollectionDidChange() {
+    @MainActor
+    override func traitCollectionDidChange() {
         let traitCollection = SceneStore.getRootTraitCollection()
         let isDark = traitCollection.userInterfaceStyle == .dark
 
@@ -212,7 +210,7 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
         scale: CGFloat,
         velocity: CGFloat
     ) {
-        if isPanningInterfaceVisible {
+        if template.isPanningInterfaceVisible {
             return
         }
 
@@ -228,12 +226,11 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     }
 
     func mapTemplateDidShowPanningInterface(_ mapTemplate: CPMapTemplate) {
-        isPanningInterfaceVisible = true
         config.onDidChangePanningInterface?(true)
         invalidate()
     }
+
     func mapTemplateDidDismissPanningInterface(_ mapTemplate: CPMapTemplate) {
-        isPanningInterfaceVisible = false
         config.onDidChangePanningInterface?(false)
         invalidate()
     }
@@ -353,9 +350,9 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
             return
         }
 
-        let title = Parser.parseText(text: alertConfig.title)!
-        let subtitle = alertConfig.subtitle.map { subtitle in
-            [Parser.parseText(text: subtitle)!]
+        guard let title = Parser.parseText(text: alertConfig.title) else { return }
+        let subtitle = alertConfig.subtitle.flatMap { subtitle in
+            [Parser.parseText(text: subtitle)].compactMap { $0 }
         }
 
         let image = Parser.parseNitroImage(
@@ -399,7 +396,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
             template.dismissNavigationAlert(animated: true) { _ in
                 setNavigationAlert()
             }
-        } else {
+        }
+        else {
             setNavigationAlert()
         }
     }
@@ -417,10 +415,10 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
             return
         }
 
-        let title = Parser.parseText(text: title)!
+        guard let title = Parser.parseText(text: title) else { return }
         let subtitle =
-            subtitle.map { subtitle in
-                [Parser.parseText(text: subtitle)!]
+            subtitle.flatMap { subtitle in
+                [Parser.parseText(text: subtitle)].compactMap { $0 }
             } ?? []
 
         alert.updateTitleVariants([title], subtitleVariants: subtitle)
@@ -501,7 +499,7 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     }
 
     func hideTripSelector() {
-        currentTripId = nil;
+        currentTripId = nil
         template.hideTripPreviews()
 
         tripSelectorVisible = false
@@ -517,13 +515,13 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
         using routeChoice: CPRouteChoice
     ) {
         let tripId = trip.id
-        
-        if (currentTripId != nil && currentTripId == tripId) {
+
+        if currentTripId != nil && currentTripId == tripId {
             return
         }
-        
+
         currentTripId = trip.id
-        
+
         let routeId = routeChoice.id
         self.onTripSelected?(tripId, routeId)
 
@@ -547,14 +545,14 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
         )
 
         startNavigation(trip: trip)
-        
+
         if let onTripStarted = self.onTripStarted {
             let tripId = trip.id
             let routeId = routeChoice.id
 
             onTripStarted(tripId, routeId)
         }
-        
+
         hideTripSelector()
     }
 
@@ -604,7 +602,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
 
         if #available(iOS 15.4, *) {
             maneuver.cardBackgroundColor = cardBackgroundColor
-        } else {
+        }
+        else {
             template.guidanceBackgroundColor = cardBackgroundColor
         }
 
@@ -660,10 +659,11 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                 )
 
                 if index != maneuverIndex {
-                    let maneuver = navigationSession.upcomingManeuvers.first(
+                    if let maneuver = navigationSession.upcomingManeuvers.first(
                         where: { $0.id == nitroManeuver.id }
-                    )!
-                    upcomingManeuvers.append(maneuver)
+                    ) {
+                        upcomingManeuvers.append(maneuver)
+                    }
                 }
                 continue
             }
@@ -693,7 +693,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                         secondaryManeuver.cardBackgroundColor =
                             maneuver.cardBackgroundColor
                         return [maneuver, secondaryManeuver]
-                    } else {
+                    }
+                    else {
                         return [maneuver]
                     }
                 }
@@ -711,7 +712,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                 }
                 if laneGuidances.isEmpty {
                     navigationSession.currentLaneGuidance = nil
-                } else {
+                }
+                else {
                     navigationSession.add(laneGuidances)
                     navigationSession.currentLaneGuidance = laneGuidances.first
                 }

package/ios/templates/MessageTemplate.swift

@@ -10,12 +10,12 @@ import CarPlay
 class MessageTemplate: AutoPlayTemplate {
     let template: CPAlertTemplate
     var config: MessageTemplateConfig
-    
-    var autoDismissMs: Double? {
+
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
 
-    func getTemplate() -> CPTemplate {
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -28,28 +28,24 @@ class MessageTemplate: AutoPlayTemplate {
             id: config.id
         )
     }
-    
-    func invalidate() {
-        // this template can not be updated
-    }
 
-    func onWillAppear(animated: Bool) {
+    override func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    func onDidAppear(animated: Bool) {
+    override func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    func onWillDisappear(animated: Bool) {
+    override func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    func onDidDisappear(animated: Bool) {
+    override func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    func onPopped() {
+    override func onPopped() {
         config.onPopped?()
     }
 }

package/ios/templates/Parser.swift

@@ -79,7 +79,8 @@ class Parser {
 
                 if let image = image {
                     button = CPBarButton(image: image) { _ in action.onPress() }
-                } else {
+                }
+                else {
                     button = CPBarButton(title: action.title ?? "") { _ in
                         action.onPress()
                     }

package/ios/templates/SearchTemplate.swift

@@ -7,15 +7,15 @@
 
 import CarPlay
 
-class SearchTemplate: NSObject, AutoPlayTemplate, CPSearchTemplateDelegate {
+class SearchTemplate: AutoPlayTemplate, CPSearchTemplateDelegate {
     var template: CPSearchTemplate
     var config: SearchTemplateConfig
 
-    var autoDismissMs: Double? {
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
 
-    func getTemplate() -> CPTemplate {
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -35,7 +35,7 @@ class SearchTemplate: NSObject, AutoPlayTemplate, CPSearchTemplateDelegate {
     }
 
     @MainActor
-    func invalidate() {
+    override func _invalidate() {
         // if we have pushed a list template update it
         if let listTemplate = pushedListTemplate {
             listTemplate.updateSections(sections: [config.results])
@@ -55,26 +55,26 @@ class SearchTemplate: NSObject, AutoPlayTemplate, CPSearchTemplateDelegate {
         self.completionHandler = nil
     }
 
-    func onWillAppear(animated: Bool) {
+    override func onWillAppear(animated: Bool) {
         self.pushedListTemplate = nil
         config.onWillAppear?(animated)
     }
 
-    func onDidAppear(animated: Bool) {
+    override func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
         template.delegate = self
     }
 
-    func onWillDisappear(animated: Bool) {
+    override func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
         template.delegate = nil
     }
 
-    func onDidDisappear(animated: Bool) {
+    override func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    func onPopped() {
+    override func onPopped() {
         config.onPopped?()
     }
 
@@ -140,17 +140,18 @@ class SearchTemplate: NSObject, AutoPlayTemplate, CPSearchTemplateDelegate {
         // execute callback after creating the template to avoid race condition in updateSearchResults
         config.onSearchTextSubmitted(searchText)
 
-        TemplateStore.addTemplate(
-            template: listTemplate,
-            templateId: listConfig.id
-        )
-
         // Push the template
         Task { @MainActor in
             do {
-                try await RootModule.withInterfaceController {
+                try await RootModule.withSceneAndInterfaceController {
+                    scene,
                     interfaceController in
-                    
+
+                    scene.templateStore.addTemplate(
+                        template: listTemplate,
+                        templateId: listConfig.id
+                    )
+
                     listTemplate.invalidate()
 
                     let _ = try await interfaceController.pushTemplate(
@@ -158,7 +159,8 @@ class SearchTemplate: NSObject, AutoPlayTemplate, CPSearchTemplateDelegate {
                         animated: true
                     )
                 }
-            } catch {
+            }
+            catch {
                 print("Failed to push list template: \(error)")
             }
         }

package/ios/templates/TemplateStore.swift

@@ -7,27 +7,30 @@
 import CarPlay
 
 class TemplateStore {
-    private static var store: [String: AutoPlayTemplate] = [:]
+    private var store: [String: AutoPlayTemplate] = [:]
 
-    static func getCPTemplate(templateId key: String) -> CPTemplate? {
+    func getCPTemplate(templateId key: String) -> CPTemplate? {
         return store[key]?.getTemplate()
     }
 
-    static func getTemplate(templateId: String) -> AutoPlayTemplate? {
-        return store[templateId]
+    func getTemplate(templateId: String) throws -> AutoPlayTemplate {
+        if let template = store[templateId] {
+            return template
+        }
+        throw AutoPlayError.templateNotFound(templateId)
     }
 
-    static func addTemplate(template: AutoPlayTemplate, templateId: String) {
+    func addTemplate(template: AutoPlayTemplate, templateId: String) {
         store[templateId] = template
     }
 
-    static func removeTemplate(templateId: String) {
+    func removeTemplate(templateId: String) {
         store[templateId]?.onPopped()
 
         store.removeValue(forKey: templateId)
     }
 
-    static func removeTemplates(templateIds: [String]) {
+    func removeTemplates(templateIds: [String]) {
         templateIds.forEach { templateId in
             store[templateId]?.onPopped()
         }
@@ -35,11 +38,16 @@ class TemplateStore {
         store = store.filter { !templateIds.contains($0.key) }
     }
 
-    static func purge() {
+    func purge() {
         store = store.filter { !($0.value.getTemplate() is CPSearchTemplate) }
     }
 
-    static func traitCollectionDidChange() {
+    @MainActor
+    func traitCollectionDidChange() {
         store.values.forEach { template in template.traitCollectionDidChange() }
     }
+
+    func disconnect() {
+        store = [:]
+    }
 }

package/ios/utils/RootModule.swift

@@ -24,25 +24,31 @@ class RootModule {
         try action(scene)
     }
 
+    static func withTemplateStore(
+        perform action: @escaping (TemplateStore) throws -> Void
+    ) throws {
+        try withScene { rootScene in
+            try action(rootScene.templateStore)
+        }
+    }
+
     static func withAutoPlayTemplate<T>(
         templateId: String,
         perform action: @escaping (T) throws -> Void
     ) throws {
-        guard
-            let template = TemplateStore.getTemplate(
+        try withScene { rootScene in
+            let template = try rootScene.templateStore.getTemplate(
                 templateId: templateId
             )
-        else {
-            throw AutoPlayError.templateNotFound(templateId)
-        }
 
-        guard let template = template as? T else {
-            throw AutoPlayError.invalidTemplateType(
-                "\(template) is not a \(T.self) template"
-            )
-        }
+            guard let template = template as? T else {
+                throw AutoPlayError.invalidTemplateType(
+                    "\(template) is not a \(T.self) template"
+                )
+            }
 
-        try action(template)
+            try action(template)
+        }
     }
 
     static func withTemplate<T: CPTemplate>(
@@ -53,7 +59,8 @@ class RootModule {
             (autoPlayTemplate: AutoPlayTemplate) in
             if let template = autoPlayTemplate.getTemplate() as? T {
                 try! action(template)
-            } else {
+            }
+            else {
                 throw AutoPlayError.invalidTemplateType(
                     "\(autoPlayTemplate) is not a \(T.self) template"
                 )

package/ios/utils/SymbolFont.swift

@@ -42,7 +42,8 @@ class SymbolFont {
         CTFontManagerRegisterGraphicsFont(font, &error)
         if let error = error?.takeUnretainedValue() {
             print("Failed to register font: \(error)")
-        } else {
+        }
+        else {
             print("Font \(font.fullName as String? ?? "unknown") registered")
         }
 

package/ios/utils/ViewUtils.swift

@@ -19,10 +19,10 @@ class ViewUtils {
                 return function(appDelegate, selector, moduleName as NSString, initialProps as NSDictionary)
             }
         }
-        
+
         return nil
     }
-    
+
     static func showLaunchScreen(window: UIWindow) {
         if let name = Bundle.main.object(
             forInfoDictionaryKey: "UILaunchStoryboardName"

package/lib/hooks/useAndroidAutoTelemetry.d.ts

@@ -10,6 +10,23 @@ interface Props {
      * The permissions to check.
      */
     requiredPermissions: Array<AndroidAutoPermissions>;
+    /**
+     * Android Automotive specific permission request properties
+     */
+    automotivePermissionRequest?: {
+        /**
+         * message to be shown on the permission request screen
+         */
+        message: string;
+        /**
+         * primary action button text
+         */
+        grantButtonText: string;
+        /**
+         * secondary action button text, if not specified button will not be shown
+         */
+        cancelButtonText?: string;
+    };
 }
 /**
  * Hook to check if the telemetry permissions are granted. If the permissions are not granted, it will request them from the user.
@@ -18,13 +35,14 @@ interface Props {
  * @param requestTelemetryPermissions If true, the telemetry permissions will be requested from the user. Can be set to false initially, in case other permissions need to be requested first, so the permission request dialogs do not overlap.
  * @param requiredPermissions The permissions to check.
  */
-export declare const useAndroidAutoTelemetry: ({ requestTelemetryPermissions, requiredPermissions, }: Props) => {
+export declare const useAndroidAutoTelemetry: ({ requestTelemetryPermissions, requiredPermissions, automotivePermissionRequest, }: Props) => {
     /**
-     * True if the telemetry permissions are granted, false otherwise.
+     * null on pending permission check, True if the telemetry permissions are granted, false otherwise.
      */
-    permissionsGranted: boolean;
+    permissionsGranted: boolean | null;
     /**
-     * The telemetry data.
+     * The telemetry data, might be a partial update not containing all properties of the regular timed updates.
+     * For example gear changes are emitted immediately without all the other telemetry data.
      */
     telemetry: Telemetry | undefined;
     /**