@iternio/react-native-auto-play 0.2.0-alpha.2 → 0.2.0-alpha.4

package/android/build.gradle

@@ -163,7 +163,7 @@ dependencies {
     implementation "androidx.car.app:app-projected:1.7.0"
   }
 
-  implementation 'com.google.android.gms:play-services-base:18.3.0'
-  implementation 'com.google.android.gms:play-services-auth:21.0.0'
+  implementation 'com.google.android.gms:play-services-base:18.10.0'
+  implementation 'com.google.android.gms:play-services-auth:21.5.0'
 }
 

package/android/src/automotive/AndroidManifest.xml

@@ -75,6 +75,8 @@
 
         <service android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.HeadlessTaskService" />
 
+        <activity android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.SignInWithGoogleActivity" />
+
         <provider
             android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.ActivityRenderStateProvider"
             android:authorities="${applicationId}.ActivityRenderStateProvider"

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

@@ -61,7 +61,18 @@ object AndroidTelemetryObserver : TelemetryObserver() {
                                     selectedGear = NumericTelemetryItem(
                                         timestamp = floor(System.currentTimeMillis() / 1000.0),
                                         value = selectedGear.toDouble()
-                                    )
+                                    ),
+                                    vehicle = null,
+                                    batteryLevel = null,
+                                    range = null,
+                                    speed = null,
+                                    odometer = null,
+                                    fuelLevel = null,
+                                    parkingBrakeOn = null,
+                                    evChargePortConnected = null,
+                                    envOutsideTemperature = null,
+                                    evBatteryInstantaneousChargeRate = null,
+                                    soe = null
                                 )
                             )
                         }
@@ -82,7 +93,18 @@ object AndroidTelemetryObserver : TelemetryObserver() {
                                     selectedGear = NumericTelemetryItem(
                                         timestamp = floor(System.currentTimeMillis() / 1000.0),
                                         value = selectedGear.toDouble()
-                                    )
+                                    ),
+                                    vehicle = null,
+                                    batteryLevel = null,
+                                    range = null,
+                                    speed = null,
+                                    odometer = null,
+                                    fuelLevel = null,
+                                    parkingBrakeOn = null,
+                                    evChargePortConnected = null,
+                                    envOutsideTemperature = null,
+                                    evBatteryInstantaneousChargeRate = null,
+                                    soe = null
                                 )
                             )
                         }
