@iternio/react-native-auto-play 0.5.9 → 0.5.11

package/README.md

@@ -206,6 +206,14 @@ In case you have ProGuard enabled (`def enableProguardInReleaseBuilds = true` in
 ### Android Auto Customization
 You can customize certain behaviors of the library on Android Auto by setting properties in your app's `android/gradle.properties` file.
 
+-   **App Category**: Declare which Android Auto / Automotive app type the `CarAppService` advertises — the Android counterpart to choosing your CarPlay scene type in `Info.plist`.
+    ```properties
+    ReactNativeAutoPlay_androidAutoAppCategory=navigation
+    ```
+    Supported values are `navigation`, `poi`, `parking`, `charging`, `iot`, `messaging`, `calling`, and `weather` (see the [supported app categories](https://developer.android.com/training/cars)); each maps to `androidx.car.app.category.<UPPERCASE>`. An unrecognized value fails the build. The default `navigation` keeps the existing behavior. Any other value selects a lean manifest that declares the chosen category and omits the navigation-only permissions (`NAVIGATION_TEMPLATES`, `MAP_TEMPLATES`, `ACCESS_SURFACE`), the `FEATURE_CLUSTER` category, and the `NAVIGATE`/`geo` intent filters — a non-navigation, no-map template app needs none of these, and declaring them gets the app reviewed against the navigation-app bar on the Play Store.
+
+    On Android Automotive, the app-focus helpers on `HybridAndroidAutomotive` (`requestAppFocus`, `registerAppFocusListener`, `getAppFocusState`) request/observe **navigation** focus specifically; they are meant for navigation apps and should not be used with a non-navigation category.
+
 -   **Telemetry Update Interval**: Control how often telemetry data is updated.
     ```properties
     ReactNativeAutoPlay_androidTelemetryUpdateInterval=4000

package/android/build.gradle

@@ -28,6 +28,11 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["ReactNativeAutoPlay_" + name]).toInteger()
 }
 
+// Non-navigation categories select the lean manifest (AndroidManifest-nonnav.xml).
+def androidAutoAppCategory = getExtOrDefault("androidAutoAppCategory").toString().trim().toLowerCase(java.util.Locale.ROOT)
+def validAndroidAutoCategories = ['navigation', 'poi', 'parking', 'charging', 'iot', 'messaging', 'calling', 'weather']
+def isNavigationApp = androidAutoAppCategory == "navigation"
+
 android {
   namespace "com.margelo.nitro.swe.iternio.reactnativeautoplay"
 
@@ -35,6 +40,10 @@ android {
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
+    if (!validAndroidAutoCategories.contains(androidAutoAppCategory)) {
+      throw new GradleException("Invalid ReactNativeAutoPlay_androidAutoAppCategory '${androidAutoAppCategory}'. Must be one of: ${validAndroidAutoCategories.join(', ')}")
+    }
+
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
@@ -55,6 +64,9 @@ android {
       }
     }
 
+    manifestPlaceholders.autoPlayAppCategory = "androidx.car.app.category." + androidAutoAppCategory.toUpperCase(java.util.Locale.ROOT)
+
+    buildConfigField "boolean", "IS_NAVIGATION_APP", isNavigationApp.toString()
     buildConfigField "float", "SCALE_FACTOR", getExtOrDefault("androidAutoScaleFactor")
     buildConfigField "long", "TELEMETRY_UPDATE_INTERVAL", getExtOrDefault("androidTelemetryUpdateInterval")
     buildConfigField "long", "CLUSTER_SPLASH_DELAY_MS", getExtOrDefault("clusterSplashDelayMs")
@@ -117,10 +129,10 @@ android {
 
       if (getExtOrDefault("isAutomotiveApp") == "true") {
         java.srcDirs += 'src/automotive/java'
-        manifest.srcFile 'src/automotive/AndroidManifest.xml'
+        manifest.srcFile isNavigationApp ? 'src/automotive/AndroidManifest.xml' : 'src/automotive/AndroidManifest-nonnav.xml'
       } else {
         java.srcDirs += 'src/auto/java'
-        manifest.srcFile 'src/main/AndroidManifest.xml'
+        manifest.srcFile isNavigationApp ? 'src/main/AndroidManifest.xml' : 'src/main/AndroidManifest-nonnav.xml'
       }
     }
   }

package/android/gradle.properties

@@ -5,6 +5,8 @@ ReactNativeAutoPlay_compileSdkVersion=36
 ReactNativeAutoPlay_ndkVersion=27.1.12297006
 # specifies if the Android Auto (androidx.car.app:app-projected) or Automotive (androidx.car.app:app-automotive) library is used
 ReactNativeAutoPlay_isAutomotiveApp=false
+# Android Auto/Automotive app category -> androidx.car.app.category.<UPPERCASE>. Non-navigation values use a lean manifest.
+ReactNativeAutoPlay_androidAutoAppCategory=navigation
 # apply a scale factor on the root view that affects everything rendered by react-native, does not affect templates
 ReactNativeAutoPlay_androidAutoScaleFactor=1.5f
 ReactNativeAutoPlay_androidTelemetryUpdateInterval=4000

package/android/src/automotive/AndroidManifest-nonnav.xml

@@ -0,0 +1,78 @@
+<!-- Non-navigation Android Automotive manifest; see AndroidManifest.xml for the navigation variant. -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-feature
+        android:name="android.hardware.type.automotive"
+        android:required="true" />
+
+    <uses-feature
+        android:name="android.software.car.templates_host"
+        android:required="true" />
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+
+    <!-- Android Automotive specific permissions -->
+    <uses-permission android:name="android.car.permission.CAR_ENERGY" />
+    <uses-permission android:name="android.car.permission.CAR_ENERGY_PORTS" />
+    <uses-permission android:name="android.car.permission.CAR_EXTERIOR_ENVIRONMENT" />
+    <uses-permission android:name="android.car.permission.CAR_IDENTIFICATION" />
+    <uses-permission android:name="android.car.permission.CAR_INFO" />
+    <uses-permission android:name="android.car.permission.CAR_POWERTRAIN" />
+    <uses-permission android:name="android.car.permission.CAR_SPEED" />
+
+    <application>
+        <activity
+            android:name="androidx.car.app.activity.CarAppActivity"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.DeviceDefault.NoActionBar">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="distractionOptimized"
+                android:value="true" />
+
+        </activity>
+
+        <service
+            android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.AndroidAutoService"
+            android:exported="true"
+            android:foregroundServiceType="location">
+            <intent-filter>
+                <action android:name="androidx.car.app.CarAppService" />
+
+                <category android:name="${autoPlayAppCategory}" />
+            </intent-filter>
+        </service>
+
+        <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"
+            android:exported="false" />
+
+        <meta-data
+            android:name="com.android.automotive"
+            android:resource="@xml/automotive_app_desc" />
+        <meta-data
+            android:name="androidx.car.app.minCarApiLevel"
+            android:value="1" />
+    </application>
+
+</manifest>

package/android/src/main/AndroidManifest-nonnav.xml

@@ -0,0 +1,35 @@
+<!-- Non-navigation Android Auto manifest; see AndroidManifest.xml for the navigation variant. -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+    <!-- Android Auto specific permissions -->
+    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_MILEAGE" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
+
+    <application>
+        <service android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.AndroidAutoService" android:exported="true" android:foregroundServiceType="location">
+            <intent-filter>
+                <action android:name="androidx.car.app.CarAppService" />
+
+                <category android:name="${autoPlayAppCategory}" />
+            </intent-filter>
+        </service>
+
+        <meta-data android:name="com.google.android.gms.car.application" android:resource="@xml/automotive_app_desc" tools:ignore="MetadataTagInsideApplicationTag" />
+        <meta-data android:name="androidx.car.app.minCarApiLevel" android:value="1" />
+
+        <service android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.HeadlessTaskService" />
+
+        <provider android:name="com.margelo.nitro.swe.iternio.reactnativeautoplay.ActivityRenderStateProvider" android:authorities="${applicationId}.ActivityRenderStateProvider" android:exported="false" />
+    </application>
+</manifest>

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

@@ -136,9 +136,14 @@ class AndroidAutoService : CarAppService() {
     private fun createNotification(
         title: String?, text: String?, largeIcon: Bitmap?
     ): Notification {
+        val notificationCategory = if (BuildConfig.IS_NAVIGATION_APP) {
+            NotificationCompat.CATEGORY_NAVIGATION
+        } else {
+            NotificationCompat.CATEGORY_SERVICE
+        }
         return NotificationCompat.Builder(this, CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_notification).setOngoing(true)
-            .setCategory(NotificationCompat.CATEGORY_NAVIGATION).setOnlyAlertOnce(true)
+            .setCategory(notificationCategory).setOnlyAlertOnce(true)
             .setWhen(System.currentTimeMillis()).setPriority(NotificationManager.IMPORTANCE_LOW)
             .extend(
                 CarAppExtender.Builder().setImportance(NotificationManagerCompat.IMPORTANCE_LOW)

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

@@ -380,8 +380,11 @@ class VoiceInputManager(
                     ) ?: -1
 
                     if (read < 0) {
-                        // Whenever the user dismisses the microphone on the car screen, the next call to read will return -1
-                        cancelledByUser = carAudioRecord != null && read == -1
+                        // Whenever the user dismisses the microphone on the car screen, the next call to read will return -1.
+                        // But calling stop() ourselves also races CarAudioRecord's internal stream close against an
+                        // in-flight read(), which can likewise surface as -1 — isRecording is already false by then
+                        // (set before stopRecording() is called), so it distinguishes the two cases.
+                        cancelledByUser = carAudioRecord != null && read == -1 && isRecording
                         break
                     }
 
@@ -439,6 +442,10 @@ class VoiceInputManager(
     }
 
     fun stop() {
+        // Mark as no longer recording before triggering any teardown side effects, so anything
+        // racing against a concurrent read() sees this is an app-initiated stop.
+        isRecording = false
+
         // STT path: stopListening() triggers onResults/onError which resolves the continuation
         activeSpeechRecognizer?.let { recognizer ->
             UiThreadUtil.runOnUiThread {
@@ -446,7 +453,6 @@ class VoiceInputManager(
             }
         }
         // PCM path and car-audio STT pump
-        isRecording = false
         carAudioRecord?.stopRecording()
         audioRecord?.stop()
     }

package/package.json

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

package/lib/HybridAutoPlay.d.ts

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

package/lib/HybridAutoPlay.js

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

package/lib/components/OnAppearedChildRenderer.d.ts

@@ -1,10 +0,0 @@
-type Props = {
-    children: React.ReactNode;
-    moduleName: string;
-};
-/**
- * renders the passed children when the specified scene/screen appeared
- * this makes sure child hooks are executed only when the map template is ready
- */
-export default function OnAppearedChildRenderer({ children, moduleName }: Props): import("react").ReactNode;
-export {};

package/lib/components/OnAppearedChildRenderer.js

@@ -1,26 +0,0 @@
-import { useEffect, useState } from 'react';
-import { HybridAutoPlay } from '../hybrid/HybridAutoPlay';
-/**
- * renders the passed children when the specified scene/screen appeared
- * this makes sure child hooks are executed only when the map template is ready
- */
-export default function OnAppearedChildRenderer({ children, moduleName }) {
-    const [didAppear, setDidAppear] = useState(false);
-    useEffect(() => {
-        let remove = HybridAutoPlay.addListenerRenderState(moduleName, (renderState) => {
-            if (renderState === 'didAppear') {
-                remove?.();
-                remove = null;
-                setDidAppear(true);
-            }
-        });
-        return () => {
-            remove?.();
-            remove = null;
-        };
-    }, [moduleName]);
-    if (didAppear) {
-        return children;
-    }
-    return null;
-}

package/lib/hooks/useIsAutoPlayFocused.d.ts

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

package/lib/hooks/useIsAutoPlayFocused.js

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

package/lib/hybrid.d.ts

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

package/lib/hybrid.js

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

package/lib/specs/AutomotivePermissionRequestTemplate.d.ts

@@ -1,11 +0,0 @@
-import type { HybridObject } from 'react-native-nitro-modules';
-import type { NitroAutomotivePermissionRequestTemplateConfig } from '../templates/AutomotivePermissionRequestTemplate';
-import type { NitroTemplateConfig } from './AutoPlay.nitro';
-interface AutomotivePermissionRequestTemplateConfig extends NitroTemplateConfig, NitroAutomotivePermissionRequestTemplateConfig {
-}
-export interface AutomotivePermissionRequestTemplate extends HybridObject<{
-    android: 'kotlin';
-}> {
-    createAutomotivePermissionRequestTemplate(config: AutomotivePermissionRequestTemplateConfig): void;
-}
-export {};

package/lib/specs/AutomotivePermissionRequestTemplate.js

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

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

@@ -1,11 +0,0 @@
-import type { HybridObject } from 'react-native-nitro-modules';
-import type { NitroAutomotivePermissionRequestTemplateConfig } from '../templates/AutomotivePermissionRequestTemplate';
-import type { NitroTemplateConfig } from './AutoPlay.nitro';
-interface AutomotivePermissionRequestTemplateConfig extends NitroTemplateConfig, NitroAutomotivePermissionRequestTemplateConfig {
-}
-export interface AutomotivePermissionRequestTemplate extends HybridObject<{
-    android: 'kotlin';
-}> {
-    createAutomotivePermissionRequestTemplate(config: AutomotivePermissionRequestTemplateConfig): void;
-}
-export {};

package/lib/specs/AutomotivePermissionRequestTemplate.nitro.js

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

package/lib/templates/AutomotivePermissionRequestTemplate.d.ts

@@ -1,23 +0,0 @@
-import type { CustomActionButtonAndroid } from '../types/Button';
-import type { AutoText } from '../types/Text';
-import { type NitroAction } from '../utils/NitroAction';
-import { type HeaderActions, Template, type TemplateConfig } from './Template';
-export interface NitroAutomotivePermissionRequestTemplateConfig extends TemplateConfig {
-    headerActions?: Array<NitroAction>;
-    title: AutoText;
-    actions: Array<NitroAction>;
-}
-export type AutomotivePermissionRequestTemplateConfig = Omit<NitroAutomotivePermissionRequestTemplateConfig, 'headerActions' | 'buttons'> & {
-    /**
-     * action buttons, usually at the the top right on Android and a top bar on iOS
-     */
-    headerActions?: HeaderActions<AutomotivePermissionRequestTemplate>;
-    actions: [CustomActionButtonAndroid<AutomotivePermissionRequestTemplate>] | [
-        CustomActionButtonAndroid<AutomotivePermissionRequestTemplate>,
-        CustomActionButtonAndroid<AutomotivePermissionRequestTemplate>
-    ];
-};
-export declare class AutomotivePermissionRequestTemplate extends Template<AutomotivePermissionRequestTemplateConfig, HeaderActions<AutomotivePermissionRequestTemplate>> {
-    private template;
-    constructor(config: AutomotivePermissionRequestTemplateConfig);
-}

package/lib/templates/AutomotivePermissionRequestTemplate.js

@@ -1,18 +0,0 @@
-import { NitroModules } from 'react-native-nitro-modules';
-import { NitroActionUtil } from '../utils/NitroAction';
-import { Template, } from './Template';
-const HybridAutomotivePermissionRequestTemplate = NitroModules.createHybridObject('AutomotivePermissionRequestTemplate');
-export class AutomotivePermissionRequestTemplate extends Template {
-    template = this;
-    constructor(config) {
-        super(config);
-        const { headerActions, actions, ...rest } = config;
-        const nitroConfig = {
-            ...rest,
-            id: this.id,
-            headerActions: NitroActionUtil.convert(this.template, headerActions),
-            actions: NitroActionUtil.convert(this.template, actions),
-        };
-        HybridAutomotivePermissionRequestTemplate.createAutomotivePermissionRequestTemplate(nitroConfig);
-    }
-}