@iternio/react-native-auto-play 0.1.9 → 0.1.11

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

@@ -5,12 +5,14 @@ import com.margelo.nitro.core.Promise
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.MessageTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.ThreadUtil
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
 
 class HybridAutoPlay : HybridAutoPlaySpec() {
     override fun addListener(
         eventType: EventName, callback: () -> Unit
     ): () -> Unit {
-        val callbacks = listeners.getOrPut(eventType) { mutableListOf() }
+        val callbacks = listeners.getOrPut(eventType) { CopyOnWriteArrayList() }
         callbacks.add(callback)
 
         if (eventType == EventName.DIDCONNECT && AndroidAutoSession.getIsConnected()) {
@@ -30,7 +32,7 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
         moduleName: String, callback: (VisibilityState) -> Unit
     ): () -> Unit {
         val callbacks = renderStateListeners.getOrPut(moduleName) {
-            mutableListOf()
+            CopyOnWriteArrayList()
         }
         callbacks.add(callback)
 
@@ -56,7 +58,7 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
         moduleName: String, callback: (SafeAreaInsets) -> Unit
     ): () -> Unit {
         val callbacks = safeAreaInsetsListeners.getOrPut(moduleName) {
-            mutableListOf()
+            CopyOnWriteArrayList()
         }
         callbacks.add(callback)
 
@@ -224,7 +226,6 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
     }
 
 
-
     override fun addListenerVoiceInput(callback: (Location?, String?) -> Unit): () -> Unit {
         voiceInputListeners.add(callback)
 
@@ -236,15 +237,15 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
     companion object {
         const val TAG = "HybridAutoPlay"
 
-        private val listeners = mutableMapOf<EventName, MutableList<() -> Unit>>()
+        private val listeners = ConcurrentHashMap<EventName, CopyOnWriteArrayList<() -> Unit>>()
 
         private val renderStateListeners =
-            mutableMapOf<String, MutableList<(VisibilityState) -> Unit>>()
+            ConcurrentHashMap<String, CopyOnWriteArrayList<(VisibilityState) -> Unit>>()
 
-        private val voiceInputListeners = mutableListOf<(Location?, String?) -> Unit>()
+        private val voiceInputListeners = CopyOnWriteArrayList<(Location?, String?) -> Unit>()
 
         private val safeAreaInsetsListeners =
-            mutableMapOf<String, MutableList<(SafeAreaInsets) -> Unit>>()
+            ConcurrentHashMap<String, CopyOnWriteArrayList<(SafeAreaInsets) -> Unit>>()
 
 
         fun removeListeners(templateId: String) {

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

@@ -2,12 +2,14 @@ package com.margelo.nitro.swe.iternio.reactnativeautoplay
 
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.ThreadUtil
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
 
 class HybridCluster : HybridClusterSpec() {
     override fun addListener(
         eventType: ClusterEventName, callback: (String) -> Unit
     ): () -> Unit {
-        val callbacks = listeners.getOrPut(eventType) { mutableListOf() }
+        val callbacks = listeners.getOrPut(eventType) { CopyOnWriteArrayList() }
         callbacks.add(callback)
 
         eventQueue[eventType]?.forEach {
@@ -67,8 +69,8 @@ class HybridCluster : HybridClusterSpec() {
         const val TAG = "HybridCluster"
 
         private val listeners =
-            mutableMapOf<ClusterEventName, MutableList<(clusterId: String) -> Unit>>()
-        private val eventQueue = mutableMapOf<ClusterEventName, Array<String>>()
+            ConcurrentHashMap<ClusterEventName, CopyOnWriteArrayList<(clusterId: String) -> Unit>>()
+        private val eventQueue = ConcurrentHashMap<ClusterEventName, Array<String>>()
 
         private val colorSchemeListeners =
             mutableListOf<(clusterId: String, colorScheme: ColorScheme) -> Unit>()

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

@@ -250,7 +250,7 @@ class VirtualRenderer(
     private fun getMapTemplateConfig(): MapTemplateConfig? {
         val screenManager = AndroidAutoScreen.getScreen(moduleName)?.screenManager ?: return null
         val marker = screenManager.top.marker ?: return null
-        return AndroidAutoTemplate.getConfig(marker) as MapTemplateConfig?
+        return AndroidAutoTemplate.getTypedConfig<MapTemplateConfig>(marker)
     }
 
     private fun initRenderer() {

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

@@ -380,7 +380,7 @@ class MapTemplate(
             AndroidAutoScreen.invalidateSurfaceScreens()
 
             UiThreadUtil.runOnUiThread {
-                navigationManager.updateTrip(Trip.Builder().apply {
+                val trip = Trip.Builder().apply {
                     addStep(
                         currentStep, Parser.parseTravelEstimates(current.travelEstimates)
                     )
@@ -390,7 +390,14 @@ class MapTemplate(
                     getTripDestinations().forEach {
                         addDestination(it.key, it.value)
                     }
-                }.build())
+                }.build()
+                try {
+                    navigationManager.updateTrip(trip)
+                } catch(exception: IllegalStateException) {
+                    // Sometimes we get a "java.lang.IllegalStateException: Navigation is not started" here, although the navigation
+                    // is started already (we check for isNavigating at the top). So i guess this is a race condition, that we start navigation
+                    // and the AA app is not ready yet. Unfortunately we can not ask the AA app for it's state, so we just catch the error.
+                }
             }
         }
     }

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

@@ -63,10 +63,13 @@ class TripPreviewTemplate(
 
         return MapWithContentTemplate.Builder().apply {
             val pane = Pane.Builder().apply {
-                addRow(Row.Builder().apply {
-                    setTitle(Parser.parseText(selectedRoute.additionalInformationVariants))
-                    addText(Parser.parseText(selectedRoute.selectionSummaryVariants))
-                }.build())
+                selectedRoute.additionalInformationVariants.firstOrNull()
+                    ?.takeIf { it.isNotEmpty() }?.let {
+                    addRow(Row.Builder().apply {
+                        setTitle(Parser.parseText(selectedRoute.additionalInformationVariants))
+                        addText(Parser.parseText(selectedRoute.selectionSummaryVariants))
+                    }.build())
+                }
                 addRow(Row.Builder().apply {
                     setTitle(
                         "${textConfig.travelEstimatesTitle} ${

package/ios/scenes/HeadUnitSceneDelegate.swift

@@ -37,6 +37,18 @@ class HeadUnitSceneDelegate: AutoPlayScene, CPTemplateApplicationSceneDelegate {
         HybridAutoPlay.emit(event: .didconnect)
     }
 
+    func templateApplicationScene(
+        _ templateApplicationScene: CPTemplateApplicationScene,
+        didConnect interfaceController: CPInterfaceController
+    ) {
+        self.interfaceController = AutoPlayInterfaceController(
+            interfaceController: interfaceController
+        )
+        
+        connect(props: [:])
+        HybridAutoPlay.emit(event: .didconnect)
+    }
+
     func templateApplicationScene(
         _ templateApplicationScene: CPTemplateApplicationScene,
         didDisconnectInterfaceController interfaceController:

package/lib/specs/VoiceInput.nitro.d.ts

@@ -0,0 +1,8 @@
+import type { HybridObject } from 'react-native-nitro-modules';
+import type { CleanupCallback } from '../types/Event';
+export interface VoiceInput extends HybridObject<{
+    android: 'kotlin';
+    ios: 'swift';
+}> {
+    registerVoiceInputListener(callback: (voiceInputResult?: string, error?: string) => void): CleanupCallback;
+}

package/lib/specs/VoiceInput.nitro.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",

package/lib/hooks/useIsAutoPlayFocused.d.ts

@@ -1,7 +0,0 @@
-/**
- * A hook to determine if the CarPlay/Android Auto screen is currently focused (visible).
- *
- * @param moduleName The name of the module to listen to.
- * @returns `true` if the screen is focused, `false` otherwise.
- */
-export declare function useIsAutoPlayFocused(moduleName: string): boolean;

package/lib/hooks/useIsAutoPlayFocused.js

@@ -1,20 +0,0 @@
-import { useEffect, useState } from 'react';
-import { HybridAutoPlay } from '..';
-/**
- * A hook to determine if the CarPlay/Android Auto screen is currently focused (visible).
- *
- * @param moduleName The name of the module to listen to.
- * @returns `true` if the screen is focused, `false` otherwise.
- */
-export function useIsAutoPlayFocused(moduleName) {
-    const [isFocused, setIsFocused] = useState(false);
-    useEffect(() => {
-        const remove = HybridAutoPlay.addListenerRenderState(moduleName, (state) => {
-            setIsFocused(state === 'didAppear');
-        });
-        return () => {
-            remove();
-        };
-    }, [moduleName]);
-    return isFocused;
-}

package/lib/hybrid.d.ts

@@ -1,2 +0,0 @@
-import type { AutoPlay as NitroAutoPlay } from './specs/AutoPlay.nitro';
-export declare const HybridAutoPlay: NitroAutoPlay;

package/lib/hybrid.js

@@ -1,2 +0,0 @@
-import { NitroModules } from 'react-native-nitro-modules';
-export const HybridAutoPlay = NitroModules.createHybridObject('AutoPlay');