@iternio/react-native-auto-play 0.3.2 → 0.3.4

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/auto/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidTelemetryObserver.kt

@@ -27,7 +27,7 @@ object AndroidTelemetryObserver : TelemetryObserver() {
             model.year.value
         } else null
 
-        telemetryHolder.updateVehicle(name, manufacturer, year)
+        telemetryHolder.updateVehicle(name, manufacturer, year, null)
 
         telemetryHolder.toTelemetry()?.let {
             telemetryCallbacks.forEach { callback ->

package/android/src/automotive/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidTelemetryObserver.kt

@@ -45,7 +45,7 @@ object AndroidTelemetryObserver : TelemetryObserver() {
             VehiclePropertyIds.INFO_EV_BATTERY_CAPACITY, VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL
         )?.value ?: 0f
 
-        telemetryHolder.updateVehicle(carModel, carManufacturer, carModelYear)
+        telemetryHolder.updateVehicle(carModel, carManufacturer, carModelYear, batteryCapacity)
     }
 
     val vehiclePropertyReceiver = object : CarPropertyManager.CarPropertyEventCallback {

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/AndroidAutoTelemetryHolder.kt

@@ -42,14 +42,17 @@ class AndroidAutoTelemetryHolder {
     private var name: String? = null
     private var manufacturer: String? = null
     private var year: Int? = null
+    private var batteryCapacity: Float? = null
 
-    fun updateVehicle(name: String?, manufacturer: String?, year: Int?) = synchronized(lock) {
-        this.name = name
-        this.manufacturer = manufacturer
-        this.year = year
+    fun updateVehicle(name: String?, manufacturer: String?, year: Int?, batteryCapacity: Float?) =
+        synchronized(lock) {
+            this.name = name
+            this.manufacturer = manufacturer
+            this.year = year
+            this.batteryCapacity = batteryCapacity
 
-        isDirty = true
-    }
+            isDirty = true
+        }
 
     fun updateBatteryLevel(value: Float) = synchronized(lock) {
         if (batteryLevel == value) {
@@ -208,7 +211,8 @@ class AndroidAutoTelemetryHolder {
                 vehicle = VehicleTelemetryItem(
                     name = createStringTelemetryItem(name),
                     manufacturer = createStringTelemetryItem(manufacturer),
-                    year = createNumericTelemetryItem(year?.toFloat(), 0)
+                    year = createNumericTelemetryItem(year?.toFloat(), 0),
+                    batteryCapacity = createNumericTelemetryItem(batteryCapacity, 0)
                 )
             )
         }

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/lib/types/Telemetry.d.ts

@@ -41,6 +41,7 @@ type VehicleTelemetryItem = {
     name?: StringTelemetryItem;
     year?: NumericTelemetryItem;
     manufacturer?: StringTelemetryItem;
+    batteryCapacity?: NumericTelemetryItem;
 };
 export declare enum VehicleGear {
     Neutral = 1,

package/nitrogen/generated/android/c++/JVehicleTelemetryItem.hpp

@@ -42,10 +42,13 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       jni::local_ref<JNumericTelemetryItem> year = this->getFieldValue(fieldYear);
       static const auto fieldManufacturer = clazz->getField<JStringTelemetryItem>("manufacturer");
       jni::local_ref<JStringTelemetryItem> manufacturer = this->getFieldValue(fieldManufacturer);
+      static const auto fieldBatteryCapacity = clazz->getField<JNumericTelemetryItem>("batteryCapacity");
+      jni::local_ref<JNumericTelemetryItem> batteryCapacity = this->getFieldValue(fieldBatteryCapacity);
       return VehicleTelemetryItem(
         name != nullptr ? std::make_optional(name->toCpp()) : std::nullopt,
         year != nullptr ? std::make_optional(year->toCpp()) : std::nullopt,
-        manufacturer != nullptr ? std::make_optional(manufacturer->toCpp()) : std::nullopt
+        manufacturer != nullptr ? std::make_optional(manufacturer->toCpp()) : std::nullopt,
+        batteryCapacity != nullptr ? std::make_optional(batteryCapacity->toCpp()) : std::nullopt
       );
     }
 
@@ -55,14 +58,15 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
      */
     [[maybe_unused]]
     static jni::local_ref<JVehicleTelemetryItem::javaobject> fromCpp(const VehicleTelemetryItem& value) {
-      using JSignature = JVehicleTelemetryItem(jni::alias_ref<JStringTelemetryItem>, jni::alias_ref<JNumericTelemetryItem>, jni::alias_ref<JStringTelemetryItem>);
+      using JSignature = JVehicleTelemetryItem(jni::alias_ref<JStringTelemetryItem>, jni::alias_ref<JNumericTelemetryItem>, jni::alias_ref<JStringTelemetryItem>, jni::alias_ref<JNumericTelemetryItem>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         value.name.has_value() ? JStringTelemetryItem::fromCpp(value.name.value()) : nullptr,
         value.year.has_value() ? JNumericTelemetryItem::fromCpp(value.year.value()) : nullptr,
-        value.manufacturer.has_value() ? JStringTelemetryItem::fromCpp(value.manufacturer.value()) : nullptr
+        value.manufacturer.has_value() ? JStringTelemetryItem::fromCpp(value.manufacturer.value()) : nullptr,
+        value.batteryCapacity.has_value() ? JNumericTelemetryItem::fromCpp(value.batteryCapacity.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/swe/iternio/reactnativeautoplay/VehicleTelemetryItem.kt

@@ -25,7 +25,10 @@ data class VehicleTelemetryItem(
   val year: NumericTelemetryItem?,
   @DoNotStrip
   @Keep
-  val manufacturer: StringTelemetryItem?
+  val manufacturer: StringTelemetryItem?,
+  @DoNotStrip
+  @Keep
+  val batteryCapacity: NumericTelemetryItem?
 ) {
   /* primary constructor */
 
@@ -37,8 +40,8 @@ data class VehicleTelemetryItem(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(name: StringTelemetryItem?, year: NumericTelemetryItem?, manufacturer: StringTelemetryItem?): VehicleTelemetryItem {
-      return VehicleTelemetryItem(name, year, manufacturer)
+    private fun fromCpp(name: StringTelemetryItem?, year: NumericTelemetryItem?, manufacturer: StringTelemetryItem?, batteryCapacity: NumericTelemetryItem?): VehicleTelemetryItem {
+      return VehicleTelemetryItem(name, year, manufacturer, batteryCapacity)
     }
   }
 }

package/nitrogen/generated/shared/c++/VehicleTelemetryItem.hpp

@@ -47,10 +47,11 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
     std::optional<StringTelemetryItem> name     SWIFT_PRIVATE;
     std::optional<NumericTelemetryItem> year     SWIFT_PRIVATE;
     std::optional<StringTelemetryItem> manufacturer     SWIFT_PRIVATE;
+    std::optional<NumericTelemetryItem> batteryCapacity     SWIFT_PRIVATE;
 
   public:
     VehicleTelemetryItem() = default;
-    explicit VehicleTelemetryItem(std::optional<StringTelemetryItem> name, std::optional<NumericTelemetryItem> year, std::optional<StringTelemetryItem> manufacturer): name(name), year(year), manufacturer(manufacturer) {}
+    explicit VehicleTelemetryItem(std::optional<StringTelemetryItem> name, std::optional<NumericTelemetryItem> year, std::optional<StringTelemetryItem> manufacturer, std::optional<NumericTelemetryItem> batteryCapacity): name(name), year(year), manufacturer(manufacturer), batteryCapacity(batteryCapacity) {}
 
   public:
     friend bool operator==(const VehicleTelemetryItem& lhs, const VehicleTelemetryItem& rhs) = default;
@@ -68,7 +69,8 @@ namespace margelo::nitro {
       return margelo::nitro::swe::iternio::reactnativeautoplay::VehicleTelemetryItem(
         JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name"))),
         JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "year"))),
-        JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "manufacturer")))
+        JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "manufacturer"))),
+        JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "batteryCapacity")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::swe::iternio::reactnativeautoplay::VehicleTelemetryItem& arg) {
@@ -76,6 +78,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "name"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::toJSI(runtime, arg.name));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "year"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::toJSI(runtime, arg.year));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "manufacturer"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::toJSI(runtime, arg.manufacturer));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "batteryCapacity"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::toJSI(runtime, arg.batteryCapacity));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -89,6 +92,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name")))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "year")))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "manufacturer")))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "batteryCapacity")))) return false;
       return true;
     }
   };

package/package.json

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

package/src/types/Telemetry.ts

@@ -49,6 +49,7 @@ type VehicleTelemetryItem = {
   name?: StringTelemetryItem;
   year?: NumericTelemetryItem;
   manufacturer?: StringTelemetryItem;
+  batteryCapacity?: NumericTelemetryItem;
 };
 
 export enum VehicleGear {