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

package/ios/templates/GridTemplate.swift

@@ -7,36 +7,34 @@
 
 import CarPlay
 
-class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+class GridTemplate: AutoPlayHeaderProviding {
     let template: CPGridTemplate
     var config: GridTemplateConfig
 
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            setBarButtons(template: template, barButtons: newValue)
-        }
-    }
+    var buttons: [NitroGridButton]
 
-    var autoDismissMs: Double? {
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
-    
-    func getTemplate() -> CPTemplate {
+
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
     init(config: GridTemplateConfig) {
         self.config = config
-
+        buttons = config.buttons
+        
         template = CPGridTemplate(
             title: Parser.parseText(text: config.title),
-            gridButtons: GridTemplate.parseButtons(buttons: config.buttons),
+            gridButtons: GridTemplate.parseButtons(buttons: buttons),
             id: config.id
         )
+                
+        super.init()
+        
+        barButtons = config.headerActions
+        
     }
 
     static func parseButtons(buttons: [NitroGridButton]) -> [CPGridButton] {
@@ -44,67 +42,74 @@ class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
         if #available(iOS 26.0, *) {
             gridButtonHeight = CPGridTemplate.maximumGridButtonImageSize.height
-        } else {
+        }
+        else {
             gridButtonHeight = 44
         }
 
-        return buttons.map { button in
+        let traitCollection = SceneStore.getRootTraitCollection()
+
+        return buttons.compactMap { button in
             var image: UIImage?
 
             if let glyphImage = button.image.glyphImage {
                 image = SymbolFont.imageFromNitroImage(
                     image: glyphImage,
                     size: gridButtonHeight,
-                    traitCollection: SceneStore.getRootTraitCollection()
-                )!
+                    traitCollection: traitCollection
+                )
             }
 
             if let assetImage = button.image.assetImage {
                 image = Parser.parseAssetImage(
                     assetImage: assetImage,
-                    traitCollection: SceneStore.getRootTraitCollection()
+                    traitCollection: traitCollection
                 )
             }
 
+            guard let image = image else { return nil }
+            guard let title = Parser.parseText(text: button.title) else { return nil }
+
             return CPGridButton(
-                titleVariants: [Parser.parseText(text: button.title)!],
-                image: image!
+                titleVariants: [title],
+                image: image
             ) { _ in
                 button.onPress()
             }
         }
     }
 
-    func invalidate() {
-        setBarButtons(template: template, barButtons: config.headerActions)
+    @MainActor
+    override func _invalidate() {
+        setBarButtons(template: template, barButtons: barButtons)
 
-        let buttons = GridTemplate.parseButtons(buttons: config.buttons)
+        let buttons = GridTemplate.parseButtons(buttons: buttons)
         template.updateGridButtons(buttons)
     }
 
-    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?()
     }
 
     @MainActor
     func updateButtons(buttons: [NitroGridButton]) {
-        config.buttons = buttons
+        self.buttons = buttons
         invalidate()
     }
 }

package/ios/templates/InformationTemplate.swift

@@ -7,68 +7,67 @@
 
 import CarPlay
 
-class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+class InformationTemplate: AutoPlayHeaderProviding {
     let template: CPInformationTemplate
     var config: InformationTemplateConfig
-    
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            setBarButtons(template: template, barButtons: newValue)
-        }
-    }
-    
-    var autoDismissMs: Double? {
+
+    var section: NitroSection
+
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
-    
-    func getTemplate() -> CPTemplate {
+
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
     init(config: InformationTemplateConfig) {
         self.config = config
+        
+        section = config.section
 
         template = CPInformationTemplate(
             title: Parser.parseText(text: config.title)!,
             layout: .leading,
-            items: Parser.parseInformationItems(section: config.section),
+            items: Parser.parseInformationItems(section: section),
             actions: Parser.parseInformationActions(actions: config.actions),
             id: config.id
         )
+        
+        super.init();
+        
+        barButtons = config.headerActions
     }
 
-    func invalidate() {
+    @MainActor
+    override func _invalidate() {
         setBarButtons(template: template, barButtons: barButtons)
-        template.items = Parser.parseInformationItems(section: config.section)
+        template.items = Parser.parseInformationItems(section: section)
     }
 
-    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?()
     }
 
     @MainActor
     func updateSection(section: NitroSection) {
-        config.section = section
+        self.section = section
         invalidate()
     }
 }

package/ios/templates/ListTemplate.swift

@@ -7,30 +7,24 @@
 
 import CarPlay
 
-class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+class ListTemplate: AutoPlayHeaderProviding {
     let template: CPListTemplate
     var config: ListTemplateConfig
-    
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            setBarButtons(template: template, barButtons: newValue)
-        }
-    }
-    
-    var autoDismissMs: Double? {
+
+    var sections: [NitroSection]?
+
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
-    
-    func getTemplate() -> CPTemplate {
+
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
     init(config: ListTemplateConfig) {
         self.config = config
+        
+        sections = config.sections
 
         template = CPListTemplate(
             title: Parser.parseText(text: config.title),
@@ -38,50 +32,54 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
             assistantCellConfiguration: nil,
             id: config.id
         )
+        
+        super.init()
+        
+        barButtons = config.headerActions
     }
 
     @MainActor
-    func invalidate() {
+    override func _invalidate() {
         setBarButtons(template: template, barButtons: barButtons)
 
         template.updateSections(
             Parser.parseSections(
-                sections: config.sections,
+                sections: sections,
                 updateSection: self.updateSection(section:sectionIndex:),
                 traitCollection: SceneStore.getRootTraitCollection()
             )
         )
     }
 
-    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?()
     }
 
     @MainActor
     private func updateSection(section: NitroSection, sectionIndex: Int) {
-        config.sections?[sectionIndex] = section
+        self.sections?[sectionIndex] = section
         invalidate()
     }
 
     @MainActor
     func updateSections(sections: [NitroSection]?) {
-        config.sections = sections
+        self.sections = sections
         invalidate()
     }
 }

package/ios/templates/MapTemplate.swift

@@ -11,7 +11,7 @@ struct NavigationAlertWrapper {
     let config: NitroNavigationAlert
 }
 
-class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
+class MapTemplate: AutoPlayHeaderProviding,
     CPMapTemplateDelegate
 {
     let template: CPMapTemplate
@@ -19,21 +19,14 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
 
     let screenDimensions: CGSize
 
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            invalidate()
-        }
-    }
+    var mapButtons: [NitroMapButton]?
+    var visibleTravelEstimate: VisibleTravelEstimate?
 