@@ -101,14 +123,8 @@ object AndroidTelemetryObserver : TelemetryObserver() {
 
                         VehiclePropertyIds.EV_BATTERY_LEVEL -> {
                             val capacity = batteryCapacity ?: return
-                            if (capacity <= 0f) {
-                                throw Exception("got invalid battery capacity $capacity")
-                            }
-                            val soc = getValue<Float>(p0) / capacity * 100
-                            if (!soc.isFinite() || floor(soc) < 0 || floor(soc) > 100) {
-                                throw Exception("got invalid soc $soc, expecting value from 0 to 100 EV_BATTERY_LEVEL: ${p0.value}, evBatteryCapacity: $capacity")
-                            }
-                            telemetryHolder.updateBatteryLevel(soc)
+                            val level: Float = getValue(p0)
+                            telemetryHolder.updateBatteryLevel(level, capacity)
                         }
 
                         VehiclePropertyIds.PERF_VEHICLE_SPEED -> telemetryHolder.updateSpeed(

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

@@ -1,5 +1,7 @@
 package com.margelo.nitro.swe.iternio.reactnativeautoplay
 
+import kotlin.math.floor
+
 class AndroidAutoTelemetryHolder {
     private var isDirty = false
     private val lock = Any()
@@ -34,6 +36,9 @@ class AndroidAutoTelemetryHolder {
     private var parkingBrakeOn: Boolean? = null
     private var parkingBrakeOnTimestamp: Int? = null
 
+    private var soe: Float? = null
+    private var soeTimestamp: Int? = null
+
     private var name: String? = null
     private var manufacturer: String? = null
     private var year: Int? = null
@@ -146,6 +151,30 @@ class AndroidAutoTelemetryHolder {
         isDirty = true
     }
 
+    fun updateBatteryLevel(levelWh: Float, capacityWh: Float) = synchronized(lock) {
+        if (soe == levelWh) {
+            return
+        }
+
+        if (capacityWh <= 0f) {
+            throw Exception("got invalid battery capacity $capacityWh")
+        }
+
+        val soc = levelWh / capacityWh * 100
+        if (!soc.isFinite() || floor(soc) < 0 || floor(soc) > 100) {
+            throw Exception("got invalid soc $soc, expecting value from 0 to 100 EV_BATTERY_LEVEL: ${levelWh}, evBatteryCapacity: $capacityWh")
+        }
+
+        soe = levelWh
+        batteryLevel = soc
+
+        val timestamp = (System.currentTimeMillis() / 1000L).toInt()
+        soeTimestamp = timestamp
+        batteryLevelTimestamp = timestamp
+
+        isDirty = true
+    }
+
     fun toTelemetry(): Telemetry? {
         synchronized(lock) {
             if (!isDirty) {
@@ -173,6 +202,9 @@ class AndroidAutoTelemetryHolder {
                 evBatteryInstantaneousChargeRate = createNumericTelemetryItem(
                     evBatteryInstantaneousChargeRate, evBatteryInstantaneousChargeRateTimeStamp
                 ),
+                soe = createNumericTelemetryItem(
+                    soe, soeTimestamp
+                ),
                 vehicle = VehicleTelemetryItem(
                     name = createStringTelemetryItem(name),
                     manufacturer = createStringTelemetryItem(manufacturer),

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

@@ -0,0 +1,63 @@
+package com.margelo.nitro.swe.iternio.reactnativeautoplay
+
+import android.content.Intent
+import android.os.Binder
+import android.os.Bundle
+import android.os.IBinder
+import androidx.activity.ComponentActivity
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import java.security.InvalidParameterException
+import javax.annotation.Nullable
+
+class SignInWithGoogleActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val signInCompleteCallback =
+            intent.extras!!.getBinder(BINDER_KEY) as OnSignInComplete?
+
+        val serverClientId = intent.extras?.getString("serverClientId")
+            ?: throw InvalidParameterException("missing serverClientId parameter")
+
+        val activityResultLauncher =
+            registerForActivityResult<Intent, ActivityResult>(
+                ActivityResultContracts.StartActivityForResult()
+            ) { result: ActivityResult ->
+                val account =
+                    GoogleSignIn.getSignedInAccountFromIntent(
+                        result.data
+                    ).result
+                signInCompleteCallback!!.onSignInComplete(account)
+                finish()
+            }
+
+        val googleSignInClient = GoogleSignIn.getClient(
+            this, GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestServerAuthCode(serverClientId)
+                .requestEmail()
+                .build()
+        )
+        activityResultLauncher.launch(googleSignInClient.signInIntent)
+    }
+
+    /**
+     * Binder callback to provide to the sign in activity.
+     */
+    abstract
+    class OnSignInComplete : Binder(), IBinder {
+        /**
+         * Notifies that sign in flow completed.
+         *
+         * @param account the account signed in or `null` if there were issues signing in.
+         */
+        abstract fun onSignInComplete(@Nullable account: GoogleSignInAccount?)
+    }
+
+    companion object {
+        const val BINDER_KEY = "SignInWithGoogleActivity"
+    }
+}

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

@@ -1,20 +1,29 @@
 package com.margelo.nitro.swe.iternio.reactnativeautoplay.template
 
+import android.content.Intent
 import android.net.Uri
+import android.os.Bundle
+import androidx.annotation.Nullable
 import androidx.car.app.CarContext
+import androidx.car.app.CarToast
+import androidx.car.app.model.Action
 import androidx.car.app.model.ActionStrip
 import androidx.car.app.model.InputCallback
+import androidx.car.app.model.ParkedOnlyOnClickListener
 import androidx.car.app.model.Template
 import androidx.car.app.model.signin.InputSignInMethod
 import androidx.car.app.model.signin.InputSignInMethod.INPUT_TYPE_DEFAULT
 import androidx.car.app.model.signin.InputSignInMethod.INPUT_TYPE_PASSWORD
 import androidx.car.app.model.signin.PinSignInMethod
+import androidx.car.app.model.signin.ProviderSignInMethod
 import androidx.car.app.model.signin.QRCodeSignInMethod
 import androidx.car.app.model.signin.SignInTemplate
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.KeyboardType
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAction
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroActionType
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.SignInTemplateConfig
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.SignInWithGoogleActivity
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.TextInputType
 import java.security.InvalidParameterException
 
@@ -55,6 +64,7 @@ class SignInTemplate(
         val qrSignIn = config.signInMethod?.asFirstOrNull()
         val pinSignIn = config.signInMethod?.asSecondOrNull()
         val inputSignIn = config.signInMethod?.asThirdOrNull()
+        val googleSignIn = config.signInMethod?.asFourthOrNull()
 
         val templateBuilder = when {
             qrSignIn != null -> {
@@ -94,6 +104,48 @@ class SignInTemplate(
                 }.build())
             }
 
+            googleSignIn != null -> {
+                val signInAction = Action.Builder().apply {
+                    setOnClickListener(ParkedOnlyOnClickListener.create {
+                        val extras = Bundle(1)
+                        extras.putBinder(
+                            SignInWithGoogleActivity.BINDER_KEY,
+                            object : SignInWithGoogleActivity.OnSignInComplete() {
+                                override fun onSignInComplete(@Nullable account: GoogleSignInAccount?) {
+                                    if (account == null) {
+                                        CarToast.makeText(
+                                            context,
+                                            "Error signing in",
+                                            CarToast.LENGTH_LONG
+                                        ).show()
+                                        googleSignIn.callback("Error signing in", null)
+                                    } else {
+                                        googleSignIn.callback(
+                                            null,
+                                            com.margelo.nitro.swe.iternio.reactnativeautoplay.GoogleSignInAccount(
+                                                serverAuthCode = account.serverAuthCode,
+                                                email = account.email,
+                                                id = account.id,
+                                                displayName = account.displayName,
+                                                photoUrl = account.photoUrl.toString(),
+                                                idToken = account.idToken,
+                                                givenName = account.givenName,
+                                                familyName = account.familyName
+                                            )
+                                        )
+                                    }
+                                }
+                            })
+                        extras.putString("serverClientId", googleSignIn.serverClientId)
+                        context.startActivity(
+                            Intent().setClass(context, SignInWithGoogleActivity::class.java)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).putExtras(extras)
+                        )
+                    })
+                }.build()
+                SignInTemplate.Builder(ProviderSignInMethod(signInAction))
+            }
+
             else -> throw InvalidParameterException("missing SignInTemplate builder")
         }
 

package/ios/hybrid/HybridAutoPlay.swift

@@ -278,6 +278,7 @@ class HybridAutoPlay: HybridAutoPlaySpec {
                     }
 
                     template.barButtons = headerActions
+                    setBarButtons(template: template.getTemplate(), barButtons: headerActions)
                 }
             }
         }

package/ios/hybrid/HybridMapTemplate.swift

@@ -27,7 +27,7 @@ class HybridMapTemplate: HybridMapTemplateSpec {
             try await MainActor.run {
                 try RootModule.withAutoPlayTemplate(templateId: templateId) {
                     (template: MapTemplate) in
-                    template.config.mapButtons = buttons
+                    template.mapButtons = buttons
                     template.invalidate()
                 }
             }

package/ios/templates/AutoPlayTemplate.swift

@@ -34,8 +34,8 @@ class AutoPlayTemplate: NSObject {
     func onPopped() {}
 }
 
-protocol AutoPlayHeaderProviding {
-    @MainActor var barButtons: [NitroAction]? { get set }
+class AutoPlayHeaderProviding: AutoPlayTemplate {
+    var barButtons: [NitroAction]?
 }
 
 @MainActor

package/ios/templates/GridTemplate.swift

@@ -7,19 +7,11 @@
 
 import CarPlay
 
-class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+class GridTemplate: AutoPlayHeaderProviding {
     let template: CPGridTemplate
     var config: GridTemplateConfig
 
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            setBarButtons(template: template, barButtons: newValue)
-        }
-    }
+    var buttons: [NitroGridButton]
 
     override var autoDismissMs: Double? {
         return config.autoDismissMs
@@ -31,12 +23,18 @@ class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     init(config: GridTemplateConfig) {
         self.config = config
-
+        buttons = config.buttons
+        
         template = CPGridTemplate(
             title: Parser.parseText(text: config.title),
-            gridButtons: GridTemplate.parseButtons(buttons: config.buttons),
+            gridButtons: GridTemplate.parseButtons(buttons: buttons),
             id: config.id
         )
+                
+        super.init()
+        
+        barButtons = config.headerActions
+        
     }
 
     static func parseButtons(buttons: [NitroGridButton]) -> [CPGridButton] {
@@ -83,9 +81,9 @@ class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     @MainActor
     override func _invalidate() {
-        setBarButtons(template: template, barButtons: config.headerActions)
+        setBarButtons(template: template, barButtons: barButtons)
 
-        let buttons = GridTemplate.parseButtons(buttons: config.buttons)
+        let buttons = GridTemplate.parseButtons(buttons: buttons)
         template.updateGridButtons(buttons)
     }
 
@@ -111,7 +109,7 @@ class GridTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     @MainActor
     func updateButtons(buttons: [NitroGridButton]) {
-        config.buttons = buttons
+        self.buttons = buttons
         invalidate()
     }
 }

package/ios/templates/InformationTemplate.swift

@@ -7,19 +7,11 @@
 
 import CarPlay
 
-class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+class InformationTemplate: AutoPlayHeaderProviding {
     let template: CPInformationTemplate
     var config: InformationTemplateConfig
 
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            setBarButtons(template: template, barButtons: newValue)
-        }
-    }
+    var section: NitroSection
 
     override var autoDismissMs: Double? {
         return config.autoDismissMs
@@ -31,20 +23,26 @@ class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     init(config: InformationTemplateConfig) {
         self.config = config
+        
+        section = config.section
 
         template = CPInformationTemplate(
             title: Parser.parseText(text: config.title)!,
             layout: .leading,
-            items: Parser.parseInformationItems(section: config.section),
+            items: Parser.parseInformationItems(section: section),
             actions: Parser.parseInformationActions(actions: config.actions),
             id: config.id
         )
+        
+        super.init();
+        
+        barButtons = config.headerActions
     }
 
     @MainActor
     override func _invalidate() {
         setBarButtons(template: template, barButtons: barButtons)
-        template.items = Parser.parseInformationItems(section: config.section)
+        template.items = Parser.parseInformationItems(section: section)
     }
 
     override func onWillAppear(animated: Bool) {
@@ -69,7 +67,7 @@ class InformationTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     @MainActor
     func updateSection(section: NitroSection) {
-        config.section = section
+        self.section = section
         invalidate()
     }
 }

package/ios/templates/ListTemplate.swift

@@ -7,19 +7,11 @@
 
 import CarPlay
 
-class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
+class ListTemplate: AutoPlayHeaderProviding {
     let template: CPListTemplate
     var config: ListTemplateConfig
 
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            setBarButtons(template: template, barButtons: newValue)
-        }
-    }
+    var sections: [NitroSection]?
 
     override var autoDismissMs: Double? {
         return config.autoDismissMs
@@ -31,6 +23,8 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     init(config: ListTemplateConfig) {
         self.config = config
+        
+        sections = config.sections
 
         template = CPListTemplate(
             title: Parser.parseText(text: config.title),
@@ -38,6 +32,10 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
             assistantCellConfiguration: nil,
             id: config.id
         )
+        
+        super.init()
+        
+        barButtons = config.headerActions
     }
 
     @MainActor
@@ -46,7 +44,7 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
         template.updateSections(
             Parser.parseSections(
-                sections: config.sections,
+                sections: sections,
                 updateSection: self.updateSection(section:sectionIndex:),
                 traitCollection: SceneStore.getRootTraitCollection()
             )
@@ -75,13 +73,13 @@ class ListTemplate: AutoPlayTemplate, AutoPlayHeaderProviding {
 
     @MainActor
     private func updateSection(section: NitroSection, sectionIndex: Int) {
-        config.sections?[sectionIndex] = section
+        self.sections?[sectionIndex] = section
         invalidate()
     }
 
     @MainActor
     func updateSections(sections: [NitroSection]?) {
-        config.sections = sections
+        self.sections = sections
         invalidate()
     }
 }

package/ios/templates/MapTemplate.swift

@@ -11,7 +11,7 @@ struct NavigationAlertWrapper {
     let config: NitroNavigationAlert
 }
 
-class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
+class MapTemplate: AutoPlayHeaderProviding,
     CPMapTemplateDelegate
 {
     let template: CPMapTemplate
@@ -19,15 +19,8 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
 
     let screenDimensions: CGSize
 
-    var barButtons: [NitroAction]? {
-        get {
-            return config.headerActions
-        }
-        set {
-            config.headerActions = newValue
-            invalidate()
-        }
-    }
+    var mapButtons: [NitroMapButton]?
+    var visibleTravelEstimate: VisibleTravelEstimate?
 
     override var autoDismissMs: Double? {
         return config.autoDismissMs
@@ -44,9 +37,18 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
     var currentTripId: String?
 
     var tripSelectorVisible = false
+    /**
+     this avoids a race condition when invalidating the template that causes an App Hang (main‑thread stall)
+     when using CPMapTemplate.isPanningInterfaceVisible
+     */
+    private var isPanningInterfaceVisible = false
 
     init(config: MapTemplateConfig) {
         self.config = config
+        
+        mapButtons = config.mapButtons
+        visibleTravelEstimate = config.visibleTravelEstimate
+        
         template = CPMapTemplate(id: config.id)
 
         if let initialProperties = SceneStore.getRootScene()?.initialProperties,
@@ -65,11 +67,12 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
 
         super.init()
 
+        barButtons = config.headerActions
         template.mapDelegate = self
     }
 
     func onPanButtonPress() {
-        if template.isPanningInterfaceVisible {
+        if isPanningInterfaceVisible {
             template.dismissPanningInterface(animated: true)
         }
         else {
@@ -127,7 +130,7 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
             return
         }
 
-        if template.isPanningInterfaceVisible {
+        if isPanningInterfaceVisible {
             // while panning interface is shown we only provide a back button on the header
             // and all map buttons except the pan button
             // reason is that you can have a max of 2 map buttons while panning interface is shown
@@ -139,7 +142,7 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
             }
 
             let mapButtons =
-                config.mapButtons?.filter { button in
+                mapButtons?.filter { button in
                     button.type != .pan
                 } ?? []
 
@@ -148,9 +151,9 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
             return
         }
 
-        setBarButtons(template: template, barButtons: config.headerActions)
+        setBarButtons(template: template, barButtons: barButtons)
 
-        if let mapButtons = config.mapButtons {
+        if let mapButtons = mapButtons {
             template.mapButtons = parseMapButtons(mapButtons: mapButtons)
         }
     }
@@ -210,7 +213,7 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
         scale: CGFloat,
         velocity: CGFloat
     ) {
-        if template.isPanningInterfaceVisible {
+        if isPanningInterfaceVisible {
             return
         }
 
@@ -226,11 +229,12 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
     }
 
     func mapTemplateDidShowPanningInterface(_ mapTemplate: CPMapTemplate) {
+        isPanningInterfaceVisible = true
         config.onDidChangePanningInterface?(true)
         invalidate()
     }
-
     func mapTemplateDidDismissPanningInterface(_ mapTemplate: CPMapTemplate) {
+        isPanningInterfaceVisible = false
         config.onDidChangePanningInterface?(false)
         invalidate()
     }
@@ -560,14 +564,14 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
         visibleTravelEstimate: VisibleTravelEstimate?
     ) {
         if let visibleTravelEstimate = visibleTravelEstimate {
-            config.visibleTravelEstimate = visibleTravelEstimate
+            self.visibleTravelEstimate = visibleTravelEstimate
         }
 
         guard let trip = navigationSession?.trip else { return }
 
         let travelEstaimtes = trip.routeChoices.first?
             .travelEstimates
-        if let estimates = config.visibleTravelEstimate == .first
+        if let estimates = self.visibleTravelEstimate == .first
             ? travelEstaimtes?.first : travelEstaimtes?.last
         {
             template.updateEstimates(estimates, for: trip)
@@ -733,7 +737,7 @@ class MapTemplate: AutoPlayTemplate, AutoPlayHeaderProviding,
     func startNavigation(trip: CPTrip) {
         let routeChoice = trip.routeChoices.first
 
-        if let travelEstimates = config.visibleTravelEstimate == .first
+        if let travelEstimates = visibleTravelEstimate == .first
             ? routeChoice?.travelEstimates.first
             : routeChoice?.travelEstimates.last
         {