@iternio/react-native-auto-play 0.3.7 → 0.3.8

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

@@ -23,17 +23,11 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.LifecycleEventListener
-import com.facebook.react.bridge.ReactContext
+import com.margelo.nitro.NitroModules
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.AppInfo
-import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.ReactContextResolver
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 class AndroidAutoService : CarAppService() {
-    private lateinit var reactContext: ReactContext
     private lateinit var notificationManager: NotificationManager
 
     private var isServiceBound = false
@@ -54,10 +48,7 @@ class AndroidAutoService : CarAppService() {
         super.onCreate()
         instance = this
 
-        CoroutineScope(Dispatchers.Main).launch {
-            reactContext = ReactContextResolver.getReactContext(application as ReactApplication)
-            reactContext.addLifecycleEventListener(reactLifecycleObserver)
-        }
+        NitroModules.applicationContext?.addLifecycleEventListener(reactLifecycleObserver)
 
         notificationManager = getSystemService(NotificationManager::class.java)
         val appLabel = AppInfo.getApplicationLabel(this)
@@ -72,7 +63,7 @@ class AndroidAutoService : CarAppService() {
     }
 
     override fun onCreateSession(sessionInfo: SessionInfo): Session {
-        val session = AndroidAutoSession(sessionInfo, application as ReactApplication)
+        val session = AndroidAutoSession(sessionInfo)
 
         if (sessionInfo.displayType == SessionInfo.DISPLAY_TYPE_CLUSTER) {
             return session
@@ -89,11 +80,9 @@ class AndroidAutoService : CarAppService() {
 
         stopForeground(STOP_FOREGROUND_REMOVE)
 
-        if (!this::reactContext.isInitialized) {
-            return
-        }
+        NitroModules.applicationContext?.removeLifecycleEventListener(reactLifecycleObserver)
 
-        reactContext.removeLifecycleEventListener(reactLifecycleObserver)
+        VirtualRenderer.remove()
     }
 
     private val reactLifecycleObserver = object : LifecycleEventListener {

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

@@ -12,21 +12,16 @@ import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.Template
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.LifecycleEventListener
-import com.facebook.react.bridge.ReactContext
+import com.margelo.nitro.NitroModules
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.MapTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.AppInfo
-import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.ReactContextResolver
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
-class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication: ReactApplication) :
+class AndroidAutoSession(sessionInfo: SessionInfo) :
     Session() {
 
     private val isCluster = sessionInfo.displayType == SessionInfo.DISPLAY_TYPE_CLUSTER
@@ -89,34 +84,29 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
         }
 
         lifecycle.addObserver(sessionLifecycleObserver)
+        NitroModules.applicationContext?.addLifecycleEventListener(reactLifecycleObserver)
 
-        CoroutineScope(Dispatchers.Main).launch {
-            reactContext = ReactContextResolver.getReactContext(reactApplication)
-            reactContext.addLifecycleEventListener(reactLifecycleObserver)
-
-            // TODO this is not required for templates that host a component, check if we need this for non-rendering templates
-            /*
-            val appRegistry = reactContext.getJSModule(AppRegistry::class.java)
-                ?: throw ClassNotFoundException("could not get AppRegistry instance")
-            val jsAppModuleName = if (isCluster) "AndroidAutoCluster" else "AndroidAuto"
-            val appParams = WritableNativeMap().apply {
-                putMap("initialProps", Arguments.createMap().apply {
-                    putString("id", clusterTemplateId)
-                })
-            }
-
-            appRegistry.runApplication(jsAppModuleName, appParams)
-            */
-
-            if (clusterId != null) {
-                HybridCluster.emit(ClusterEventName.DIDCONNECTWITHWINDOW, clusterId)
-                return@launch
-            }
-
+        if (clusterId == null) {
             HybridAutoPlay.emit(EventName.DIDCONNECT)
+        } else {
+            HybridCluster.emit(ClusterEventName.DIDCONNECTWITHWINDOW, clusterId)
         }
 
         return screen
+
+        // TODO this is not required for templates that host a component, check if we need this for non-rendering templates
+        /*
+        val appRegistry = reactContext.getJSModule(AppRegistry::class.java)
+            ?: throw ClassNotFoundException("could not get AppRegistry instance")
+        val jsAppModuleName = if (isCluster) "AndroidAutoCluster" else "AndroidAuto"
+        val appParams = WritableNativeMap().apply {
+            putMap("initialProps", Arguments.createMap().apply {
+                putString("id", clusterTemplateId)
+            })
+        }
+
+        appRegistry.runApplication(jsAppModuleName, appParams)
+        */
     }
 
     override fun onCarConfigurationChanged(configuration: Configuration) {
@@ -129,7 +119,7 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
         }
 
         val marker = AndroidAutoScreen.getScreen(ROOT_SESSION)?.marker ?: return
-        val config = AndroidAutoTemplate.getConfig(marker) as MapTemplateConfig? ?: return
+        val config = AndroidAutoTemplate.getConfig(marker) as? MapTemplateConfig? ?: return
 
         if (config.onAppearanceDidChange != null) {
             config.onAppearanceDidChange(colorScheme)
@@ -218,7 +208,6 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
 
         override fun onDestroy(owner: LifecycleOwner) {
             sessions.remove(moduleName)
-            VirtualRenderer.removeRenderer(moduleName)
             clusterId?.let {
                 HybridCluster.emit(ClusterEventName.DIDDISCONNECT, clusterId)
                 clusterSessions.remove(it)
@@ -247,7 +236,6 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
         const val TAG = "AndroidAutoSession"
         const val ROOT_SESSION = "AutoPlayRoot"
 
-        private lateinit var reactContext: ReactContext
         private val sessions = ConcurrentHashMap<String, ScreenContext>()
 
         private val clusterSessions = CopyOnWriteArrayList<String>()

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

@@ -9,6 +9,13 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 class HybridAutoPlay : HybridAutoPlaySpec() {
+    init {
+        listeners.clear()
+        renderStateListeners.clear()
+        voiceInputListeners.clear()
+        safeAreaInsetsListeners.clear()
+    }
+
     override fun addListener(
         eventType: EventName, callback: () -> Unit
     ): () -> Unit {

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

@@ -6,6 +6,12 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 class HybridCluster : HybridClusterSpec() {
+    init {
+        listeners.clear()
+        eventQueue.clear()
+        colorSchemeListeners.clear()
+    }
+
     override fun addListener(
         eventType: ClusterEventName, callback: (String) -> Unit
     ): () -> Unit {

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

@@ -2,12 +2,11 @@ package com.margelo.nitro.swe.iternio.reactnativeautoplay
 
 import android.app.Presentation
 import android.content.Context
-import android.view.ContextThemeWrapper
 import android.graphics.Color
 import android.graphics.Rect
 import android.hardware.display.DisplayManager
+import android.hardware.display.VirtualDisplay
 import android.os.Bundle
-import android.util.Log
 import android.view.Display
 import android.view.LayoutInflater
 import android.view.View
@@ -15,11 +14,11 @@ import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.FrameLayout
 import android.widget.TextView
+import androidx.annotation.MainThread
 import androidx.car.app.AppManager
 import androidx.car.app.CarContext
 import androidx.car.app.SurfaceCallback
 import androidx.car.app.SurfaceContainer
-import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.fabric.FabricUIManager
@@ -28,13 +27,11 @@ import com.facebook.react.runtime.ReactSurfaceView
 import com.facebook.react.uimanager.DisplayMetricsHolder
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
+import com.margelo.nitro.NitroModules
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.AppInfo
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.Debouncer
-import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.ReactContextResolver
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.floor
 
 class VirtualRenderer(
@@ -42,14 +39,7 @@ class VirtualRenderer(
     private val moduleName: String,
     private val isCluster: Boolean = false
 ) {
-    private lateinit var fabricUiManager: FabricUIManager
-
-    private fun isUiManagerInitialized(): Boolean {
-        return ::fabricUiManager.isInitialized
-    }
-
-    private lateinit var display: Display
-    private lateinit var reactContext: ReactContext
+    private var virtualDisplay: VirtualDisplay? = null
 
     private lateinit var reactSurfaceImpl: ReactSurfaceImpl
     private var reactSurfaceView: ReactSurfaceView? = null
@@ -66,20 +56,13 @@ class VirtualRenderer(
     private val virtualScreenDensity = context.resources.displayMetrics.density
     val scale = BuildConfig.SCALE_FACTOR * virtualScreenDensity
 
+    private fun isSurfaceReady(surfaceContainer: SurfaceContainer): Boolean {
+        return surfaceContainer.surface != null && surfaceContainer.dpi != 0 && surfaceContainer.height != 0 && surfaceContainer.width != 0
+    }
+
     init {
         virtualRenderer[moduleName] = this
 
-        CoroutineScope(Dispatchers.Main).launch {
-            reactContext =
-                ReactContextResolver.getReactContext(context.applicationContext as ReactApplication)
-
-            fabricUiManager = UIManagerHelper.getUIManager(
-                reactContext, UIManagerType.FABRIC
-            ) as FabricUIManager
-
-            initRenderer()
-        }
-
         context.getCarService(AppManager::class.java).setSurfaceCallback(object : SurfaceCallback {
             val areaDebouncer = Debouncer(200)
 
@@ -90,13 +73,14 @@ class VirtualRenderer(
             var visibleArea = Rect(0, 0, 0, 0)
 
             override fun onSurfaceAvailable(surfaceContainer: SurfaceContainer) {
-                if (surfaceContainer.surface == null) {
-                    Log.w(TAG, "surface is null")
+                if (!isSurfaceReady(surfaceContainer)) {
                     return
                 }
 
+                virtualDisplay?.release() // in case this is called multiple times release the old instance
+
                 val manager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-                val virtualDisplay = manager.createVirtualDisplay(
+                virtualDisplay = manager.createVirtualDisplay(
                     moduleName,
                     surfaceContainer.width,
                     surfaceContainer.height,
@@ -105,11 +89,15 @@ class VirtualRenderer(
                     DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION,
                 )
 
-                display = virtualDisplay.display
+                val display = virtualDisplay?.display ?: return
                 height = surfaceContainer.height
                 width = surfaceContainer.width
 
-                initRenderer()
+                initRenderer(display)
+            }
+
+            override fun onSurfaceDestroyed(surfaceContainer: SurfaceContainer) {
+                stop()
             }
 
             override fun onScroll(distanceX: Float, distanceY: Float) {
@@ -247,10 +235,12 @@ class VirtualRenderer(
         return AndroidAutoTemplate.getTypedConfig<MapTemplateConfig>(marker)
     }
 
-    private fun initRenderer() {
-        if (!this::display.isInitialized) {
-            return
-        }
+    private fun initRenderer(display: Display) {
+        val reactContext = NitroModules.applicationContext ?: return
+
+        val fabricUiManager = UIManagerHelper.getUIManager(
+            reactContext, UIManagerType.FABRIC
+        ) as? FabricUIManager? ?: return
 
         val initialProperties = Bundle().apply {
             putString("id", moduleName)
@@ -270,20 +260,21 @@ class VirtualRenderer(
         val mainScreenDensity = DisplayMetricsHolder.getScreenDisplayMetrics().density
         val reactNativeScale = virtualScreenDensity / mainScreenDensity * BuildConfig.SCALE_FACTOR
 
-        if (!isUiManagerInitialized()) {
-            // this makes sure we have all required instances
-            // no matter if the app is launched on the phone or AA first
-            return
-        }
-
         FabricMapPresentation(
-            context, display, height, width, initialProperties, reactNativeScale
+            reactContext,
+            display,
+            fabricUiManager,
+            height,
+            width,
+            initialProperties,
+            reactNativeScale
         ).show()
     }
 
     inner class FabricMapPresentation(
-        private val context: CarContext,
+        private val context: ReactContext,
         display: Display,
+        private val fabricUiManager: FabricUIManager,
         private val height: Int,
         private val width: Int,
         private val initialProperties: Bundle,
@@ -292,11 +283,8 @@ class VirtualRenderer(
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
 
-            val appTheme = context.applicationContext.applicationInfo.theme
-            val themedContext = ContextThemeWrapper(context.applicationContext, appTheme)
-
             if (!this@VirtualRenderer::reactSurfaceImpl.isInitialized) {
-                reactSurfaceImpl = ReactSurfaceImpl(themedContext, moduleName, initialProperties)
+                reactSurfaceImpl = ReactSurfaceImpl(context, moduleName, initialProperties)
             }
 
             var splashScreenView: View? = null
@@ -305,9 +293,9 @@ class VirtualRenderer(
                 (it.parent as ViewGroup).removeView(it)
             } ?: run {
                 splashScreenView =
-                    if (isCluster) getClusterSplashScreen(themedContext, height, width) else null
+                    if (isCluster) getClusterSplashScreen(context, height, width) else null
 
-                val surfaceView = ReactSurfaceView(themedContext, reactSurfaceImpl).apply {
+                val surfaceView = ReactSurfaceView(context, reactSurfaceImpl).apply {
                     layoutParams = FrameLayout.LayoutParams(
                         (width / reactNativeScale).toInt(), (height / reactNativeScale).toInt()
                     )
@@ -335,7 +323,7 @@ class VirtualRenderer(
                 )
 
                 // remove ui-managers lifecycle listener to not stop rendering when app is not in foreground/phone screen is off
-                reactContext.removeLifecycleEventListener(fabricUiManager)
+                context.removeLifecycleEventListener(fabricUiManager)
                 // trigger ui-managers onHostResume to make sure the surface is rendered properly even when AA only is starting without the phone app
                 fabricUiManager.onHostResume()
 
@@ -343,7 +331,7 @@ class VirtualRenderer(
             }
 
 
-            val rootContainer = FrameLayout(themedContext).apply {
+            val rootContainer = FrameLayout(context).apply {
                 layoutParams = FrameLayout.LayoutParams(
                     FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT
                 )
@@ -365,8 +353,7 @@ class VirtualRenderer(
     ): View {
         val root = FrameLayout(context).apply {
             layoutParams = ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
             )
         }
 
@@ -407,25 +394,41 @@ class VirtualRenderer(
         })
     }
 
+    @MainThread
+    private fun stop() {
+        virtualDisplay?.release()
+        virtualDisplay = null
+
+        val uiManager = NitroModules.applicationContext?.let {
+            UIManagerHelper.getUIManager(
+                it, UIManagerType.FABRIC
+            ) as? FabricUIManager?
+        }
+
+        try {
+            reactSurfaceId?.let {
+                uiManager?.stopSurface(it)
+            }
+        } catch (_: AssertionError) {
+            // Fabric already invalidated
+        } finally {
+            reactSurfaceId = null
+            virtualRenderer.remove(moduleName)
+        }
+    }
+
     companion object {
         const val TAG = "VirtualRenderer"
 
-        private val virtualRenderer = mutableMapOf<String, VirtualRenderer>()
+        private val virtualRenderer = ConcurrentHashMap<String, VirtualRenderer>()
 
         fun hasRenderer(moduleId: String): Boolean {
             return virtualRenderer.contains(moduleId)
         }
 
-        fun removeRenderer(moduleId: String) {
-            val renderer = virtualRenderer[moduleId]
-
-            if (renderer?.isUiManagerInitialized() == true) {
-                renderer.reactSurfaceId?.let {
-                    renderer.fabricUiManager.stopSurface(it)
-                }
-            }
-
-            virtualRenderer.remove(moduleId)
+        fun remove() {
+            virtualRenderer.forEach { (_, renderer) -> renderer.stop() }
+            virtualRenderer.clear()
         }
     }
 }

package/ios/hybrid/HybridAutoPlay.swift

@@ -21,6 +21,13 @@ class HybridAutoPlay: HybridAutoPlaySpec {
     private static var renderStateListeners = [String: [RenderStateListener]]()
     private static var safeAreaInsetsListeners = [String: [SafeAreaListener]]()
 
+    override init() {
+        HybridAutoPlay.listeners.removeAll()
+        HybridAutoPlay.renderStateListeners.removeAll()
+        HybridAutoPlay.safeAreaInsetsListeners.removeAll()
+        super.init()
+    }
+
     func addListener(eventType: EventName, callback: @escaping () -> Void)
         throws -> () -> Void
     {

package/ios/hybrid/HybridCluster.swift

@@ -31,6 +31,16 @@ class HybridCluster: HybridClusterSpec {
         String: (_: String, _: Bool) -> Void
     ]()
 
+    override init() {
+        HybridCluster.listeners.removeAll()
+        HybridCluster.eventQueue.removeAll()
+        HybridCluster.colorSchemeListeners.removeAll()
+        HybridCluster.zoomListeners.removeAll()
+        HybridCluster.compassListeners.removeAll()
+        HybridCluster.speedLimitListeners.removeAll()
+        super.init()
+    }
+
     func addListener(
         eventType: ClusterEventName,
         callback: @escaping (_ clusterId: String) -> Void
@@ -57,12 +67,14 @@ class HybridCluster: HybridClusterSpec {
         return Promise.async {
             if #available(iOS 15.4, *) {
                 try await MainActor.run {
-                    guard let scene = SceneStore.getClusterScene(
-                        clusterId: clusterId
-                    ) else {
+                    guard
+                        let scene = SceneStore.getClusterScene(
+                            clusterId: clusterId
+                        )
+                    else {
                         return
                     }
-                    
+
                     try scene.initRootView()
                 }
             }
@@ -80,12 +92,14 @@ class HybridCluster: HybridClusterSpec {
             [NitroAttributedString]
     ) throws {
         if #available(iOS 15.4, *) {
-            guard let scene = SceneStore.getClusterScene(
-                clusterId: clusterId
-            ) else {
+            guard
+                let scene = SceneStore.getClusterScene(
+                    clusterId: clusterId
+                )
+            else {
                 return
             }
-            
+
             scene.setAttributedInactiveDescriptionVariants(
                 attributedInactiveDescriptionVariants:
                     attributedInactiveDescriptionVariants

package/lib/AutoPlayHeadlessJsTask.d.ts

@@ -1,4 +1,5 @@
+import type { AutoPlay as NitroAutoPlay } from './specs/AutoPlay.nitro';
 declare const _default: {
-    registerHeadlessTask: () => void;
+    registerHeadlessTask: (hybridAutoPlay: NitroAutoPlay) => void;
 };
 export default _default;

package/lib/AutoPlayHeadlessJsTask.js

@@ -1,15 +1,14 @@
 import { AppRegistry, Platform } from 'react-native';
-import { HybridAutoPlay } from '.';
-const taskProvider = () => () => new Promise((resolve) => {
-    const remove = HybridAutoPlay.addListener('didDisconnect', () => {
+const createTaskProvider = (hybridAutoPlay) => () => () => new Promise((resolve) => {
+    const remove = hybridAutoPlay.addListener('didDisconnect', () => {
         resolve();
         remove();
     });
 });
-const registerHeadlessTask = () => {
+const registerHeadlessTask = (hybridAutoPlay) => {
     if (Platform.OS !== 'android') {
         return;
     }
-    AppRegistry.registerHeadlessTask('AndroidAutoHeadlessJsTask', taskProvider);
+    AppRegistry.registerHeadlessTask('AndroidAutoHeadlessJsTask', createTaskProvider(hybridAutoPlay));
 };
 export default { registerHeadlessTask };

package/lib/components/SafeAreaInsetsContext.d.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { type SafeAreaInsets } from '..';
+import type { SafeAreaInsets } from '..';
 export declare const SafeAreaInsetsContext: React.Context<SafeAreaInsets>;
 export declare function SafeAreaInsetsProvider({ children, moduleName, }: {
     children: React.ReactNode;

package/lib/components/SafeAreaInsetsContext.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useEffect, useState } from 'react';
-import { HybridAutoPlay } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 const DEFAULT = { top: 0, bottom: 0, left: 0, right: 0 };
 export const SafeAreaInsetsContext = createContext(DEFAULT);
 export function SafeAreaInsetsProvider({ children, moduleName, }) {

package/lib/hooks/useAndroidAutoTelemetry.js

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { PermissionsAndroid } from 'react-native';
-import { HybridAndroidAutoTelemetry, HybridAutoPlay } from '..';
+import { HybridAndroidAutoTelemetry } from '../hybrid/HybridAndroidAutoTelemetry';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 /**
  * Hook to check if the telemetry permissions are granted. If the permissions are not granted, it will request them from the user.
  *

package/lib/hooks/useFocusedEffect.js

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
-import { HybridAutoPlay } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 /**
  * An effect hook that only runs when the CarPlay/Android Auto screen is visible to the user and dependencies have changed.
  * It behaves like `useEffect`, but the effect function is only executed if the screen is visible.

package/lib/hooks/useVoiceInput.d.ts

@@ -1,4 +1,4 @@
-import { type Location } from '..';
+import type { Location } from '..';
 export declare const useVoiceInput: () => {
     voiceInputResult: {
         coordinates: Location | undefined;

package/lib/hooks/useVoiceInput.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { HybridAutoPlay } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 export const useVoiceInput = () => {
     const [isConnected, setIsConnected] = useState(false);
     const [voiceInputResult, setVoiceInputResult] = useState();

package/lib/hybrid/HybridAndroidAutoTelemetry.android.d.ts

@@ -0,0 +1,2 @@
+import type { AndroidAutoTelemetry } from '../specs/AndroidAutoTelemetry.nitro';
+export declare const HybridAndroidAutoTelemetry: AndroidAutoTelemetry;

package/lib/hybrid/HybridAndroidAutoTelemetry.android.js

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

package/lib/hybrid/HybridAndroidAutoTelemetry.d.ts

@@ -0,0 +1,2 @@
+import type { AndroidAutoTelemetry } from '../specs/AndroidAutoTelemetry.nitro';
+export declare const HybridAndroidAutoTelemetry: AndroidAutoTelemetry | null;

package/lib/hybrid/HybridAndroidAutoTelemetry.js

@@ -0,0 +1 @@
+export const HybridAndroidAutoTelemetry = null;

package/lib/hybrid/HybridAutoPlay.d.ts

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

package/lib/hybrid/HybridAutoPlay.js

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

package/lib/index.d.ts

@@ -1,8 +1,8 @@
+import { HybridAndroidAutoTelemetry } from './hybrid/HybridAndroidAutoTelemetry';
+import { HybridAutoPlay } from './hybrid/HybridAutoPlay';
 import type { AndroidAutomotive } from './specs/AndroidAutomotive.nitro';
-import type { AndroidAutoTelemetry as NitroAndroidAutoTelemetry } from './specs/AndroidAutoTelemetry.nitro';
-import type { AutoPlay as NitroAutoPlay } from './specs/AutoPlay.nitro';
-export declare const HybridAutoPlay: NitroAutoPlay;
-export declare const HybridAndroidAutoTelemetry: NitroAndroidAutoTelemetry | null;
+export { HybridAutoPlay };
+export { HybridAndroidAutoTelemetry };
 export declare const HybridAndroidAutomotive: AndroidAutomotive | null;
 /**
  * These are the static module names for the app running on the mobile device, head unit screen and the CarPlay dashboard.

package/lib/index.js

@@ -1,11 +1,11 @@
 import { Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import AutoPlayHeadlessJsTask from './AutoPlayHeadlessJsTask';
-AutoPlayHeadlessJsTask.registerHeadlessTask();
-export const HybridAutoPlay = NitroModules.createHybridObject('AutoPlay');
-export const HybridAndroidAutoTelemetry = Platform.OS === 'android'
-    ? NitroModules.createHybridObject('AndroidAutoTelemetry')
-    : null;
+import { HybridAndroidAutoTelemetry } from './hybrid/HybridAndroidAutoTelemetry';
+import { HybridAutoPlay } from './hybrid/HybridAutoPlay';
+AutoPlayHeadlessJsTask.registerHeadlessTask(HybridAutoPlay);
+export { HybridAutoPlay };
+export { HybridAndroidAutoTelemetry };
 export const HybridAndroidAutomotive = Platform.OS === 'android'
     ? NitroModules.createHybridObject('AndroidAutomotive')
     : null;

package/lib/scenes/CarPlayDashboardScene.d.ts

@@ -27,9 +27,9 @@ declare class Dashboard {
      * @param eventType generic events
      * @returns callback to remove the listener
      */
-    addListener(event: EventName, callback: () => void): import("..").CleanupCallback;
-    addListenerRenderState(callback: (payload: VisibilityState) => void): import("..").CleanupCallback;
-    addListenerColorScheme(callback: (payload: ColorScheme) => void): import("..").CleanupCallback;
+    addListener(event: EventName, callback: () => void): import("../types/Event").CleanupCallback;
+    addListenerRenderState(callback: (payload: VisibilityState) => void): import("../types/Event").CleanupCallback;
+    addListenerColorScheme(callback: (payload: ColorScheme) => void): import("../types/Event").CleanupCallback;
 }
 export declare const CarPlayDashboard: Dashboard;
 export {};

package/lib/scenes/CarPlayDashboardScene.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
-import { HybridAutoPlay } from '..';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import { NitroImageUtil } from '../utils/NitroImage';
 const HybridCarPlayDashboard = Platform.OS === 'ios'
     ? NitroModules.createHybridObject('CarPlayDashboard')

package/lib/templates/MapTemplate.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type AutoText } from '..';
+import type { AutoText } from '..';
 import type { ActionButtonAndroid, MapButton, MapPanButton } from '../types/Button';
 import type { AutoManeuver } from '../types/Maneuver';
 import type { ColorScheme, RootComponentInitialProps } from '../types/RootComponent';

package/lib/templates/MapTemplate.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
-import { HybridAutoPlay } from '..';
 import { MapTemplateProvider } from '../components/MapTemplateContext';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import { NitroActionUtil } from '../utils/NitroAction';
 import { NitroAlertUtil } from '../utils/NitroAlert';
 import { NitroManeuverUtil } from '../utils/NitroManeuver';

package/lib/templates/MessageTemplate.d.ts

@@ -1,4 +1,4 @@
-import { type AutoImage, type BaseMapTemplateConfig, type CustomActionButtonAndroid, type HeaderActionsAndroid, type TextButton } from '..';
+import type { AutoImage, BaseMapTemplateConfig, CustomActionButtonAndroid, HeaderActionsAndroid, TextButton } from '..';
 import type { AutoText } from '../types/Text';
 import { type NitroAction } from '../utils/NitroAction';
 import { type NitroImage } from '../utils/NitroImage';

package/lib/templates/MessageTemplate.js

@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import uuid from 'react-native-uuid';
-import { HybridAutoPlay, } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import { NitroActionUtil } from '../utils/NitroAction';
 import { NitroImageUtil } from '../utils/NitroImage';
 import { NitroMapButton } from '../utils/NitroMapButton';

package/lib/templates/Template.js

@@ -1,5 +1,5 @@
 import uuid from 'react-native-uuid';
-import { HybridAutoPlay } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import { NitroActionUtil } from '../utils/NitroAction';
 export class Template {
     id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",
@@ -36,8 +36,9 @@
     "typescript": "tsc",
     "generate:fonts": "node ./assets/symbolFont/bundleAsset.js",
     "specs": "nitrogen --logLevel=\"debug\"",
-    "prepare": "tsc && nitrogen && npm run generate:fonts",
-    "swift:format": "swift-format format ./ios --in-place --recursive"
+    "prepare": "yarn circular && tsc && nitrogen && npm run generate:fonts",
+    "swift:format": "swift-format format ./ios --in-place --recursive",
+    "circular": "dpdm ./src/* --circular --exit-code circular:1 --no-tree --warning=false --transform"
   },
   "keywords": [
     "react-native",
@@ -59,7 +60,8 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/react": "^19.1.03",
+    "@types/react": "~19.2.0",
+    "dpdm": "^4.0.1",
     "nitrogen": "^0.35.3",
     "typescript": "^5.8.3"
   },

package/src/AutoPlayHeadlessJsTask.ts

@@ -1,19 +1,22 @@
 import { AppRegistry, Platform, type Task, type TaskProvider } from 'react-native';
-import { HybridAutoPlay } from '.';
+import type { AutoPlay as NitroAutoPlay } from './specs/AutoPlay.nitro';
 
-const taskProvider: TaskProvider = (): Task => () =>
-  new Promise((resolve) => {
-    const remove = HybridAutoPlay.addListener('didDisconnect', () => {
-      resolve();
-      remove();
+const createTaskProvider =
+  (hybridAutoPlay: NitroAutoPlay): TaskProvider =>
+  (): Task =>
+  () =>
+    new Promise((resolve) => {
+      const remove = hybridAutoPlay.addListener('didDisconnect', () => {
+        resolve();
+        remove();
+      });
     });
-  });
 
-const registerHeadlessTask = () => {
+const registerHeadlessTask = (hybridAutoPlay: NitroAutoPlay) => {
   if (Platform.OS !== 'android') {
     return;
   }
-  AppRegistry.registerHeadlessTask('AndroidAutoHeadlessJsTask', taskProvider);
+  AppRegistry.registerHeadlessTask('AndroidAutoHeadlessJsTask', createTaskProvider(hybridAutoPlay));
 };
 
 export default { registerHeadlessTask };

package/src/components/SafeAreaInsetsContext.tsx

@@ -1,6 +1,7 @@
 import type React from 'react';
 import { createContext, useEffect, useState } from 'react';
-import { HybridAutoPlay, type SafeAreaInsets } from '..';
+import type { SafeAreaInsets } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 
 const DEFAULT: SafeAreaInsets = { top: 0, bottom: 0, left: 0, right: 0 };
 

package/src/hooks/useAndroidAutoTelemetry.ts

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { type Permission, PermissionsAndroid } from 'react-native';
-import { HybridAndroidAutoTelemetry, HybridAutoPlay } from '..';
+import { HybridAndroidAutoTelemetry } from '../hybrid/HybridAndroidAutoTelemetry';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 
 import type { AndroidAutoPermissions, Telemetry } from '../types/Telemetry';
 

package/src/hooks/useFocusedEffect.ts

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
-import { HybridAutoPlay } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 
 /**
  * An effect hook that only runs when the CarPlay/Android Auto screen is visible to the user and dependencies have changed.

package/src/hooks/useVoiceInput.ts

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
-import { HybridAutoPlay, type Location } from '..';
+import type { Location } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 
 export const useVoiceInput = () => {
   const [isConnected, setIsConnected] = useState(false);

package/src/hybrid/HybridAndroidAutoTelemetry.android.ts

@@ -0,0 +1,5 @@
+import { NitroModules } from 'react-native-nitro-modules';
+import type { AndroidAutoTelemetry } from '../specs/AndroidAutoTelemetry.nitro';
+
+export const HybridAndroidAutoTelemetry =
+  NitroModules.createHybridObject<AndroidAutoTelemetry>('AndroidAutoTelemetry');

package/src/hybrid/HybridAndroidAutoTelemetry.ts

@@ -0,0 +1,3 @@
+import type { AndroidAutoTelemetry } from '../specs/AndroidAutoTelemetry.nitro';
+
+export const HybridAndroidAutoTelemetry: AndroidAutoTelemetry | null = null;

package/src/hybrid/HybridAutoPlay.ts

@@ -0,0 +1,4 @@
+import { NitroModules } from 'react-native-nitro-modules';
+import type { AutoPlay } from '../specs/AutoPlay.nitro';
+
+export const HybridAutoPlay = NitroModules.createHybridObject<AutoPlay>('AutoPlay');

package/src/index.ts

@@ -1,18 +1,14 @@
 import { Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import AutoPlayHeadlessJsTask from './AutoPlayHeadlessJsTask';
+import { HybridAndroidAutoTelemetry } from './hybrid/HybridAndroidAutoTelemetry';
+import { HybridAutoPlay } from './hybrid/HybridAutoPlay';
 import type { AndroidAutomotive } from './specs/AndroidAutomotive.nitro';
-import type { AndroidAutoTelemetry as NitroAndroidAutoTelemetry } from './specs/AndroidAutoTelemetry.nitro';
-import type { AutoPlay as NitroAutoPlay } from './specs/AutoPlay.nitro';
 
-AutoPlayHeadlessJsTask.registerHeadlessTask();
+AutoPlayHeadlessJsTask.registerHeadlessTask(HybridAutoPlay);
 
-export const HybridAutoPlay = NitroModules.createHybridObject<NitroAutoPlay>('AutoPlay');
-
-export const HybridAndroidAutoTelemetry =
-  Platform.OS === 'android'
-    ? NitroModules.createHybridObject<NitroAndroidAutoTelemetry>('AndroidAutoTelemetry')
-    : null;
+export { HybridAutoPlay };
+export { HybridAndroidAutoTelemetry };
 
 export const HybridAndroidAutomotive =
   Platform.OS === 'android'

package/src/scenes/CarPlayDashboardScene.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
-import { HybridAutoPlay } from '..';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import type {
   BaseCarPlayDashboardButton,
   CarPlayDashboard as NitroCarPlayDashboard,

package/src/templates/MapTemplate.ts

@@ -1,9 +1,10 @@
 import React from 'react';
 import { AppRegistry, Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
-import { type AutoText, HybridAutoPlay } from '..';
+import type { AutoText } from '..';
 import { MapTemplateProvider } from '../components/MapTemplateContext';
 import { SafeAreaInsetsProvider } from '../components/SafeAreaInsetsContext';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import type { MapTemplate as NitroMapTemplate } from '../specs/MapTemplate.nitro';
 import type { ActionButtonAndroid, MapButton, MapPanButton } from '../types/Button';
 import type { AutoManeuver } from '../types/Maneuver';

package/src/templates/MessageTemplate.ts

@@ -1,14 +1,14 @@
 import { Platform } from 'react-native';
 import { NitroModules } from 'react-native-nitro-modules';
 import uuid from 'react-native-uuid';
-import {
-  type AutoImage,
-  type BaseMapTemplateConfig,
-  type CustomActionButtonAndroid,
-  type HeaderActionsAndroid,
-  HybridAutoPlay,
-  type TextButton,
+import type {
+  AutoImage,
+  BaseMapTemplateConfig,
+  CustomActionButtonAndroid,
+  HeaderActionsAndroid,
+  TextButton,
 } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import type { MessageTemplate as NitroMessageTemplate } from '../specs/MessageTemplate.nitro';
 import type { AutoText } from '../types/Text';
 import { type NitroAction, NitroActionUtil } from '../utils/NitroAction';

package/src/templates/Template.ts

@@ -1,5 +1,5 @@
 import uuid from 'react-native-uuid';
-import { HybridAutoPlay } from '..';
+import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
 import type { ActionButtonAndroid, ActionButtonIos, AppButton, BackButton } from '../types/Button';
 import { type NitroAction, NitroActionUtil } from '../utils/NitroAction';
 import type { NitroMapButton } from '../utils/NitroMapButton';

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

@@ -1,36 +0,0 @@
-package com.margelo.nitro.swe.iternio.reactnativeautoplay.utils
-
-import com.facebook.react.ReactApplication
-import com.facebook.react.ReactInstanceEventListener
-import com.facebook.react.bridge.ReactContext
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlin.coroutines.resume
-
-object ReactContextResolver {
-    suspend fun getReactContext(application: ReactApplication): ReactContext {
-        val host =
-            application.reactHost ?: throw IllegalArgumentException("application host null")
-
-        return suspendCancellableCoroutine { continuation ->
-            host.currentReactContext?.let {
-                continuation.resume(it)
-                return@suspendCancellableCoroutine
-            }
-
-            val listener = object : ReactInstanceEventListener {
-                override fun onReactContextInitialized(context: ReactContext) {
-                    host.removeReactInstanceEventListener(this)
-                    continuation.resume(context)
-                }
-            }
-            host.addReactInstanceEventListener(listener)
-
-            continuation.invokeOnCancellation {
-                host.removeReactInstanceEventListener(listener)
-            }
-
-            host.start()
-        }
-
-    }
-}