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

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoSession.kt

@@ -56,6 +56,8 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
                 null,
                 null,
                 arrayOf(action),
+                null,
+                null
             )
 
             val template = MapTemplate(context = carContext, config, initNavigationManager = false)

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/{hybrid/HybridAutoPlay.kt → HybridAutoPlay.kt}

@@ -14,7 +14,7 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
         val callbacks = listeners.getOrPut(eventType) { mutableListOf() }
         callbacks.add(callback)
 
-        if (eventType == EventName.DIDCONNECT && AndroidAutoSession.Companion.getIsConnected()) {
+        if (eventType == EventName.DIDCONNECT && AndroidAutoSession.getIsConnected()) {
             callback()
         }
 
@@ -38,7 +38,7 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
         if (moduleName == "main") {
             callback(ActivityRenderStateProvider.currentState)
         } else {
-            AndroidAutoSession.Companion.getState(moduleName)?.let {
+            AndroidAutoSession.getState(moduleName)?.let {
                 callback(it)
             }
         }
@@ -75,26 +75,26 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
         templateId: String, headerActions: Array<NitroAction>?
     ) {
         val template =
-            AndroidAutoTemplate.Companion.getTemplate(templateId) ?: throw IllegalArgumentException(
+            AndroidAutoTemplate.getTemplate(templateId) ?: throw IllegalArgumentException(
                 "setTemplateHeaderActions failed, template $templateId not found"
             )
         template.setTemplateHeaderActions(headerActions)
     }
 
     override fun setRootTemplate(templateId: String): Promise<Unit> {
-        return Promise.Companion.async {
-            val template = AndroidAutoTemplate.Companion.getTemplate(templateId)
+        return Promise.async {
+            val template = AndroidAutoTemplate.getTemplate(templateId)
                 ?: throw IllegalArgumentException("setRootTemplate failed, $templateId template not found")
 
             if (template.isRenderTemplate) {
-                val screen = AndroidAutoScreen.Companion.getScreen(templateId)
+                val screen = AndroidAutoScreen.getScreen(templateId)
                     ?: throw IllegalArgumentException("setRootTemplate failed, $templateId screen not found")
-                val carContext = AndroidAutoSession.Companion.getCarContext(templateId)
+                val carContext = AndroidAutoSession.getCarContext(templateId)
                     ?: throw IllegalArgumentException("setRootTemplate failed, carContext for $templateId template not found")
 
                 screen.applyConfigUpdate(invalidate = true)
 
-                if (!VirtualRenderer.Companion.hasRenderer(templateId)) {
+                if (!VirtualRenderer.hasRenderer(templateId)) {
                     val result = ThreadUtil.postOnUiAndAwait {
                         VirtualRenderer(carContext, templateId)
                     }
@@ -104,10 +104,10 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
                     }
                 }
             } else {
-                val screenManager = AndroidAutoScreen.Companion.getScreenManager()
+                val screenManager = AndroidAutoScreen.getScreenManager()
                     ?: throw IllegalArgumentException("setRootTemplate failed, screenManager not found")
                 val carContext =
-                    AndroidAutoSession.Companion.getCarContext(AndroidAutoSession.Companion.ROOT_SESSION)
+                    AndroidAutoSession.getCarContext(AndroidAutoSession.ROOT_SESSION)
                         ?: throw IllegalArgumentException("setRootTemplate failed, carContext for $templateId template not found")
 
                 val result = ThreadUtil.postOnUiAndAwait {
@@ -129,12 +129,12 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
     }
 
     override fun pushTemplate(templateId: String): Promise<Unit> {
-        return Promise.Companion.async {
-            val context = AndroidAutoSession.Companion.getRootContext()
+        return Promise.async {
+            val context = AndroidAutoSession.getRootContext()
                 ?: throw IllegalArgumentException("pushTemplate failed, carContext not found")
-            val template = AndroidAutoTemplate.Companion.getTemplate(templateId)
+            val template = AndroidAutoTemplate.getTemplate(templateId)
                 ?: throw IllegalArgumentException("pushTemplate failed, template $templateId not found")
-            val screenManager = AndroidAutoScreen.Companion.getScreenManager()
+            val screenManager = AndroidAutoScreen.getScreenManager()
                 ?: throw IllegalArgumentException("pushTemplate failed, screenManager not found")
 
             val result = ThreadUtil.postOnUiAndAwait {
@@ -176,8 +176,8 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
     }
 
     override fun popTemplate(animate: Boolean?): Promise<Unit> {
-        return Promise.Companion.async {
-            val screenManager = AndroidAutoScreen.Companion.getScreenManager()
+        return Promise.async {
+            val screenManager = AndroidAutoScreen.getScreenManager()
                 ?: throw IllegalArgumentException("popTemplate failed, screenManager not found")
             if (screenManager.stackSize == 0) {
                 return@async
@@ -194,8 +194,8 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
     }
 
     override fun popToRootTemplate(animate: Boolean?): Promise<Unit> {
-        return Promise.Companion.async {
-            val screenManager = AndroidAutoScreen.Companion.getScreenManager()
+        return Promise.async {
+            val screenManager = AndroidAutoScreen.getScreenManager()
                 ?: throw IllegalArgumentException("popToRootTemplate failed, screenManager not found")
             if (screenManager.stackSize == 0) {
                 return@async
@@ -212,8 +212,8 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
     }
 
     override fun popToTemplate(templateId: String, animate: Boolean?): Promise<Unit> {
-        return Promise.Companion.async {
-            val screenManager = AndroidAutoScreen.Companion.getScreenManager()
+        return Promise.async {
+            val screenManager = AndroidAutoScreen.getScreenManager()
                 ?: throw IllegalArgumentException("popToTemplate failed, screenManager not found")
             if (screenManager.stackSize == 0) {
                 return@async

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/{hybrid/HybridSearchTemplate.kt → HybridSearchTemplate.kt}

@@ -6,15 +6,15 @@ import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.SearchTemplate
 class HybridSearchTemplate : HybridSearchTemplateSpec() {
 
     override fun createSearchTemplate(config: SearchTemplateConfig) {
-        val context = AndroidAutoSession.Companion.getRootContext()
+        val context = AndroidAutoSession.getRootContext()
             ?: throw IllegalArgumentException("createSearchTemplate failed, carContext not found")
 
         val template = SearchTemplate(context, config)
-        AndroidAutoTemplate.Companion.setTemplate(config.id, template)
+        AndroidAutoTemplate.setTemplate(config.id, template)
     }
 
     override fun updateSearchResults(templateId: String, results: NitroSection) {
-        val template = AndroidAutoTemplate.Companion.getTemplate<SearchTemplate>(templateId)
+        val template = AndroidAutoTemplate.getTemplate<SearchTemplate>(templateId)
         template.updateSearchResults(results)
     }
 }

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/VirtualRenderer.kt

@@ -98,7 +98,7 @@ class VirtualRenderer(
             }
 
             override fun onScroll(distanceX: Float, distanceY: Float) {
-                getMapTemplateConfig()?.onDidUpdatePanGestureWithTranslation?.let {
+                getMapTemplateConfig()?.onDidPan?.let {
                     it(
                         Point((-distanceX / scale).toDouble(), (-distanceY / scale).toDouble()),
                         null

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/GridTemplate.kt

@@ -41,22 +41,7 @@ class GridTemplate(context: CarContext, config: GridTemplateConfig) :
             }.build())
         }.build()
 
-        return this.config.mapConfig?.let {
-            MapWithContentTemplate.Builder().apply {
-                setContentTemplate(template)
-                it.mapButtons?.let { mapButtons ->
-                    setMapController(
-                        MapController.Builder()
-                            .setMapActionStrip(Parser.parseMapActions(context, mapButtons)).build()
-                    )
-                }
-                it.headerActions?.let { headerActions ->
-                    setActionStrip(Parser.parseMapHeaderActions(context, headerActions))
-                }
-            }.build()
-        } ?: run {
-            template
-        }
+        return Parser.parseMapWithContentConfig(context, config.mapConfig, template)
     }
 
     override fun setTemplateHeaderActions(headerActions: Array<NitroAction>?) {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/InformationTemplate.kt

@@ -49,20 +49,7 @@ class InformationTemplate(context: CarContext, config: InformationTemplateConfig
             setHeader(Parser.parseHeader(context, config.title, config.headerActions))
         }.build()
 
-        return this.config.mapConfig?.let {
-            MapWithContentTemplate.Builder().apply {
-                setContentTemplate(template)
-                it.mapButtons?.let { mapButtons ->
-                    setMapController(
-                        MapController.Builder()
-                            .setMapActionStrip(Parser.parseMapActions(context, mapButtons)).build()
-                    )
-                }
-                it.headerActions?.let { headerActions ->
-                    setActionStrip(Parser.parseMapHeaderActions(context, headerActions))
-                }
-            }.build()
-        } ?: template
+        return Parser.parseMapWithContentConfig(context, config.mapConfig, template)
     }
 
     override fun setTemplateHeaderActions(headerActions: Array<NitroAction>?) {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/ListTemplate.kt

@@ -4,8 +4,6 @@ import androidx.car.app.CarContext
 import androidx.car.app.model.ListTemplate
 import androidx.car.app.model.SectionedItemList
 import androidx.car.app.model.Template
-import androidx.car.app.navigation.model.MapController
-import androidx.car.app.navigation.model.MapWithContentTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.ListTemplateConfig
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAction
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroSection
@@ -48,20 +46,7 @@ class ListTemplate(context: CarContext, config: ListTemplateConfig) :
             }
         }.build()
 
-        return this.config.mapConfig?.let {
-            MapWithContentTemplate.Builder().apply {
-                setContentTemplate(template)
-                it.mapButtons?.let { mapButtons ->
-                    setMapController(
-                        MapController.Builder()
-                            .setMapActionStrip(Parser.parseMapActions(context, mapButtons)).build()
-                    )
-                }
-                it.headerActions?.let { headerActions ->
-                    setActionStrip(Parser.parseMapHeaderActions(context, headerActions))
-                }
-            }.build()
-        } ?: template
+        return Parser.parseMapWithContentConfig(context, config.mapConfig, template)
     }
 
     override fun setTemplateHeaderActions(headerActions: Array<NitroAction>?) {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/MapTemplate.kt

@@ -43,7 +43,6 @@ class MapTemplate(
     private var alertPriority = 0
     private var alertIds: HashSet<Int> = HashSet()
 
-
     init {
         if (initNavigationManager) {
             val navigationManagerCallback = object : NavigationManagerCallback {
@@ -91,6 +90,11 @@ class MapTemplate(
                     }.build())
                 }
             }
+            config.onDidChangePanningInterface?.let {
+                setPanModeListener { isInPanMode ->
+                    it(isInPanMode)
+                }
+            }
         }.build()
     }
 

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/MessageTemplate.kt

@@ -33,22 +33,7 @@ class MessageTemplate(context: CarContext, config: MessageTemplateConfig) :
             }
         }.build()
 
-        return this.config.mapConfig?.let {
-            MapWithContentTemplate.Builder().apply {
-                setContentTemplate(template)
-                it.mapButtons?.let { mapButtons ->
-                    setMapController(
-                        MapController.Builder()
-                            .setMapActionStrip(Parser.parseMapActions(context, mapButtons)).build()
-                    )
-                }
-                it.headerActions?.let { headerActions ->
-                    setActionStrip(Parser.parseMapHeaderActions(context, headerActions))
-                }
-            }.build()
-        } ?: run {
-            template
-        }
+        return Parser.parseMapWithContentConfig(context, config.mapConfig, template)
     }
 
     override fun onDidAppear() {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/template/Parser.kt

@@ -23,10 +23,13 @@ import androidx.car.app.model.DurationSpan
 import androidx.car.app.model.Header
 import androidx.car.app.model.ItemList
 import androidx.car.app.model.Row
+import androidx.car.app.model.Template
 import androidx.car.app.model.Toggle
 import androidx.car.app.navigation.model.Lane
 import androidx.car.app.navigation.model.LaneDirection
 import androidx.car.app.navigation.model.Maneuver
+import androidx.car.app.navigation.model.MapController
+import androidx.car.app.navigation.model.MapWithContentTemplate
 import androidx.car.app.navigation.model.Step
 import androidx.car.app.navigation.model.TravelEstimate
 import androidx.core.graphics.createBitmap
@@ -53,6 +56,7 @@ import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAction
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroActionType
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAlignment
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAttributedString
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroBaseMapTemplateConfig
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroButtonStyle
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroColor
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroImage
@@ -116,12 +120,11 @@ object Parser {
                         setTitle(it)
                     }
                     action.image?.let { image ->
-                        val icon = CarIcon.Builder(
+                        setIcon(
                             parseImage(
                                 context, image
                             )
-                        ).build()
-                        setIcon(icon)
+                        )
                     }
                     action.flags?.let {
                         setFlags(it.toInt())
@@ -135,25 +138,36 @@ object Parser {
     }
 
     fun parseMapActions(context: CarContext, buttons: Array<NitroMapButton>): ActionStrip {
+        // make the pan button the first button so it can be access all the time
+        // when in pan mode AA locks onto this button
+        // once the buttons reappear after the hide timeout AA locks onto the first button
+        // in case the pan button is not the first button you can never get out of pan mode then
+        buttons.sortBy {
+            if (it.type == NitroMapButtonType.PAN) 0 else 1
+        }
         return ActionStrip.Builder().apply {
             buttons.forEach { button ->
                 if (button.type == NitroMapButtonType.PAN) {
-                    addAction(Action.PAN)
+                    addAction(
+                        Action.Builder(Action.PAN).setIcon(
+                            parseImage(
+                                context, button.image
+                            )
+                        ).build()
+                    )
                     return@forEach
                 }
 
-                button.image?.let { image ->
-                    addAction(Action.Builder().apply {
-                        setOnClickListener(button.onPress)
-                        setIcon(
-                            CarIcon.Builder(
-                                parseImage(
-                                    context, image
-                                )
-                            ).build()
+                addAction(Action.Builder().apply {
+                    button.onPress?.let {
+                        setOnClickListener(it)
+                    }
+                    setIcon(
+                        parseImage(
+                            context, button.image
                         )
-                    }.build())
-                }
+                    )
+                }.build())
             }
         }.build()
     }
@@ -282,7 +296,7 @@ object Parser {
                         addText(parseText(detailedText))
                     }
                     row.image?.let { image ->
-                        setImage(CarIcon.Builder(parseImage(context, image)).build())
+                        setImage(parseImage(context, image))
                     }
                     row.onPress?.let {
                         setOnClickListener {
@@ -335,7 +349,7 @@ object Parser {
                         addText(parseText(detailedText))
                     }
                     row.image?.let { image ->
-                        setImage(CarIcon.Builder(parseImage(context, image)).build())
+                        setImage(parseImage(context, image))
                     }
                     row.browsable?.let { browsable ->
                         setBrowsable(browsable)
@@ -659,4 +673,31 @@ object Parser {
             else -> LaneDirection.SHAPE_UNKNOWN
         }
     }
+
+    fun parseMapWithContentConfig(
+        context: CarContext, mapConfig: NitroBaseMapTemplateConfig?, template: Template
+    ): Template {
+        if (mapConfig == null) {
+            return template
+        }
+
+        return MapWithContentTemplate.Builder().apply {
+            setContentTemplate(template)
+            mapConfig.mapButtons?.let { mapButtons ->
+                setMapController(
+                    MapController.Builder().apply {
+                        setMapActionStrip(Parser.parseMapActions(context, mapButtons)).build()
+                        setPanModeListener { isInPanMode ->
+                            mapConfig.onDidChangePanningInterface?.let {
+                                it(isInPanMode)
+                            }
+                        }
+                    }.build()
+                )
+            }
+            mapConfig.headerActions?.let { headerActions ->
+                setActionStrip(Parser.parseMapHeaderActions(context, headerActions))
+            }
+        }.build()
+    }
 }

package/ios/Types.swift

@@ -17,4 +17,5 @@ enum AutoPlayError: Error {
     case invalidTemplateError(String)
     case propertyNotFoundError(String)
     case unsupportedVersion(String)
+    case invalidTemplateType(String)
 }

package/ios/hybrid/HybridAutoPlay.swift

@@ -241,10 +241,11 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         templateId: String,
         headerActions: [NitroAction]?
     ) throws {
-        try RootModule.withTemplate(templateId: templateId) {
-            template in
-            template.barButtons = headerActions
-            template.invalidate()
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: AutoPlayTemplate) in
+            if var template = template as? AutoPlayHeaderProviding {
+                template.barButtons = headerActions
+            }
         }
     }
 

package/ios/hybrid/HybridGridTemplate.swift

@@ -20,12 +20,9 @@ class HybridGridTemplate: HybridGridTemplateSpec {
         templateId: String,
         buttons: [NitroGridButton]
     ) throws {
-        try RootModule.withScene { scene in
-            if let template = scene.templateStore.getTemplate(
-                templateId: templateId
-            ) as? GridTemplate {
-                template.updateButtons(buttons: buttons)
-            }
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: GridTemplate) in
+            template.updateButtons(buttons: buttons)
         }
     }
 }

package/ios/hybrid/HybridInformationTemplate.swift

@@ -5,7 +5,7 @@
 //  Created by Samuel Brucksch on 05.11.25.
 //
 
-class HybridInformationTemplate : HybridInformationTemplateSpec {
+class HybridInformationTemplate: HybridInformationTemplateSpec {
 
     func createInformationTemplate(config: InformationTemplateConfig) throws {
         let template = InformationTemplate(config: config)
@@ -16,14 +16,14 @@ class HybridInformationTemplate : HybridInformationTemplateSpec {
             )
         }
     }
-    
-    func updateInformationTemplateSections(templateId: String, section: NitroSection) throws {
-        try RootModule.withScene { scene in
-            if let template = scene.templateStore.getTemplate(
-                templateId: templateId
-            ) as? InformationTemplate {
-                template.updateSection(section: section)
-            }
+
+    func updateInformationTemplateSections(
+        templateId: String,
+        section: NitroSection
+    ) throws {
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: InformationTemplate) in
+            template.updateSection(section: section)
         }
     }
 }

package/ios/hybrid/HybridListTemplate.swift

@@ -20,12 +20,9 @@ class HybridListTemplate: HybridListTemplateSpec {
         templateId: String,
         sections: [NitroSection]?
     ) throws {
-        try RootModule.withScene { scene in
-            if let template = scene.templateStore.getTemplate(
-                templateId: templateId
-            ) as? ListTemplate {
-                template.updateSections(sections: sections)
-            }
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: ListTemplate) in
+            template.updateSections(sections: sections)
         }
     }
 }

package/ios/hybrid/HybridMapTemplate.swift

@@ -5,6 +5,8 @@
 //  Created by Manuel Auer on 15.10.25.
 //
 
+import CarPlay
+
 class HybridMapTemplate: HybridMapTemplateSpec {
     func createMapTemplate(config: MapTemplateConfig) throws {
         let template = MapTemplate(config: config)
@@ -19,11 +21,8 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     func setTemplateMapButtons(templateId: String, buttons: [NitroMapButton]?)
         throws
     {
-        try RootModule.withTemplate(templateId: templateId) {
-            template in
-            guard let template = template as? MapTemplate else {
-                return
-            }
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
 
             template.config.mapButtons = buttons
             template.invalidate()
@@ -35,7 +34,8 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     {
         var mapTemplate: MapTemplate?
 
-        try RootModule.withMapTemplate(templateId: templateId) { template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             template.showAlert(alertConfig: alert)
             mapTemplate = template
         }
@@ -66,8 +66,9 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     ) throws -> TripSelectorCallback {
         var callback: TripSelectorCallback?
 
-        try RootModule.withMapTemplate(templateId: templateId) { template in
-            callback = try template.showTripSelector(
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
+            callback = template.showTripSelector(
                 trips: trips,
                 selectedTripId: selectedTripId,
                 textConfig: textConfig,
@@ -86,7 +87,8 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     }
 
     func hideTripSelector(templateId: String) throws {
-        try RootModule.withMapTemplate(templateId: templateId) { template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             template.hideTripSelector()
         }
     }
@@ -95,7 +97,8 @@ class HybridMapTemplate: HybridMapTemplateSpec {
         templateId: String,
         visibleTravelEstimate: VisibleTravelEstimate
     ) throws {
-        try RootModule.withMapTemplate(templateId: templateId) { template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             template.updateVisibleTravelEstimate(
                 visibleTravelEstimate: visibleTravelEstimate
             )
@@ -103,14 +106,15 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     }
 
     func updateTravelEstimates(templateId: String, steps: [TripPoint]) throws {
-        try RootModule.withMapTemplate(templateId: templateId) { template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             template.updateTravelEstimates(steps: steps)
         }
     }
 
     func updateManeuvers(templateId: String, maneuvers: NitroManeuver) throws {
-        try RootModule.withMapTemplate(templateId: templateId) {
-            template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             switch maneuvers {
             case .first(let routingManeuvers):
                 {
@@ -126,16 +130,17 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     }
 
     func startNavigation(templateId: String, trip: TripConfig) throws {
-        try RootModule.withMapTemplate(templateId: templateId) { template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             let trip = Parser.parseTrip(tripConfig: trip)
             template.startNavigation(trip: trip)
         }
     }
 
     func stopNavigation(templateId: String) throws {
-        try RootModule.withMapTemplate(templateId: templateId) { template in
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
             template.stopNavigation()
         }
     }
-
 }

package/ios/hybrid/HybridSearchTemplate.swift

@@ -1,4 +1,3 @@
-
 //
 //  HybridSearchTemplate.swift
 //  Pods
@@ -7,16 +6,6 @@
 //
 
 class HybridSearchTemplate: HybridSearchTemplateSpec {
-    func updateSearchResults(templateId: String, results: NitroSection) throws {
-        try RootModule.withScene { scene in
-            if let template = scene.templateStore.getTemplate(
-                templateId: templateId
-            ) as? SearchTemplate {
-                template.updateSearchResults(results: results)
-            }
-        }
-    }
-    
     func createSearchTemplate(config: SearchTemplateConfig) throws {
         let template = SearchTemplate(config: config)
         try RootModule.withScene { scene in
@@ -26,4 +15,11 @@ class HybridSearchTemplate: HybridSearchTemplateSpec {
             )
         }
     }
+
+    func updateSearchResults(templateId: String, results: NitroSection) throws {
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: SearchTemplate) in
+            template.updateSearchResults(results: results)
+        }
+    }
 }