-    var autoDismissMs: Double? {
+    override var autoDismissMs: Double? {
         return config.autoDismissMs
     }
 
-    func getTemplate() -> CPTemplate {
+    override func getTemplate() -> CPTemplate {
         return template
     }
 
@@ -52,6 +45,10 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
 
     init(config: MapTemplateConfig) {
         self.config = config
+        
+        mapButtons = config.mapButtons
+        visibleTravelEstimate = config.visibleTravelEstimate
+        
         template = CPMapTemplate(id: config.id)
 
         if let initialProperties = SceneStore.getRootScene()?.initialProperties,
@@ -63,19 +60,22 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                 width: width,
                 height: height
             )
-        } else {
+        }
+        else {
             screenDimensions = CGSize(width: 0, height: 0)
         }
 
         super.init()
 
+        barButtons = config.headerActions
         template.mapDelegate = self
     }
 
     func onPanButtonPress() {
         if isPanningInterfaceVisible {
             template.dismissPanningInterface(animated: true)
-        } else {
+        }
+        else {
             template.showPanningInterface(animated: true)
         }
     }
@@ -124,7 +124,7 @@ 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
@@ -142,7 +142,7 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
             }
 
             let mapButtons =
-                config.mapButtons?.filter { button in
+                mapButtons?.filter { button in
                     button.type != .pan
                 } ?? []
 
@@ -151,34 +151,35 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
             return
         }
 
-        setBarButtons(template: template, barButtons: config.headerActions)
+        setBarButtons(template: template, barButtons: barButtons)
 
-        if let mapButtons = config.mapButtons {
+        if let mapButtons = mapButtons {
             template.mapButtons = parseMapButtons(mapButtons: mapButtons)
         }
     }
 
-    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
 
@@ -353,9 +354,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 +400,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
             template.dismissNavigationAlert(animated: true) { _ in
                 setNavigationAlert()
             }
-        } else {
+        }
+        else {
             setNavigationAlert()
         }
     }
@@ -417,10 +419,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 +503,7 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     }
 
     func hideTripSelector() {
-        currentTripId = nil;
+        currentTripId = nil
         template.hideTripPreviews()
 
         tripSelectorVisible = false
@@ -517,13 +519,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 +549,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()
     }
 
@@ -562,14 +564,14 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
         visibleTravelEstimate: VisibleTravelEstimate?
     ) {
         if let visibleTravelEstimate = visibleTravelEstimate {
-            config.visibleTravelEstimate = visibleTravelEstimate
+            self.visibleTravelEstimate = visibleTravelEstimate
         }
 
         guard let trip = navigationSession?.trip else { return }
 
         let travelEstaimtes = trip.routeChoices.first?
             .travelEstimates
-        if let estimates = config.visibleTravelEstimate == .first
+        if let estimates = self.visibleTravelEstimate == .first
             ? travelEstaimtes?.first : travelEstaimtes?.last
         {
             template.updateEstimates(estimates, for: trip)
@@ -604,7 +606,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
 
         if #available(iOS 15.4, *) {
             maneuver.cardBackgroundColor = cardBackgroundColor
-        } else {
+        }
+        else {
             template.guidanceBackgroundColor = cardBackgroundColor
         }
 
@@ -660,10 +663,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 +697,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                         secondaryManeuver.cardBackgroundColor =
                             maneuver.cardBackgroundColor
                         return [maneuver, secondaryManeuver]
-                    } else {
+                    }
+                    else {
                         return [maneuver]
                     }
                 }
@@ -711,7 +716,8 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
                 }
                 if laneGuidances.isEmpty {
                     navigationSession.currentLaneGuidance = nil
-                } else {
+                }
+                else {
                     navigationSession.add(laneGuidances)
                     navigationSession.currentLaneGuidance = laneGuidances.first
                 }
@@ -731,7 +737,7 @@ class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
     func startNavigation(trip: CPTrip) {
         let routeChoice = trip.routeChoices.first
 
-        if let travelEstimates = config.visibleTravelEstimate == .first
+        if let travelEstimates = visibleTravelEstimate == .first
             ? routeChoice?.travelEstimates.first
             : routeChoice?.travelEstimates.last
         {

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?()
     }
 }