@iternio/react-native-auto-play 0.0.3 → 0.0.5

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

@@ -1,6 +1,5 @@
 package com.margelo.nitro.swe.iternio.reactnativeautoplay
 
-import androidx.car.app.Screen
 import com.facebook.react.bridge.UiThreadUtil
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
@@ -138,15 +137,8 @@ class HybridAutoPlay : HybridAutoPlaySpec() {
                 ?: throw IllegalArgumentException("pushTemplate failed, screenManager not found")
 
             val result = ThreadUtil.postOnUiAndAwait {
-                var topMessageScreen: Screen? = null
+                val topMessageScreen = AndroidAutoTemplate.getTopMessageTemplate()
 
-                if (screenManager.screenStack.isNotEmpty()) {
-                    screenManager.top.marker?.let {
-                        if (AndroidAutoTemplate.hasTemplate<MessageTemplate>(it)) {
-                            topMessageScreen = screenManager.top
-                        }
-                    }
-                }
                 val screen = AndroidAutoScreen(context, templateId, template.parse())
                 screenManager.push(screen)
 

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

@@ -8,36 +8,50 @@ import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.RoutePreviewTe
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.TripPreviewTemplate
 
 class HybridMapTemplate : HybridMapTemplateSpec() {
+    var navigationAlert: NitroNavigationAlert? = null
+
     override fun createMapTemplate(config: MapTemplateConfig) {
-        val context =
-            AndroidAutoSession.getCarContext(config.id) ?: throw IllegalArgumentException(
-                "createMapTemplate failed, carContext found"
-            )
+        val context = AndroidAutoSession.getCarContext(config.id) ?: throw IllegalArgumentException(
+            "createMapTemplate failed, carContext found"
+        )
 
         val template = MapTemplate(context, config, initNavigationManager = true)
         AndroidAutoTemplate.setTemplate(config.id, template)
     }
 
     override fun showNavigationAlert(
-        templateId: String,
-        alert: NitroNavigationAlert
-    ): NavigationAlertCallbacks {
+        templateId: String, alert: NitroNavigationAlert
+    ) {
+        val alertConfig = alert.copy(onDidDismiss = { reason ->
+            navigationAlert = null
+            alert.onDidDismiss?.let { it(reason) }
+        })
         val template = AndroidAutoTemplate.getTemplate<MapTemplate>(templateId)
-        template.showAlert(alert)
-
-        return NavigationAlertCallbacks(
-            dismiss = {
-                val carContext =
-                    AndroidAutoSession.getCarContext(AndroidAutoSession.ROOT_SESSION)
-                        ?: throw IllegalArgumentException("navigation alert dismiss failed, carContext for ${AndroidAutoSession.ROOT_SESSION} not found")
-
-                carContext.getCarService(AppManager::class.java).dismissAlert(alert.id.toInt())
-            },
-            update = { title, subtitle ->
-                val config = alert.copy(title = title, subtitle = subtitle)
-                template.showAlert(config)
+        template.showAlert(alertConfig)
+        navigationAlert = alertConfig
+    }
+
+    override fun updateNavigationAlert(
+        templateId: String, navigationAlertId: Double, title: AutoText, subtitle: AutoText?
+    ) {
+        navigationAlert?.let {
+            if (it.id != navigationAlertId) {
+                return
             }
-        )
+            val navigationAlert = it.copy(title = title, subtitle = subtitle)
+            val template = AndroidAutoTemplate.getTemplate<MapTemplate>(templateId)
+            template.showAlert(navigationAlert)
+        }
+    }
+
+    override fun dismissNavigationAlert(
+        templateId: String, navigationAlertId: Double
+    ) {
+        val carContext = AndroidAutoSession.getCarContext(AndroidAutoSession.ROOT_SESSION)
+            ?: throw IllegalArgumentException(
+                "dismissNavigationAlert failed, carContext found"
+            )
+        carContext.getCarService(AppManager::class.java).dismissAlert(navigationAlertId.toInt())
     }
 
     override fun showTripSelector(
@@ -67,8 +81,14 @@ class HybridMapTemplate : HybridMapTemplateSpec() {
         )
 
         UiThreadUtil.runOnUiThread {
-            screenManager.popToRoot()
+            val topMessageTemplate = AndroidAutoTemplate.getTopMessageTemplate()
+
             screenManager.push(screen)
+
+            topMessageTemplate?.let {
+                // make sure any visible message template is still on top of the trip selector
+                screenManager.push(topMessageTemplate)
+            }
         }
 
         return TripSelectorCallback { id: String ->

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

@@ -1,6 +1,7 @@
 package com.margelo.nitro.swe.iternio.reactnativeautoplay.template
 
 import androidx.car.app.CarContext
+import androidx.car.app.Screen
 import androidx.car.app.model.Template
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.AndroidAutoScreen
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroAction
@@ -56,5 +57,25 @@ abstract class AndroidAutoTemplate<T>(val context: CarContext, var config: T) {
             }
             return null
         }
+
+        /**
+         * returns the top screen hosting a MessageTemplate, null in case none is available
+         */
+        fun getTopMessageTemplate(): Screen? {
+            val screenManager = AndroidAutoScreen.getScreenManager()
+                ?: throw IllegalArgumentException("getMessageTemplate failed, screenManager not found")
+
+            var topMessageScreen: Screen? = null
+
+            if (screenManager.screenStack.isNotEmpty()) {
+                screenManager.top.marker?.let {
+                    if (hasTemplate<MessageTemplate>(it)) {
+                        topMessageScreen = screenManager.top
+                    }
+                }
+            }
+
+            return topMessageScreen
+        }
     }
 }

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

@@ -35,7 +35,6 @@ import androidx.car.app.navigation.model.TravelEstimate
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
-import com.facebook.common.references.CloseableReference
 import com.facebook.datasource.DataSources
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.image.CloseableBitmap
@@ -71,7 +70,9 @@ import com.margelo.nitro.swe.iternio.reactnativeautoplay.TrafficSide
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.TravelEstimates
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.TurnType
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.Variant_GlyphImage_AssetImage
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.BitmapCache
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.SymbolFont
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.utils.get
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -238,7 +239,30 @@ object Parser {
     }
 
     fun parseImages(context: CarContext, images: List<NitroImage>): CarIcon {
-        return CarIcon.Builder(SymbolFont.imageFromNitroImages(context, images)).build()
+        return CarIcon.Builder(imageFromNitroImages(context, images)).build()
+    }
+
+    fun imageFromNitroImages(
+        context: CarContext, images: List<NitroImage>
+    ): IconCompat {
+        val bitmaps = images.map {
+            parseImageToBitmap(
+                context, it.asFirstOrNull(), it.asSecondOrNull()
+            )!!
+        }
+
+        val height = bitmaps.maxOf { it.height }
+        val width = bitmaps.maxOf { it.width }
+        val totalWidth = width * images.size
+
+        val bitmap = createBitmap(totalWidth, height)
+        val canvas = Canvas(bitmap)
+
+        bitmaps.forEachIndexed { index, it ->
+            canvas.drawBitmap(it, (index * width).toFloat(), 0f, null)
+        }
+
+        return IconCompat.createWithBitmap(bitmap)
     }
 
     const val PLACEHOLDER_DISTANCE = "{distance}"
@@ -481,47 +505,55 @@ object Parser {
         )
     }
 
-    fun parseAssetImage(context: CarContext, image: AssetImage): Bitmap? {
-        val source = ImageSource(context, image.uri)
-        val imageRequest = ImageRequestBuilder.newBuilderWithSource(source.uri).build()
+    fun parseAssetImage(context: CarContext, assetImage: AssetImage): Bitmap? {
+        var bitmap = BitmapCache.get(context, assetImage)
+
+        if (bitmap != null) {
+            return bitmap
+        }
+
+        val source = ImageSource(context, assetImage.uri)
+        val imageRequest = ImageRequestBuilder.newBuilderWithSource(source.uri).disableDiskCache()
+            .disableMemoryCache().build()
+
         val dataSource = Fresco.getImagePipeline().fetchDecodedImage(imageRequest, context)
         val result = DataSources.waitForFinalResult(dataSource)
 
-        var bitmap: Bitmap? = null
-
-        result?.let { closeableRef ->
-            try {
-                val image = closeableRef.get()
-                if (image is CloseableBitmap) {
-                    bitmap = image.underlyingBitmap.copy(Bitmap.Config.ARGB_8888, false)
-                } else if (image is CloseableXml) {
-                    val drawable = image.buildDrawable()
-                    bitmap = drawable?.toBitmap(
-                        width = image.width, height = image.height, Bitmap.Config.ARGB_8888
-                    )
-                }
-            } finally {
-                CloseableReference.closeSafely(closeableRef)
+        val image = result?.get()
+        try {
+            if (image is CloseableBitmap) {
+                bitmap = image.underlyingBitmap.copy(Bitmap.Config.ARGB_8888, false)
+            } else if (image is CloseableXml) {
+                val drawable = image.buildDrawable()
+                bitmap = drawable?.toBitmap(
+                    width = image.width, height = image.height, Bitmap.Config.ARGB_8888
+                )
             }
+        } finally {
+            image?.close()
+            result?.close()
+            dataSource.close()
         }
 
         if (bitmap == null) {
             return null
         }
 
-        image.color?.let {
-            val tintColor =
-                if (context.isDarkMode) image.color.darkColor else image.color.lightColor
+        assetImage.color?.get(context)?.let { color ->
             val result = createBitmap(bitmap.width, bitmap.height)
             val canvas = Canvas(result)
             val paint = Paint()
 
-            paint.colorFilter = PorterDuffColorFilter(tintColor.toInt(), PorterDuff.Mode.SRC_IN)
+            paint.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
             canvas.drawBitmap(bitmap, 0f, 0f, paint)
 
+            BitmapCache.put(context, assetImage, result)
+
             return result
         }
 
+        BitmapCache.put(context, assetImage, bitmap)
+
         return bitmap
     }
 
@@ -622,7 +654,8 @@ object Parser {
                     setRoundaboutExitNumber(it.toInt())
                 }
                 nitroManeuver.angle?.let { roundaboutExitAngle ->
-                    val angle = (180 + roundaboutExitAngle).toInt().let { if (it == 0) 360 else it }
+                    val angle =
+                        ((180 - roundaboutExitAngle) % 360).toInt().let { if (it == 0) 360 else it }
                     setRoundaboutExitAngle(angle)
                 }
             }

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

@@ -0,0 +1,60 @@
+package com.margelo.nitro.swe.iternio.reactnativeautoplay.utils
+
+import android.graphics.Bitmap
+import android.util.LruCache
+import androidx.car.app.CarContext
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.AssetImage
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.GlyphImage
+import com.margelo.nitro.swe.iternio.reactnativeautoplay.NitroColor
+
+object BitmapCache {
+    private val maxMemory = Runtime.getRuntime().maxMemory().toInt()
+    private val cacheSize = minOf(maxMemory / 8, 8388608) //limit cache to 8 megabyte
+
+    private val bitmapCache = object : LruCache<String, Bitmap>(cacheSize) {
+        override fun sizeOf(key: String, bitmap: Bitmap): Int {
+            return bitmap.byteCount
+        }
+    }
+
+    fun get(context: CarContext, image: GlyphImage): Bitmap? {
+        val key = image.cacheKey(context)
+        return get(key)
+    }
+
+    fun put(context: CarContext, image: GlyphImage, bitmap: Bitmap) {
+        val key = image.cacheKey(context)
+        put(key, bitmap)
+    }
+
+    fun get(context: CarContext, image: AssetImage): Bitmap? {
+        val key = image.cacheKey(context)
+        return get(key)
+    }
+
+    fun put(context: CarContext, image: AssetImage, bitmap: Bitmap) {
+        val key = image.cacheKey(context)
+        put(key, bitmap)
+    }
+
+    private fun get(key: String): Bitmap? {
+        synchronized(bitmapCache) {
+            return bitmapCache.get(key)
+        }
+    }
+
+    private fun put(key: String, bitmap: Bitmap) {
+        synchronized(bitmapCache) {
+            bitmapCache.put(key, bitmap)
+        }
+    }
+}
+
+fun NitroColor.get(context: CarContext): Int =
+    if (context.isDarkMode) this.darkColor.toInt() else this.lightColor.toInt()
+
+fun AssetImage.cacheKey(context: CarContext): String =
+    this.color?.let { "${this.uri}/${it.get(context)}" } ?: run { this.uri }
+
+fun GlyphImage.cacheKey(context: CarContext): String =
+    "$glyph/${color.get(context)}/${backgroundColor.get(context)}/$fontScale"

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

@@ -22,7 +22,7 @@ object SymbolFont {
 
     private var typeface: Typeface? = null
 
-    fun loadFont(context: Context) {
+    private fun loadFont(context: Context) {
         if (typeface != null) {
             return
         }
@@ -30,12 +30,12 @@ object SymbolFont {
         typeface = ResourcesCompat.getFont(context, R.font.materialsymbolsoutlined_regular)
     }
 
-    fun imageFromGlyph(
+    private fun imageFromGlyph(
         context: Context,
         glyph: Double,
-        color: Int = android.graphics.Color.BLACK,
-        backgroundColor: Int = android.graphics.Color.WHITE,
-        cornerRadius: Float = 8f,
+        color: Int,
+        backgroundColor: Int,
+        cornerRadius: Float = 8f, //TODO: make accessible and add it to GlyphImage.cacheKey
         fontScale: Float,
     ): Bitmap? {
         loadFont(context)
@@ -88,39 +88,24 @@ object SymbolFont {
     }
 
     fun imageFromNitroImage(context: CarContext, image: GlyphImage): Bitmap? {
-        val color = if (context.isDarkMode) image.color.darkColor else image.color.lightColor
-        val backgroundColor =
-            if (context.isDarkMode) image.backgroundColor.darkColor else image.backgroundColor.lightColor
+        var bitmap = BitmapCache.get(context, image)
 
-        return imageFromGlyph(
+        if (bitmap != null) {
+            return bitmap
+        }
+
+        bitmap = imageFromGlyph(
             context = context,
             glyph = image.glyph,
-            color = color.toInt(),
-            backgroundColor = backgroundColor.toInt(),
+            color = image.color.get(context),
+            backgroundColor = image.backgroundColor.get(context),
             fontScale = (image.fontScale ?: 1.0).toFloat()
         )
-    }
 
-    fun imageFromNitroImages(
-        context: CarContext, images: List<NitroImage>
-    ): IconCompat {
-        val bitmaps = images.map {
-            Parser.parseImageToBitmap(
-                context, it.asFirstOrNull(), it.asSecondOrNull()
-            )!!
+        bitmap?.let {
+            BitmapCache.put(context, image, it)
         }
 
-        val height = bitmaps.maxOf { it.height }
-        val width = bitmaps.maxOf { it.width }
-        val totalWidth = width * images.size
-
-        val bitmap = createBitmap(totalWidth, height)
-        val canvas = Canvas(bitmap)
-
-        bitmaps.forEachIndexed { index, it ->
-            canvas.drawBitmap(it, (index * width).toFloat(), 0f, null)
-        }
-
-        return IconCompat.createWithBitmap(bitmap)
+        return bitmap
     }
 }

package/ios/hybrid/HybridMapTemplate.swift

@@ -30,28 +30,37 @@ class HybridMapTemplate: HybridMapTemplateSpec {
     }
 
     func showNavigationAlert(templateId: String, alert: NitroNavigationAlert)
-        throws -> NavigationAlertCallbacks
+        throws
     {
-        var mapTemplate: MapTemplate?
-
         try RootModule.withAutoPlayTemplate(templateId: templateId) {
             (template: MapTemplate) in
             template.showAlert(alertConfig: alert)
-            mapTemplate = template
         }
+    }
 
-        return NavigationAlertCallbacks(
-            dismiss: {
-                mapTemplate?.dismissNavigationAlert(alertId: alert.id)
-            },
-            update: { title, subtitle in
-                mapTemplate?.updateNavigationAlert(
-                    alertId: alert.id,
-                    title: title,
-                    subtitle: subtitle
-                )
-            }
-        )
+    func updateNavigationAlert(
+        templateId: String,
+        navigationAlertId: Double,
+        title: AutoText,
+        subtitle: AutoText?
+    ) throws {
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
+            template.updateNavigationAlert(
+                alertId: navigationAlertId,
+                title: title,
+                subtitle: subtitle
+            )
+        }
+    }
+
+    func dismissNavigationAlert(templateId: String, navigationAlertId: Double)
+        throws
+    {
+        try RootModule.withAutoPlayTemplate(templateId: templateId) {
+            (template: MapTemplate) in
+            template.dismissNavigationAlert(alertId: navigationAlertId)
+        }
     }
 
     func showTripSelector(

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

@@ -1,5 +1,6 @@
 import type { HybridObject } from 'react-native-nitro-modules';
-import type { NavigationAlertCallbacks, NitroMapTemplateConfig, TripSelectorCallback, VisibleTravelEstimate } from '../templates/MapTemplate';
+import type { NitroMapTemplateConfig, TripSelectorCallback, VisibleTravelEstimate } from '../templates/MapTemplate';
+import type { AutoText } from '../types/Text';
 import type { TripConfig, TripPoint, TripPreviewTextConfiguration, TripsConfig } from '../types/Trip';
 import type { NitroNavigationAlert } from '../utils/NitroAlert';
 import type { NitroManeuver } from '../utils/NitroManeuver';
@@ -12,7 +13,9 @@ export interface MapTemplate extends HybridObject<{
     ios: 'swift';
 }> {
     createMapTemplate(config: MapTemplateConfig): void;
-    showNavigationAlert(templateId: string, alert: NitroNavigationAlert): NavigationAlertCallbacks;
+    showNavigationAlert(templateId: string, alert: NitroNavigationAlert): void;
+    updateNavigationAlert(templateId: string, navigationAlertId: number, title: AutoText, subtitle?: AutoText): void;
+    dismissNavigationAlert(templateId: string, navigationAlertId: number): void;
     showTripSelector(templateId: string, trips: Array<TripsConfig>, selectedTripId: string | undefined, textConfig: TripPreviewTextConfiguration, onTripSelected: (tripId: string, routeId: string) => void, onTripStarted: (tripId: string, routeId: string) => void, onBackPressed: () => void, mapButtons: Array<NitroMapButton>): TripSelectorCallback;
     hideTripSelector(templateId: string): void;
     setTemplateMapButtons(templateId: string, buttons?: Array<NitroMapButton>): void;

package/lib/templates/MapTemplate.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type AutoText, type CleanupCallback } from '..';
+import { type AutoText } from '..';
 import type { ActionButtonAndroid, MapButton, MapPanButton } from '../types/Button';
 import type { AutoManeuver } from '../types/Maneuver';
 import type { ColorScheme, RootComponentInitialProps } from '../types/RootComponent';
@@ -16,10 +16,6 @@ export type VisibleTravelEstimate = 'first' | 'last';
 export type HeaderActionsAndroidMap<T> = Array<ActionButtonAndroid<T>> & {
     length: 1 | 2 | 3 | 4;
 };
-export interface NavigationAlertCallbacks {
-    dismiss: CleanupCallback;
-    update: (title: AutoText, subtitle?: AutoText) => void;
-}
 export interface NitroMapTemplateConfig extends TemplateConfig, NitroBaseMapTemplateConfig {
     /**
      * show either the next or final step travel estimates, defaults to final step so last
@@ -112,7 +108,9 @@ export declare class MapTemplate extends Template<MapTemplateConfig, MapTemplate
      * ⚠️ updating an existing alert is currently broken on Android Automotive, it brings up a new alert for each call
      * @returns a callback to dismiss or update the navigation alert
      */
-    showAlert(alert: NavigationAlert): NavigationAlertCallbacks;
+    showAlert(alert: NavigationAlert): void;
+    updateAlert(alertId: number, title: AutoText, subtitle?: AutoText): void;
+    dismissAlert(alertId: number): void;
     /**
      * @namespace Android brings up a custom trip selector mimicking the CarPlay trip selector as close as possible
      * @namespace iOS brings up the stock CarPlay trip selector

package/lib/templates/MapTemplate.js

@@ -51,6 +51,12 @@ export class MapTemplate extends Template {
     showAlert(alert) {
         return HybridMapTemplate.showNavigationAlert(this.id, NitroAlertUtil.convert(alert));
     }
+    updateAlert(alertId, title, subtitle) {
+        HybridMapTemplate.updateNavigationAlert(this.id, alertId, title, subtitle);
+    }
+    dismissAlert(alertId) {
+        HybridMapTemplate.dismissNavigationAlert(this.id, alertId);
+    }
     /**
      * @namespace Android brings up a custom trip selector mimicking the CarPlay trip selector as close as possible
      * @namespace iOS brings up the stock CarPlay trip selector

package/nitrogen/generated/android/ReactNativeAutoPlayOnLoad.cpp

@@ -32,7 +32,6 @@
 #include "JHybridInformationTemplateSpec.hpp"
 #include "JHybridListTemplateSpec.hpp"
 #include "JHybridMapTemplateSpec.hpp"
-#include "JFunc_void_AutoText_std__optional_AutoText_.hpp"
 #include "JFunc_void_Point_std__optional_Point_.hpp"
 #include "JFunc_void_Point_double.hpp"
 #include "JFunc_void_Point.hpp"
@@ -69,7 +68,6 @@ int initialize(JavaVM* vm) {
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridInformationTemplateSpec::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridListTemplateSpec::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JHybridMapTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_AutoText_std__optional_AutoText__cxx::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_std__optional_Point__cxx::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_double_cxx::registerNatives();
     margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_cxx::registerNatives();

package/nitrogen/generated/android/c++/JHybridMapTemplateSpec.cpp

@@ -7,14 +7,6 @@
 
 #include "JHybridMapTemplateSpec.hpp"
 
-// Forward declaration of `NavigationAlertCallbacks` to properly resolve imports.
-namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct NavigationAlertCallbacks; }
-// Forward declaration of `AutoText` to properly resolve imports.
-namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct AutoText; }
-// Forward declaration of `Distance` to properly resolve imports.
-namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct Distance; }
-// Forward declaration of `DistanceUnits` to properly resolve imports.
-namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class DistanceUnits; }
 // Forward declaration of `TripSelectorCallback` to properly resolve imports.
 namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct TripSelectorCallback; }
 // Forward declaration of `MapTemplateConfig` to properly resolve imports.
@@ -45,6 +37,12 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class NitroAl
 namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class NitroButtonStyle; }
 // Forward declaration of `NitroNavigationAlert` to properly resolve imports.
 namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct NitroNavigationAlert; }
+// Forward declaration of `AutoText` to properly resolve imports.
+namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct AutoText; }
+// Forward declaration of `Distance` to properly resolve imports.
+namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct Distance; }
+// Forward declaration of `DistanceUnits` to properly resolve imports.
+namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class DistanceUnits; }
 // Forward declaration of `NavigationAlertAction` to properly resolve imports.
 namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct NavigationAlertAction; }
 // Forward declaration of `AlertActionStyle` to properly resolve imports.
@@ -94,25 +92,16 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { enum class Maneuve
 // Forward declaration of `TripConfig` to properly resolve imports.
 namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct TripConfig; }
 
-#include "NavigationAlertCallbacks.hpp"
-#include "JNavigationAlertCallbacks.hpp"
-#include <functional>
-#include "JFunc_void.hpp"
-#include "AutoText.hpp"
-#include <optional>
-#include "JFunc_void_AutoText_std__optional_AutoText_.hpp"
-#include "JAutoText.hpp"
-#include <string>
-#include "Distance.hpp"
-#include "JDistance.hpp"
-#include "DistanceUnits.hpp"
-#include "JDistanceUnits.hpp"
 #include "TripSelectorCallback.hpp"
 #include "JTripSelectorCallback.hpp"
+#include <string>
+#include <functional>
 #include "JFunc_void_std__string.hpp"
 #include "MapTemplateConfig.hpp"
 #include "JMapTemplateConfig.hpp"
+#include <optional>
 #include "JFunc_void_std__optional_bool_.hpp"
+#include "JFunc_void.hpp"
 #include "VisibleTravelEstimate.hpp"
 #include "JVisibleTravelEstimate.hpp"
 #include "Point.hpp"
@@ -148,6 +137,12 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay { struct TripConfig;
 #include "JFunc_void_bool.hpp"
 #include "NitroNavigationAlert.hpp"
 #include "JNitroNavigationAlert.hpp"
+#include "AutoText.hpp"
+#include "JAutoText.hpp"
+#include "Distance.hpp"
+#include "JDistance.hpp"
+#include "DistanceUnits.hpp"
+#include "JDistanceUnits.hpp"
 #include "NavigationAlertAction.hpp"
 #include "JNavigationAlertAction.hpp"
 #include "AlertActionStyle.hpp"
@@ -237,10 +232,17 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JMapTemplateConfig> /* config */)>("createMapTemplate");
     method(_javaPart, JMapTemplateConfig::fromCpp(config));
   }
-  NavigationAlertCallbacks JHybridMapTemplateSpec::showNavigationAlert(const std::string& templateId, const NitroNavigationAlert& alert) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JNavigationAlertCallbacks>(jni::alias_ref<jni::JString> /* templateId */, jni::alias_ref<JNitroNavigationAlert> /* alert */)>("showNavigationAlert");
-    auto __result = method(_javaPart, jni::make_jstring(templateId), JNitroNavigationAlert::fromCpp(alert));
-    return __result->toCpp();
+  void JHybridMapTemplateSpec::showNavigationAlert(const std::string& templateId, const NitroNavigationAlert& alert) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* templateId */, jni::alias_ref<JNitroNavigationAlert> /* alert */)>("showNavigationAlert");
+    method(_javaPart, jni::make_jstring(templateId), JNitroNavigationAlert::fromCpp(alert));
+  }
+  void JHybridMapTemplateSpec::updateNavigationAlert(const std::string& templateId, double navigationAlertId, const AutoText& title, const std::optional<AutoText>& subtitle) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* templateId */, double /* navigationAlertId */, jni::alias_ref<JAutoText> /* title */, jni::alias_ref<JAutoText> /* subtitle */)>("updateNavigationAlert");
+    method(_javaPart, jni::make_jstring(templateId), navigationAlertId, JAutoText::fromCpp(title), subtitle.has_value() ? JAutoText::fromCpp(subtitle.value()) : nullptr);
+  }
+  void JHybridMapTemplateSpec::dismissNavigationAlert(const std::string& templateId, double navigationAlertId) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* templateId */, double /* navigationAlertId */)>("dismissNavigationAlert");
+    method(_javaPart, jni::make_jstring(templateId), navigationAlertId);
   }
   TripSelectorCallback JHybridMapTemplateSpec::showTripSelector(const std::string& templateId, const std::vector<TripsConfig>& trips, const std::optional<std::string>& selectedTripId, const TripPreviewTextConfiguration& textConfig, const std::function<void(const std::string& /* tripId */, const std::string& /* routeId */)>& onTripSelected, const std::function<void(const std::string& /* tripId */, const std::string& /* routeId */)>& onTripStarted, const std::function<void()>& onBackPressed, const std::vector<NitroMapButton>& mapButtons) {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JTripSelectorCallback>(jni::alias_ref<jni::JString> /* templateId */, jni::alias_ref<jni::JArrayClass<JTripsConfig>> /* trips */, jni::alias_ref<jni::JString> /* selectedTripId */, jni::alias_ref<JTripPreviewTextConfiguration> /* textConfig */, jni::alias_ref<JFunc_void_std__string_std__string::javaobject> /* onTripSelected */, jni::alias_ref<JFunc_void_std__string_std__string::javaobject> /* onTripStarted */, jni::alias_ref<JFunc_void::javaobject> /* onBackPressed */, jni::alias_ref<jni::JArrayClass<JNitroMapButton>> /* mapButtons */)>("showTripSelector_cxx");