@iternio/react-native-auto-play 0.0.2 → 0.0.3

package/ios/templates/AutoPlayTemplate.swift

@@ -7,59 +7,42 @@
 
 import CarPlay
 
-class AutoPlayTemplate: NSObject {
-    let template: CPTemplate
-    var barButtons: [NitroAction]?
-    let autoDismissMs: Double?
-
-    init(template: CPTemplate, header: [NitroAction]?, autoDismissMs: Double?) {
-        self.template = template
-        self.barButtons = header
-        self.autoDismissMs = autoDismissMs
-
-        super.init()
-    }
-
-    func setBarButtons() {
-        guard let template = template as? CPBarButtonProviding else { return }
-
-        if let headerActions = barButtons {
-            let parsedActions = Parser.parseHeaderActions(
-                headerActions: headerActions,
-                traitCollection: SceneStore.getRootTraitCollection()
-            )
-
-            template.backButton = parsedActions.backButton
-            template.leadingNavigationBarButtons =
-                parsedActions.leadingNavigationBarButtons
-            template.trailingNavigationBarButtons =
-                parsedActions.trailingNavigationBarButtons
-        }
-    }
-
-    open func invalidate() {
-        print("\(type(of: self)) lacks invalidate implementation")
-    }
+protocol AutoPlayTemplate {
+    var autoDismissMs: Double? { get }
+
+    func invalidate()
+    func onWillAppear(animated: Bool)
+    func onDidAppear(animated: Bool)
+    func onWillDisappear(animated: Bool)
+    func onDidDisappear(animated: Bool)
+    func onPopped()
+    func traitCollectionDidChange()
+    func getTemplate() -> CPTemplate
+}
 
-    open func onWillAppear(animated: Bool) {
-        print("\(type(of: self)) lacks onWillAppear implementation")
+extension AutoPlayTemplate {
+    func traitCollectionDidChange() {
+        // this can be implemented optionally
     }
+}
 
-    open func onDidAppear(animated: Bool) {
-        print("\(type(of: self)) lacks onDidAppear implementation")
-    }
+protocol AutoPlayHeaderProviding {
+    var barButtons: [NitroAction]? { get set }
+}
 
-    open func onWillDisappear(animated: Bool) {
-        print("\(type(of: self)) lacks onWillDisappear implementation")
-    }
+func setBarButtons(template: CPTemplate, barButtons: [NitroAction]?) {
+    guard let template = template as? CPBarButtonProviding else { return }
 
-    open func onDidDisappear(animated: Bool) {
-        print("\(type(of: self)) lacks onDidDisappear implementation")
-    }
+    if let headerActions = barButtons {
+        let parsedActions = Parser.parseHeaderActions(
+            headerActions: headerActions,
+            traitCollection: SceneStore.getRootTraitCollection()
+        )
 
-    open func onPopped() {
-        print("\(type(of: self)) lacks onPopped implementation")
+        template.backButton = parsedActions.backButton
+        template.leadingNavigationBarButtons =
+            parsedActions.leadingNavigationBarButtons
+        template.trailingNavigationBarButtons =
+            parsedActions.trailingNavigationBarButtons
     }
-
-    open func traitCollectionDidChange() {}
 }

package/ios/templates/GridTemplate.swift

@@ -7,30 +7,43 @@
 
 import CarPlay
 
-class GridTemplate: AutoPlayTemplate {
+class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+    let template: CPGridTemplate
     var config: GridTemplateConfig
 
+    var barButtons: [NitroAction]? {
+        get {
+            return config.headerActions
+        }
+        set {
+            config.headerActions = newValue
+            setBarButtons(template: template, barButtons: newValue)
+        }
+    }
+
+    var autoDismissMs: Double? {
+        return config.autoDismissMs
+    }
+    
+    func getTemplate() -> CPTemplate {
+        return template
+    }
+
     init(config: GridTemplateConfig) {
         self.config = config
 
-        let template = CPGridTemplate(
+        template = CPGridTemplate(
             title: Parser.parseText(text: config.title),
             gridButtons: GridTemplate.parseButtons(buttons: config.buttons),
             id: config.id
         )
 
-        super.init(
-            template: template,
-            header: config.headerActions,
-            autoDismissMs: config.autoDismissMs
-        )
-
-        setBarButtons()
+        setBarButtons(template: template, barButtons: barButtons)
     }
-    
+
     static func parseButtons(buttons: [NitroGridButton]) -> [CPGridButton] {
         let gridButtonHeight: CGFloat
-        
+
         if #available(iOS 26.0, *) {
             gridButtonHeight = CPGridTemplate.maximumGridButtonImageSize.height
         } else {
@@ -64,34 +77,30 @@ class GridTemplate: AutoPlayTemplate {
         }
     }
 
-    override func invalidate() {
-        guard let template = self.template as? CPGridTemplate else {
-            return
-        }
-
-        setBarButtons()
+    func invalidate() {
+        setBarButtons(template: template, barButtons: config.headerActions)
 
         let buttons = GridTemplate.parseButtons(buttons: config.buttons)
         template.updateGridButtons(buttons)
     }
 
-    override func onWillAppear(animated: Bool) {
+    func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    override func onDidAppear(animated: Bool) {
+    func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    override func onWillDisappear(animated: Bool) {
+    func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    override func onDidDisappear(animated: Bool) {
+    func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    override func onPopped() {
+    func onPopped() {
         config.onPopped?()
     }
 

package/ios/templates/InformationTemplate.swift

@@ -7,13 +7,32 @@
 
 import CarPlay
 
-class InformationTemplate: AutoPlayTemplate {
+class InformationTemplate: AutoPlayTemplate, 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? {
+        return config.autoDismissMs
+    }
+    
+    func getTemplate() -> CPTemplate {
+        return template
+    }
 
     init(config: InformationTemplateConfig) {
         self.config = config
 
-        let template = CPInformationTemplate(
+        template = CPInformationTemplate(
             title: Parser.parseText(text: config.title)!,
             layout: .leading,
             items: Parser.parseInformationItems(section: config.section),
@@ -21,42 +40,31 @@ class InformationTemplate: AutoPlayTemplate {
             id: config.id
         )
 
-        super.init(
-            template: template,
-            header: config.headerActions,
-            autoDismissMs: config.autoDismissMs
-        )
-
-        setBarButtons()
+        setBarButtons(template: template, barButtons: barButtons)
     }
 
-    override func invalidate() {
-        guard let template = self.template as? CPInformationTemplate else {
-            return
-        }
-
-        setBarButtons()
-
+    func invalidate() {
+        setBarButtons(template: template, barButtons: barButtons)
         template.items = Parser.parseInformationItems(section: config.section)
     }
 
-    override func onWillAppear(animated: Bool) {
+    func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    override func onDidAppear(animated: Bool) {
+    func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    override func onWillDisappear(animated: Bool) {
+    func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    override func onDidDisappear(animated: Bool) {
+    func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    override func onPopped() {
+    func onPopped() {
         config.onPopped?()
     }
 

package/ios/templates/ListTemplate.swift

@@ -7,34 +7,43 @@
 
 import CarPlay
 
-class ListTemplate: AutoPlayTemplate {
+class ListTemplate: AutoPlayTemplate, 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? {
+        return config.autoDismissMs
+    }
+    
+    func getTemplate() -> CPTemplate {
+        return template
+    }
 
     init(config: ListTemplateConfig) {
         self.config = config
 
-        let template = CPListTemplate(
+        template = CPListTemplate(
             title: Parser.parseText(text: config.title),
             sections: [],
             assistantCellConfiguration: nil,
             id: config.id
         )
-
-        super.init(
-            template: template,
-            header: config.headerActions,
-            autoDismissMs: config.autoDismissMs
-        )
-
+        
         invalidate()
     }
 
-    override func invalidate() {
-        guard let template = self.template as? CPListTemplate else {
-            return
-        }
-
-        setBarButtons()
+    func invalidate() {
+        setBarButtons(template: template, barButtons: barButtons)
 
         template.updateSections(
             Parser.parseSections(
@@ -45,23 +54,23 @@ class ListTemplate: AutoPlayTemplate {
         )
     }
 
-    override func onWillAppear(animated: Bool) {
+    func onWillAppear(animated: Bool) {
         config.onWillAppear?(animated)
     }
 
-    override func onDidAppear(animated: Bool) {
+    func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
     }
 
-    override func onWillDisappear(animated: Bool) {
+    func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
     }
 
-    override func onDidDisappear(animated: Bool) {
+    func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    override func onPopped() {
+    func onPopped() {
         config.onPopped?()
     }