@iternio/react-native-auto-play 0.3.1 → 0.3.3

package/ReactNativeAutoPlay.podspec

@@ -37,7 +37,6 @@ Pod::Spec.new do |s|
   load 'nitrogen/generated/ios/ReactNativeAutoPlay+autolinking.rb'
   add_nitrogen_files(s)
 
-  s.dependency 'React-Core'
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
   install_modules_dependencies(s)

package/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.13.0"
+    classpath "com.android.tools.build:gradle:8.13.2"
   }
 }
 
@@ -14,18 +14,11 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
 apply plugin: 'org.jetbrains.kotlin.android'
 apply from: '../nitrogen/generated/android/ReactNativeAutoPlay+autolinking.gradle'
 apply from: "./fix-prefab.gradle"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["ReactNativeAutoPlay_" + name]
@@ -117,12 +110,10 @@ android {
 
   sourceSets {
     main {
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += [
-          // React Codegen files
-          "${project.buildDir}/generated/source/codegen/java"
-        ]
-      }
+      java.srcDirs += [
+        // React Codegen files
+        "${project.buildDir}/generated/source/codegen/java"
+      ]
 
       if (getExtOrDefault("isAutomotiveApp") == "true") {
         java.srcDirs += 'src/automotive/java'
@@ -163,6 +154,6 @@ dependencies {
   }
 
   implementation 'com.google.android.gms:play-services-base:18.10.0'
-  implementation 'com.google.android.gms:play-services-auth:21.5.0'
+  implementation 'com.google.android.gms:play-services-auth:21.5.1'
 }
 

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

@@ -11,6 +11,7 @@ import android.content.ServiceConnection
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
+import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.car.app.CarAppService
@@ -61,11 +62,13 @@ class AndroidAutoService : CarAppService() {
         notificationManager = getSystemService(NotificationManager::class.java)
         val appLabel = AppInfo.getApplicationLabel(this)
 
-        getSystemService(NotificationManager::class.java).createNotificationChannel(
-            NotificationChannel(
-                CHANNEL_ID, appLabel, NotificationManager.IMPORTANCE_DEFAULT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getSystemService(NotificationManager::class.java).createNotificationChannel(
+                NotificationChannel(
+                    CHANNEL_ID, appLabel, NotificationManager.IMPORTANCE_DEFAULT
+                )
             )
-        )
+        }
     }
 
     override fun onCreateSession(sessionInfo: SessionInfo): Session {

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

@@ -2,59 +2,35 @@ package com.margelo.nitro.swe.iternio.reactnativeautoplay.utils
 
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceEventListener
-import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
-import com.margelo.nitro.BuildConfig
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
 object ReactContextResolver {
     suspend fun getReactContext(application: ReactApplication): ReactContext {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            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)
+        val host =
+            application.reactHost ?: throw IllegalArgumentException("application host null")
 
-                continuation.invokeOnCancellation {
-                    host.removeReactInstanceEventListener(listener)
-                }
-
-                host.start()
+        return suspendCancellableCoroutine { continuation ->
+            host.currentReactContext?.let {
+                continuation.resume(it)
+                return@suspendCancellableCoroutine
             }
-        } else {
-            val reactInstanceManager = application.reactNativeHost.reactInstanceManager
-            return suspendCancellableCoroutine { continuation ->
-                reactInstanceManager.currentReactContext?.let {
-                    continuation.resume(it)
-                    return@suspendCancellableCoroutine
-                }
 
-                val listener = object : ReactInstanceManager.ReactInstanceEventListener {
-                    override fun onReactContextInitialized(context: ReactContext) {
-                        reactInstanceManager.removeReactInstanceEventListener(this)
-                        continuation.resume(context)
-                    }
-                }
-                reactInstanceManager.addReactInstanceEventListener(listener)
-
-                continuation.invokeOnCancellation {
-                    reactInstanceManager.removeReactInstanceEventListener(listener)
+            val listener = object : ReactInstanceEventListener {
+                override fun onReactContextInitialized(context: ReactContext) {
+                    host.removeReactInstanceEventListener(this)
+                    continuation.resume(context)
                 }
+            }
+            host.addReactInstanceEventListener(listener)
 
-                reactInstanceManager.createReactContextInBackground()
+            continuation.invokeOnCancellation {
+                host.removeReactInstanceEventListener(listener)
             }
+
+            host.start()
         }
+
     }
 }

package/ios/ReactHelpers/NitroSurface.m

@@ -9,7 +9,7 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTRootView.h>
 #import <React/RCTSurface.h>
-#import <React/RCTSurfaceHostingProxyRootView.h>
+#import <React/RCTSurfaceHostingView.h>
 
 @implementation NitroSurface
 
@@ -20,8 +20,8 @@
     }
 
     if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {
-        RCTSurfaceHostingProxyRootView *rootView =
-            (RCTSurfaceHostingProxyRootView *)view;
+        RCTSurfaceHostingView *rootView =
+            (RCTSurfaceHostingView *)view;
         
         if (rootView == nil) {
             NSLog(@"[AutoPlay] rootView == nil, cannot stop");
@@ -30,7 +30,7 @@
         
         [rootView.surface stop];
     }
-    
+
     NSLog(@"[AutoPlay] View is not recognized type, ignoring");
 }
 

package/ios/Types.swift

@@ -12,7 +12,6 @@ struct TemplateEventPayload {
 
 enum AutoPlayError: Error {
     case templateNotFound(String)
-    case sceneNotFound(String)
     case interfaceControllerNotFound(String)
     case invalidTemplateError(String)
     case propertyNotFoundError(String)

package/ios/hybrid/HybridAutoPlay.swift

@@ -147,7 +147,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         -> NitroModules.Promise<Void>
     {
         return Promise.async {
-            return try await RootModule.withSceneAndInterfaceController {
+            try await RootModule.withSceneAndInterfaceController {
                 scene,
                 interfaceController in
 
@@ -196,7 +196,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
 
     func popTemplate(animate: Bool?) throws -> NitroModules.Promise<Void> {
         return Promise.async {
-            return try await RootModule.withInterfaceController {
+            try await RootModule.withInterfaceController {
                 interfaceController in
 
                 if try await interfaceController.dismissTemplate(
@@ -240,7 +240,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
         Void
     > {
         return Promise.async {
-            return try await RootModule.withInterfaceController {
+            try await RootModule.withInterfaceController {
                 interfaceController in
 
                 let _ = try await interfaceController.dismissTemplate(

package/ios/hybrid/HybridCarPlayDashboard.swift

@@ -32,7 +32,7 @@ class HybridCarPlayDashboard: HybridCarPlayDashboardSpec {
 
     func initRootView() throws -> Promise<Void> {
         return Promise.async {
-            guard let scene = try SceneStore.getDashboardScene() else { return }
+            guard let scene = SceneStore.getDashboardScene() else { return }
             try await MainActor.run {
                 try scene.initRootView()
             }
@@ -43,9 +43,9 @@ class HybridCarPlayDashboard: HybridCarPlayDashboardSpec {
         Void
     > {
         return Promise.async {
-            try await MainActor.run {
-                let scene = try SceneStore.getDashboardScene()
-                scene?.setButtons(buttons: buttons)
+            await MainActor.run {
+                guard let scene = SceneStore.getDashboardScene() else { return }
+                scene.setButtons(buttons: buttons)
             }
         }
     }

package/ios/hybrid/HybridCluster.swift

@@ -57,10 +57,13 @@ class HybridCluster: HybridClusterSpec {
         return Promise.async {
             if #available(iOS 15.4, *) {
                 try await MainActor.run {
-                    let scene = try SceneStore.getClusterScene(
+                    guard let scene = SceneStore.getClusterScene(
                         clusterId: clusterId
-                    )
-                    try scene?.initRootView()
+                    ) else {
+                        return
+                    }
+                    
+                    try scene.initRootView()
                 }
             }
             else {
@@ -77,10 +80,13 @@ class HybridCluster: HybridClusterSpec {
             [NitroAttributedString]
     ) throws {
         if #available(iOS 15.4, *) {
-            let scene = try SceneStore.getClusterScene(
+            guard let scene = SceneStore.getClusterScene(
                 clusterId: clusterId
-            )
-            scene?.setAttributedInactiveDescriptionVariants(
+            ) else {
+                return
+            }
+            
+            scene.setAttributedInactiveDescriptionVariants(
                 attributedInactiveDescriptionVariants:
                     attributedInactiveDescriptionVariants
             )

package/ios/scenes/SceneStore.swift

@@ -49,22 +49,20 @@ class SceneStore {
         )
     }
 
-    static func getDashboardScene() throws -> DashboardSceneDelegate? {
+    static func getDashboardScene() -> DashboardSceneDelegate? {
         guard
             let scene = SceneStore.getScene(
                 moduleName: SceneStore.dashboardModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.dashboardModuleName) scene not found"
-            )
+            return nil
         }
 
         return scene as? DashboardSceneDelegate
     }
 
     @available(iOS 15.4, *)
-    static func getClusterScene(clusterId: String) throws
+    static func getClusterScene(clusterId: String)
         -> ClusterSceneDelegate?
     {
         guard
@@ -72,9 +70,7 @@ class SceneStore {
                 moduleName: clusterId
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(clusterId) scene not found"
-            )
+            return nil
         }
 
         return scene as? ClusterSceneDelegate

package/ios/templates/MapTemplate.swift

@@ -580,10 +580,10 @@ class MapTemplate: AutoPlayHeaderProviding,
 
         guard let trip = navigationSession?.trip else { return }
 
-        let travelEstaimtes = trip.routeChoices.first?
+        let travelEstimates = trip.routeChoices.first?
             .travelEstimates
         if let estimates = self.visibleTravelEstimate == .first
-            ? travelEstaimtes?.first : travelEstaimtes?.last
+            ? travelEstimates?.first : travelEstimates?.last
         {
             template.updateEstimates(estimates, for: trip)
         }

package/ios/utils/RootModule.swift

@@ -16,9 +16,7 @@ class RootModule {
                 moduleName: SceneStore.rootModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.rootModuleName) scene not found"
-            )
+            return
         }
 
         try action(scene)
@@ -51,35 +49,16 @@ class RootModule {
         }
     }
 
-    static func withTemplate<T: CPTemplate>(
-        templateId: String,
-        perform action: @escaping (T) throws -> Void
-    ) throws {
-        try withAutoPlayTemplate(templateId: templateId) {
-            (autoPlayTemplate: AutoPlayTemplate) in
-            if let template = autoPlayTemplate.getTemplate() as? T {
-                try! action(template)
-            }
-            else {
-                throw AutoPlayError.invalidTemplateType(
-                    "\(autoPlayTemplate) is not a \(T.self) template"
-                )
-            }
-        }
-    }
-
     static func withScene<T>(
         perform action:
             @escaping (AutoPlayScene) async throws -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         guard
             let scene = SceneStore.getScene(
                 moduleName: SceneStore.rootModuleName
             )
         else {
-            throw AutoPlayError.sceneNotFound(
-                "operation failed, \(SceneStore.rootModuleName) scene not found"
-            )
+            return nil
         }
 
         return try await action(scene)
@@ -90,7 +69,7 @@ class RootModule {
         perform action:
             @escaping (AutoPlayScene, AutoPlayInterfaceController) async throws
             -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         return try await withScene { scene in
             guard let interfaceController = scene.interfaceController else {
                 throw AutoPlayError.interfaceControllerNotFound(
@@ -106,7 +85,7 @@ class RootModule {
     static func withInterfaceController<T>(
         perform action:
             @escaping (AutoPlayInterfaceController) async throws -> T
-    ) async throws -> T {
+    ) async throws -> T? {
         try await withSceneAndInterfaceController { _, interfaceController in
             try await action(interfaceController)
         }

package/package.json

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