@iternio/react-native-auto-play 0.3.13 → 0.3.14

package/lib/types/Image.d.ts

@@ -1,22 +1,8 @@
 import type { ImageSourcePropType } from 'react-native';
 import type { ThemedColor } from '../utils/NitroColor';
-/**
- * Augment this interface in your app to get type-safe glyph name autocompletion.
- *
- * @example
- * ```ts
- * // autoplay-glyphs.d.ts
- * import type { GlyphName } from './assets/symbolFont/Glyphmap';
- * declare module '@iternio/react-native-auto-play' {
- *   interface AutoPlayGlyphMap extends Record<GlyphName, number> {}
- * }
- * ```
- */
-export interface AutoPlayGlyphMap {
-}
-/** Resolves to the augmented glyph name union, or falls back to `string` when not augmented. */
-export type GlyphMapKey = keyof AutoPlayGlyphMap extends never ? string : Extract<keyof AutoPlayGlyphMap, string>;
-type GlyphStyleFields = {
+import type { GlyphName } from './Glyphmap';
+export type AutoImage = {
+    name: GlyphName;
     /**
      * Sets the icon dark and light mode color or a single color for both.
      * Defaults to white for dark mode and black for light mode if not specified.
@@ -29,22 +15,8 @@ type GlyphStyleFields = {
      */
     backgroundColor?: ThemedColor | string;
     fontScale?: number;
-};
-/** Glyph by name — looked up in the glyph map registered via {@link setIconFont}. */
-export type AutoGlyphByName = GlyphStyleFields & {
-    type: 'glyph';
-    /** Key in the glyph map passed to `setIconFont`. */
-    name: GlyphMapKey;
-    /** Optional override — if set, used instead of the map lookup. */
-    codepoint?: number;
-};
-/** Glyph by raw Unicode code point. */
-export type AutoGlyphByCodepoint = GlyphStyleFields & {
     type: 'glyph';
-    codepoint: number;
-};
-export type AutoGlyph = AutoGlyphByName | AutoGlyphByCodepoint;
-export type AutoImage = AutoGlyph | {
+} | {
     image: ImageSourcePropType;
     /**
      * if specified the image gets tinted, if not it will just use the original image
@@ -66,4 +38,3 @@ export type AutoImage = AutoGlyph | {
     timeoutMs?: number;
     type: 'remote';
 };
-export {};

package/lib/types/Maneuver.d.ts

@@ -1,6 +1,6 @@
 import type { ImageSourcePropType } from 'react-native';
 import type { ThemedColor } from '../utils/NitroColor';
-import type { AutoGlyphByCodepoint, AutoGlyphByName } from './Image';
+import type { GlyphName } from './Glyphmap';
 import type { TravelEstimates } from './Trip';
 export declare enum ManeuverType {
     Depart = 0,
@@ -148,7 +148,15 @@ export interface PreferredLane extends Lane {
     highlightedAngle: number;
     isPreferred: boolean;
 }
-export type ManeuverImage = Pick<AutoGlyphByName, 'type' | 'name' | 'codepoint' | 'color'> | Pick<AutoGlyphByCodepoint, 'type' | 'codepoint' | 'color'> | {
+export type ManeuverImage = {
+    name: GlyphName;
+    /**
+     * make sure to specify a color with a proper contrast ratio to cardBackgroundColor otherwise it might not get applied
+     * defaults to white/black for dark/light mode
+     */
+    color?: ThemedColor | string;
+    type: 'glyph';
+} | {
     image: ImageSourcePropType;
     /**
      * if specified the image gets tinted, if not it will just use the original image

package/lib/types/Voice.d.ts

@@ -0,0 +1,15 @@
+export interface VoiceInputChunk {
+    partial?: string;
+    audio?: ArrayBuffer;
+}
+export interface VoiceInputResult {
+    transcription?: string;
+    audio?: ArrayBuffer;
+}
+export interface VoiceInputOptions {
+    silenceThresholdMs?: number;
+    maxDurationMs?: number;
+    listeningText?: string;
+    preferSpeechToText?: boolean;
+    onChunk?: (chunk: VoiceInputChunk) => void;
+}

package/lib/types/Voice.js

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

package/lib/utils/NitroImage.d.ts

@@ -1,34 +1,12 @@
 import { type ImageResolvedAssetSource } from 'react-native';
 import type { AutoImage } from '../types/Image';
 import { type NitroColor } from './NitroColor';
-/**
- * Register the icon font and (optionally) a glyph map for name-based lookups.
- * Must be called **once** before creating any templates. Subsequent calls are ignored.
- *
- * The font name maps directly to a native font asset:
- * - **Android** — `res/font/<name>.ttf` (must be lowercase)
- * - **iOS** — `<name>.ttf` in the app bundle (registered via CoreText automatically)
- *
- * For cross-platform compatibility use lowercase with underscores only.
- *
- * @param name  Native font asset name (without extension).
- * @param glyphMap  Optional map of glyph names to Unicode code points.
- *                  When provided, glyphs can use `{ type: 'glyph', name: 'icon_name' }`.
- *
- * @example
- * ```ts
- * import { glyphMap } from './assets/Glyphmap';
- * setIconFont('material_symbols', glyphMap);
- * ```
- */
-export declare function setIconFont(name: string, glyphMap?: Record<string, number>): void;
 interface AssetImage extends ImageResolvedAssetSource {
     color?: NitroColor;
     packager_asset: boolean;
 }
 interface GlyphImage {
     glyph: number;
-    fontName: string;
     color: NitroColor;
     backgroundColor: NitroColor;
     fontScale?: number;
@@ -39,7 +17,8 @@ interface RemoteImage {
     timeoutMs?: number;
 }
 /**
- * NitroModules-compatible image types passed to native.
+ * we need to map the ButtonImage.name from GlyphName to
+ * the actual numeric value so we need a nitro specific type
  */
 export type NitroImage = GlyphImage | AssetImage | RemoteImage;
 declare function convert(image: AutoImage): NitroImage;

package/lib/utils/NitroImage.js

@@ -1,68 +1,14 @@
 import { Image } from 'react-native';
+import { glyphMap } from '../types/Glyphmap';
 import { NitroColorUtil } from './NitroColor';
-let _iconFont;
-let _glyphMap;
-/**
- * Register the icon font and (optionally) a glyph map for name-based lookups.
- * Must be called **once** before creating any templates. Subsequent calls are ignored.
- *
- * The font name maps directly to a native font asset:
- * - **Android** — `res/font/<name>.ttf` (must be lowercase)
- * - **iOS** — `<name>.ttf` in the app bundle (registered via CoreText automatically)
- *
- * For cross-platform compatibility use lowercase with underscores only.
- *
- * @param name  Native font asset name (without extension).
- * @param glyphMap  Optional map of glyph names to Unicode code points.
- *                  When provided, glyphs can use `{ type: 'glyph', name: 'icon_name' }`.
- *
- * @example
- * ```ts
- * import { glyphMap } from './assets/Glyphmap';
- * setIconFont('material_symbols', glyphMap);
- * ```
- */
-export function setIconFont(name, glyphMap) {
-    if (_iconFont != null) {
-        return;
-    }
-    _iconFont = name;
-    _glyphMap = glyphMap;
-}
-function getIconFont() {
-    if (_iconFont == null) {
-        throw new Error('No icon font configured. Call setIconFont("your_font_name") before using glyph images.');
-    }
-    return _iconFont;
-}
-function resolveGlyph(image) {
-    if ('name' in image && image.name !== undefined) {
-        if (image.codepoint !== undefined) {
-            return image.codepoint;
-        }
-        if (_glyphMap == null) {
-            throw new Error(`Glyph name "${image.name}" used but no glyph map was provided to setIconFont().`);
-        }
-        const cp = _glyphMap[image.name];
-        if (cp === undefined) {
-            throw new Error(`Glyph name "${image.name}" not found in the glyph map.`);
-        }
-        return cp;
-    }
-    if (image.codepoint !== undefined) {
-        return image.codepoint;
-    }
-    throw new Error('Glyph image must provide either `name` or `codepoint`.');
-}
 function convert(image) {
     if (image == null) {
         return undefined;
     }
     if (image.type === 'glyph') {
-        const { color = { darkColor: 'white', lightColor: 'black' }, fontScale, backgroundColor = 'transparent', } = image;
+        const { color = { darkColor: 'white', lightColor: 'black' }, fontScale, name, backgroundColor = 'transparent', } = image;
         return {
-            glyph: resolveGlyph(image),
-            fontName: getIconFont(),
+            glyph: glyphMap[name],
             color: NitroColorUtil.convert(color),
             backgroundColor: NitroColorUtil.convert(backgroundColor),
             fontScale,

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

@@ -13,7 +13,6 @@
 #include "JNitroColor.hpp"
 #include "NitroColor.hpp"
 #include <optional>
-#include <string>
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 
@@ -36,8 +35,6 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       static const auto clazz = javaClassStatic();
       static const auto fieldGlyph = clazz->getField<double>("glyph");
       double glyph = this->getFieldValue(fieldGlyph);
-      static const auto fieldFontName = clazz->getField<jni::JString>("fontName");
-      jni::local_ref<jni::JString> fontName = this->getFieldValue(fieldFontName);
       static const auto fieldColor = clazz->getField<JNitroColor>("color");
       jni::local_ref<JNitroColor> color = this->getFieldValue(fieldColor);
       static const auto fieldBackgroundColor = clazz->getField<JNitroColor>("backgroundColor");
@@ -46,7 +43,6 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       jni::local_ref<jni::JDouble> fontScale = this->getFieldValue(fieldFontScale);
       return GlyphImage(
         glyph,
-        fontName->toStdString(),
         color->toCpp(),
         backgroundColor->toCpp(),
         fontScale != nullptr ? std::make_optional(fontScale->value()) : std::nullopt
@@ -59,13 +55,12 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
      */
     [[maybe_unused]]
     static jni::local_ref<JGlyphImage::javaobject> fromCpp(const GlyphImage& value) {
-      using JSignature = JGlyphImage(double, jni::alias_ref<jni::JString>, jni::alias_ref<JNitroColor>, jni::alias_ref<JNitroColor>, jni::alias_ref<jni::JDouble>);
+      using JSignature = JGlyphImage(double, jni::alias_ref<JNitroColor>, jni::alias_ref<JNitroColor>, jni::alias_ref<jni::JDouble>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         value.glyph,
-        jni::make_jstring(value.fontName),
         JNitroColor::fromCpp(value.color),
         JNitroColor::fromCpp(value.backgroundColor),
         value.fontScale.has_value() ? jni::JDouble::valueOf(value.fontScale.value()) : nullptr

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

@@ -15,11 +15,11 @@
 #include "RemoteImage.hpp"
 #include <variant>
 #include "JGlyphImage.hpp"
-#include <string>
 #include "NitroColor.hpp"
 #include "JNitroColor.hpp"
 #include <optional>
 #include "JAssetImage.hpp"
+#include <string>
 #include "JRemoteImage.hpp"
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {

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

@@ -15,11 +15,11 @@
 #include "RemoteImage.hpp"
 #include <variant>
 #include "JGlyphImage.hpp"
-#include <string>
 #include "NitroColor.hpp"
 #include "JNitroColor.hpp"
 #include <optional>
 #include "JAssetImage.hpp"
+#include <string>
 #include "JRemoteImage.hpp"
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {

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

@@ -19,11 +19,11 @@
 #include "RemoteImage.hpp"
 #include "JNitroImage.hpp"
 #include "JGlyphImage.hpp"
-#include <string>
 #include "NitroColor.hpp"
 #include "JNitroColor.hpp"
 #include <optional>
 #include "JAssetImage.hpp"
+#include <string>
 #include "JRemoteImage.hpp"
 #include <vector>
 #include "JImageLane.hpp"

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

@@ -22,9 +22,6 @@ data class GlyphImage(
   val glyph: Double,
   @DoNotStrip
   @Keep
-  val fontName: String,
-  @DoNotStrip
-  @Keep
   val color: NitroColor,
   @DoNotStrip
   @Keep
@@ -43,8 +40,8 @@ data class GlyphImage(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(glyph: Double, fontName: String, color: NitroColor, backgroundColor: NitroColor, fontScale: Double?): GlyphImage {
-      return GlyphImage(glyph, fontName, color, backgroundColor, fontScale)
+    private fun fromCpp(glyph: Double, color: NitroColor, backgroundColor: NitroColor, fontScale: Double?): GlyphImage {
+      return GlyphImage(glyph, color, backgroundColor, fontScale)
     }
   }
 }

package/nitrogen/generated/ios/c++/HybridCarPlayDashboardSpecSwift.hpp

@@ -36,9 +36,9 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class ColorSc
 #include "AssetImage.hpp"
 #include "RemoteImage.hpp"
 #include <variant>
-#include <string>
 #include "NitroColor.hpp"
 #include <optional>
+#include <string>
 #include "ColorScheme.hpp"
 
 #include "ReactNativeAutoPlay-Swift-Cxx-Umbrella.hpp"

package/nitrogen/generated/ios/swift/GlyphImage.swift

@@ -18,8 +18,8 @@ public extension GlyphImage {
   /**
    * Create a new instance of `GlyphImage`.
    */
-  init(glyph: Double, fontName: String, color: NitroColor, backgroundColor: NitroColor, fontScale: Double?) {
-    self.init(glyph, std.string(fontName), color, backgroundColor, { () -> bridge.std__optional_double_ in
+  init(glyph: Double, color: NitroColor, backgroundColor: NitroColor, fontScale: Double?) {
+    self.init(glyph, color, backgroundColor, { () -> bridge.std__optional_double_ in
       if let __unwrappedValue = fontScale {
         return bridge.create_std__optional_double_(__unwrappedValue)
       } else {
@@ -33,11 +33,6 @@ public extension GlyphImage {
     return self.__glyph
   }
   
-  @inline(__always)
-  var fontName: String {
-    return String(self.__fontName)
-  }
-  
   @inline(__always)
   var color: NitroColor {
     return self.__color

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

@@ -31,7 +31,6 @@
 // Forward declaration of `NitroColor` to properly resolve imports.
 namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct NitroColor; }
 
-#include <string>
 #include "NitroColor.hpp"
 #include <optional>
 
@@ -43,14 +42,13 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
   struct GlyphImage final {
   public:
     double glyph     SWIFT_PRIVATE;
-    std::string fontName     SWIFT_PRIVATE;
     NitroColor color     SWIFT_PRIVATE;
     NitroColor backgroundColor     SWIFT_PRIVATE;
     std::optional<double> fontScale     SWIFT_PRIVATE;
 
   public:
     GlyphImage() = default;
-    explicit GlyphImage(double glyph, std::string fontName, NitroColor color, NitroColor backgroundColor, std::optional<double> fontScale): glyph(glyph), fontName(fontName), color(color), backgroundColor(backgroundColor), fontScale(fontScale) {}
+    explicit GlyphImage(double glyph, NitroColor color, NitroColor backgroundColor, std::optional<double> fontScale): glyph(glyph), color(color), backgroundColor(backgroundColor), fontScale(fontScale) {}
 
   public:
     friend bool operator==(const GlyphImage& lhs, const GlyphImage& rhs) = default;
@@ -67,7 +65,6 @@ namespace margelo::nitro {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::swe::iternio::reactnativeautoplay::GlyphImage(
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "glyph"))),
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "fontName"))),
         JSIConverter<margelo::nitro::swe::iternio::reactnativeautoplay::NitroColor>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "color"))),
         JSIConverter<margelo::nitro::swe::iternio::reactnativeautoplay::NitroColor>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "backgroundColor"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "fontScale")))
@@ -76,7 +73,6 @@ namespace margelo::nitro {
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::swe::iternio::reactnativeautoplay::GlyphImage& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "glyph"), JSIConverter<double>::toJSI(runtime, arg.glyph));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "fontName"), JSIConverter<std::string>::toJSI(runtime, arg.fontName));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "color"), JSIConverter<margelo::nitro::swe::iternio::reactnativeautoplay::NitroColor>::toJSI(runtime, arg.color));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "backgroundColor"), JSIConverter<margelo::nitro::swe::iternio::reactnativeautoplay::NitroColor>::toJSI(runtime, arg.backgroundColor));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "fontScale"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.fontScale));
@@ -91,7 +87,6 @@ namespace margelo::nitro {
         return false;
       }
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "glyph")))) return false;
-      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "fontName")))) return false;
       if (!JSIConverter<margelo::nitro::swe::iternio::reactnativeautoplay::NitroColor>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "color")))) return false;
       if (!JSIConverter<margelo::nitro::swe::iternio::reactnativeautoplay::NitroColor>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "backgroundColor")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "fontScale")))) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",
@@ -34,8 +34,9 @@
     "lint": "biome check src",
     "lint-ci": "biome ci src --reporter=summary",
     "typescript": "tsc",
+    "generate:fonts": "node ./assets/symbolFont/bundleAsset.js",
     "specs": "nitrogen --logLevel=\"debug\"",
-    "prepare": "yarn circular && tsc && nitrogen",
+    "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"
   },

package/src/index.ts

@@ -62,4 +62,3 @@ export type {
 } from './utils/NitroAlert';
 export type { ThemedColor } from './utils/NitroColor';
 export type { GridButton } from './utils/NitroGrid';
-export { setIconFont } from './utils/NitroImage';