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

package/ios/templates/MapTemplate.swift

@@ -11,14 +11,35 @@ struct NavigationAlertWrapper {
     let config: NitroNavigationAlert
 }
 
-class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
+class MapTemplate: NSObject, AutoPlayTemplate, AutoPlayHeaderProviding,
+    CPMapTemplateDelegate
+{
+    let template: CPMapTemplate
     var config: MapTemplateConfig
 
+    let screenDimensions: CGSize
+
+    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
+    }
+
     var onTripSelected: ((_ tripId: String, _ routeId: String) -> Void)?
     var onTripStarted: ((_ tripId: String, _ routeId: String) -> Void)?
-
     var navigationSession: CPNavigationSession?
-
     var navigationAlert: NavigationAlertWrapper?
 
     var tripSelectorVisible = false {
@@ -32,23 +53,38 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
 
     init(config: MapTemplateConfig) {
         self.config = config
+        template = CPMapTemplate(id: config.id)
 
-        super.init(
-            template: CPMapTemplate(id: config.id),
-            header: config.headerActions,
-            autoDismissMs: config.autoDismissMs
-        )
-
-        if let template = self.template as? CPMapTemplate {
-            template.mapDelegate = self
+        if let initialProperties = SceneStore.getRootScene()?.initialProperties,
+            let windowDict = initialProperties["window"] as? [String: Any],
+            let height = windowDict["height"] as? CGFloat,
+            let width = windowDict["width"] as? CGFloat
+        {
+            screenDimensions = CGSize(
+                width: width,
+                height: height
+            )
+        } else {
+            screenDimensions = CGSize(width: 0, height: 0)
         }
 
+        super.init()
+
+        template.mapDelegate = self
         invalidate()
     }
 
+    func onPanButtonPress() {
+        if template.isPanningInterfaceVisible {
+            template.dismissPanningInterface(animated: true)
+        } else {
+            template.showPanningInterface(animated: true)
+        }
+    }
+
     func parseMapButtons(mapButtons: [NitroMapButton]) -> [CPMapButton] {
         return mapButtons.map { button in
-            if let glyphImage = button.image?.glyphImage,
+            if let glyphImage = button.image.glyphImage,
                 let icon = SymbolFont.imageFromNitroImage(
                     image: glyphImage,
                     size: CPButtonMaximumImageSize.height,
@@ -56,72 +92,101 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
                 )
             {
                 return CPMapButton(image: icon) { _ in
-                    button.onPress()
+                    if button.type == .pan {
+                        self.onPanButtonPress()
+                        return
+                    }
+                    button.onPress?()
                 }
             }
-            if let assetImage = button.image?.assetImage,
+            if let assetImage = button.image.assetImage,
                 let icon = Parser.parseAssetImage(
                     assetImage: assetImage,
                     traitCollection: SceneStore.getRootTraitCollection()
                 )
             {
                 return CPMapButton(image: icon) { _ in
-                    button.onPress()
+                    if button.type == .pan {
+                        self.onPanButtonPress()
+                        return
+                    }
+                    button.onPress?()
                 }
             }
 
             return CPMapButton { _ in
-                button.onPress()
+                if button.type == .pan {
+                    self.onPanButtonPress()
+                    return
+                }
+                button.onPress?()
             }
         }
 
     }
 
-    override func invalidate() {
+    func invalidate() {
         if tripSelectorVisible {
             // ignore invalidate calls to not break the trip selectors back button
             return
         }
+        
+        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
+            // best practice is to provide zoom buttons then but then there is no more room for the pan button to exit pan mode
+            template.trailingNavigationBarButtons = []
+            template.leadingNavigationBarButtons = []
+            template.backButton = CPBarButton(title: "") { _ in
+                self.template.dismissPanningInterface(animated: true)
+            }
+            
+            let mapButtons = config.mapButtons?.filter { button in
+                button.type != .pan
+            } ?? []
+            
+            template.mapButtons = parseMapButtons(mapButtons: mapButtons)
+            
+            return
+        }
 
-        guard let template = self.template as? CPMapTemplate else { return }
-
-        setBarButtons()
+        setBarButtons(template: template, barButtons: config.headerActions)
 
         if let mapButtons = config.mapButtons {
             template.mapButtons = parseMapButtons(mapButtons: mapButtons)
         }
     }
 
-    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?()
     }
 
-    override func traitCollectionDidChange() {
+    func traitCollectionDidChange() {
         let traitCollection = SceneStore.getRootTraitCollection()
         let isDark = traitCollection.userInterfaceStyle == .dark
 
-        self.config.onAppearanceDidChange?(
+        config.onAppearanceDidChange?(
             isDark ? .dark : .light
         )
-        self.invalidate()
 
-        guard let template = self.template as? CPMapTemplate else { return }
+        invalidate()
 
         template.tripEstimateStyle = isDark ? .dark : .light
     }
@@ -132,7 +197,7 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
         didUpdatePanGestureWithTranslation: CGPoint,
         velocity: CGPoint
     ) {
-        config.onDidUpdatePanGestureWithTranslation?(
+        config.onDidPan?(
             Point(
                 x: didUpdatePanGestureWithTranslation.x,
                 y: didUpdatePanGestureWithTranslation.y
@@ -147,6 +212,10 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
         scale: CGFloat,
         velocity: CGFloat
     ) {
+        if template.isPanningInterfaceVisible {
+            return
+        }
+        
         if scale == 1 && velocity == 1 {
             config.onDoubleClick?(Point(x: center.x, y: center.y))
             return
@@ -158,6 +227,47 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
         )
     }
 
+    func mapTemplateDidShowPanningInterface(_ mapTemplate: CPMapTemplate) {
+        config.onDidChangePanningInterface?(true)
+        invalidate()
+    }
+
+    func mapTemplateDidDismissPanningInterface(_ mapTemplate: CPMapTemplate) {
+        config.onDidChangePanningInterface?(false)
+        invalidate()
+    }
+
+    func mapTemplate(
+        _ mapTemplate: CPMapTemplate,
+        panWith direction: CPMapTemplate.PanDirection
+    ) {
+        let panButtonScrollPercentage = config.panButtonScrollPercentage ?? 0.15
+        let scrollDistanceX = screenDimensions.width * panButtonScrollPercentage
+        let scrollDistanceY = screenDimensions.height * panButtonScrollPercentage
+
+        var translation = CGPoint.zero
+
+        switch direction {
+        case .left:
+            translation.x = scrollDistanceX
+        case .right:
+            translation.x = -scrollDistanceX
+        case .up:
+            translation.y = scrollDistanceY
+        case .down:
+            translation.y = -scrollDistanceY
+        default:
+            return
+        }
+
+        let velocity = CGPoint(x: translation.x * 2, y: translation.y * 2)
+
+        config.onDidPan?(
+            Point(x: translation.x, y: translation.y),
+            Point(x: velocity.x, y: velocity.y)
+        )
+    }
+
     // MARK: maneuver style
     func mapTemplate(
         _ mapTemplate: CPMapTemplate,
@@ -225,6 +335,8 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
             case .userDismissed: return .user
             case .timeout: return .timeout
             case .systemDismissed: return .system
+            @unknown default:
+                return .system
             }
         }()
 
@@ -233,8 +345,6 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
     }
 
     func showAlert(alertConfig: NitroNavigationAlert) {
-        guard let template = self.template as? CPMapTemplate else { return }
-
         if let priority = self.navigationAlert?.config.priority,
             priority > alertConfig.priority
         {
@@ -254,6 +364,7 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
         let style = Parser.parseActionAlertStyle(
             style: alertConfig.primaryAction.style
         )
+
         let primaryAction = CPAlertAction(
             title: alertConfig.primaryAction.title,
             style: style
@@ -274,7 +385,7 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
             image: image,
             primaryAction: primaryAction,
             secondaryAction: secondaryAction,
-            duration: alertConfig.durationMs / 1000,
+            duration: alertConfig.durationMs / 1000
         )
 
         func setNavigationAlert() {
@@ -290,21 +401,26 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
             setNavigationAlert()
         }
     }
-    
-    func updateNavigationAlert(alertId: Double, title: AutoText, subtitle: AutoText?) {
+
+    func updateNavigationAlert(
+        alertId: Double,
+        title: AutoText,
+        subtitle: AutoText?
+    ) {
         guard let alert = self.navigationAlert?.alert else {
             return
         }
-        
+
         if self.navigationAlert?.config.id != alertId {
             return
         }
-        
+
         let title = Parser.parseText(text: title)!
-        let subtitle = subtitle.map { subtitle in
-            [Parser.parseText(text: subtitle)!]
-        } ?? []
-        
+        let subtitle =
+            subtitle.map { subtitle in
+                [Parser.parseText(text: subtitle)!]
+            } ?? []
+
         alert.updateTitleVariants([title], subtitleVariants: subtitle)
     }
 
@@ -313,7 +429,6 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
             return
         }
 
-        guard let template = self.template as? CPMapTemplate else { return }
         template.dismissNavigationAlert(animated: true) { _ in }
     }
 
@@ -326,13 +441,7 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
         onTripStarted: @escaping (_ tripId: String, _ routeId: String) -> Void,
         onBackPressed: @escaping () -> Void,
         mapButtons: [NitroMapButton]
-    ) throws -> TripSelectorCallback {
-        guard let template = self.template as? CPMapTemplate else {
-            throw AutoPlayError.invalidTemplateError(
-                template.id + " template not of type map template"
-            )
-        }
-
+    ) -> TripSelectorCallback {
         self.onTripSelected = onTripSelected
         self.onTripStarted = onTripStarted
 
@@ -375,7 +484,7 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
             let selectedTrip = tripPreviews.first { trip in
                 trip.id == tripId
             }
-            template.showTripPreviews(
+            self.template.showTripPreviews(
                 tripPreviews,
                 selectedTrip: selectedTrip,
                 textConfiguration: textConfiguration
@@ -386,13 +495,11 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
     }
 
     func hideTripSelector() {
-        guard let template = self.template as? CPMapTemplate else { return }
-
         template.hideTripPreviews()
 
-        self.tripSelectorVisible = false
-        self.onTripSelected = nil
-        self.onTripStarted = nil
+        tripSelectorVisible = false
+        onTripSelected = nil
+        onTripStarted = nil
     }
 
     func mapTemplate(
@@ -438,8 +545,6 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
     func updateVisibleTravelEstimate(
         visibleTravelEstimate: VisibleTravelEstimate?
     ) {
-        guard let template = self.template as? CPMapTemplate else { return }
-
         if let visibleTravelEstimate = visibleTravelEstimate {
             config.visibleTravelEstimate = visibleTravelEstimate
         }
@@ -474,7 +579,6 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
     }
 
     func updateManeuvers(messageManeuver: NitroMessageManeuver) {
-        guard let template = template as? CPMapTemplate else { return }
         guard let navigationSession = navigationSession else { return }
 
         let color = messageManeuver.cardBackgroundColor
@@ -505,7 +609,6 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
     }
 
     func updateManeuvers(maneuvers: [NitroRoutingManeuver]) {
-        guard let template = template as? CPMapTemplate else { return }
         guard let navigationSession = navigationSession else { return }
 
         if #unavailable(iOS 15.4),
@@ -605,8 +708,6 @@ class MapTemplate: AutoPlayTemplate, CPMapTemplateDelegate {
     }
 
     func startNavigation(trip: CPTrip) {
-        guard let template = self.template as? CPMapTemplate else { return }
-
         let routeChoice = trip.routeChoices.first
 
         if let travelEstimates = config.visibleTravelEstimate == .first

package/ios/templates/MessageTemplate.swift

@@ -8,41 +8,48 @@
 import CarPlay
 
 class MessageTemplate: AutoPlayTemplate {
+    let template: CPAlertTemplate
     var config: MessageTemplateConfig
+    
+    var autoDismissMs: Double? {
+        return config.autoDismissMs
+    }
+
+    func getTemplate() -> CPTemplate {
+        return template
+    }
 
     init(config: MessageTemplateConfig) {
         self.config = config
 
-        let template = CPAlertTemplate(
+        template = CPAlertTemplate(
             titleVariants: [Parser.parseText(text: config.message)!],
             actions: Parser.parseAlertActions(alertActions: config.actions),
             id: config.id
         )
-
-        super.init(
-            template: template,
-            header: config.headerActions,
-            autoDismissMs: config.autoDismissMs
-        )
+    }
+    
+    func invalidate() {
+        // this template can not be updated
     }
 
-    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/SearchTemplate.swift

@@ -7,26 +7,26 @@
 
 import CarPlay
 
-class SearchTemplate: AutoPlayTemplate, CPSearchTemplateDelegate {
+class SearchTemplate: NSObject, AutoPlayTemplate, CPSearchTemplateDelegate {
+    var template: CPSearchTemplate
     var config: SearchTemplateConfig
+    
+    var autoDismissMs: Double? {
+        return config.autoDismissMs
+    }
 
-    var completionHandler: (([CPListItem]) -> Void)?
+    func getTemplate() -> CPTemplate {
+        return template
+    }
 
+    var completionHandler: (([CPListItem]) -> Void)?
     var pushedListTemplate: ListTemplate?
-
     var searchText = ""
-
     var isInitialized = false
 
     init(config: SearchTemplateConfig) {
         self.config = config
-        let template = CPSearchTemplate(id: config.id)
-
-        super.init(
-            template: template,
-            header: config.headerActions,
-            autoDismissMs: config.autoDismissMs
-        )
+        template = CPSearchTemplate(id: config.id)
     }
 
     func updateSearchResults(results: NitroSection) {
@@ -34,7 +34,7 @@ class SearchTemplate: AutoPlayTemplate, CPSearchTemplateDelegate {
         invalidate()
     }
 
-    override func invalidate() {
+    func invalidate() {
         // if we have pushed a list template update it
         if let listTemplate = pushedListTemplate {
             listTemplate.updateSections(sections: [config.results])
@@ -54,34 +54,26 @@ class SearchTemplate: AutoPlayTemplate, CPSearchTemplateDelegate {
         self.completionHandler = nil
     }
 
-    override func onWillAppear(animated: Bool) {
+    func onWillAppear(animated: Bool) {
         self.pushedListTemplate = nil
         config.onWillAppear?(animated)
     }
 
-    override func onDidAppear(animated: Bool) {
+    func onDidAppear(animated: Bool) {
         config.onDidAppear?(animated)
-
-        guard let template = self.template as? CPSearchTemplate else {
-            return
-        }
         template.delegate = self
     }
 
-    override func onWillDisappear(animated: Bool) {
+    func onWillDisappear(animated: Bool) {
         config.onWillDisappear?(animated)
-
-        guard let template = self.template as? CPSearchTemplate else {
-            return
-        }
         template.delegate = nil
     }
 
-    override func onDidDisappear(animated: Bool) {
+    func onDidDisappear(animated: Bool) {
         config.onDidDisappear?(animated)
     }
 
-    override func onPopped() {
+    func onPopped() {
         config.onPopped?()
     }
 

package/ios/templates/TemplateStore.swift

@@ -10,7 +10,7 @@ class TemplateStore {
     private var store: [String: AutoPlayTemplate] = [:]
 
     func getCPTemplate(templateId key: String) -> CPTemplate? {
-        return store[key]?.template
+        return store[key]?.getTemplate()
     }
 
     func getTemplate(templateId: String) -> AutoPlayTemplate? {
@@ -34,9 +34,9 @@ class TemplateStore {
 
         store = store.filter { !templateIds.contains($0.key) }
     }
-    
+
     func purge() {
-        store = store.filter { !($0.value.template is CPSearchTemplate) }
+        store = store.filter { !($0.value.getTemplate() is CPSearchTemplate) }
     }
 
     func traitCollectionDidChange() {