@jacques_gordon/expo-mapbox-navigation 2.0.8 → 2.1.0

package/android/build.gradle

@@ -1,51 +1,19 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
-
-// ─────────────────────────────────────────────────────────────────────────────
-// Mapbox Navigation SDK version used by this module.
-// Must be aligned with the Mapbox Maps SDK version used in @rnmapbox/maps.
-// Minimum required: 3.x compatible with mapbox-maps-android 11.11.0
-// ─────────────────────────────────────────────────────────────────────────────
-// Navigation SDK v3 uses com.mapbox.navigationcore (NOT com.mapbox.navigation)
-// v3.8.1 is the stable release that ships with Maps SDK 11.11.0
-def MAPBOX_NAVIGATION_VERSION = "3.8.1"
-
-// Forces minimum Mapbox Maps Android version to 11.11.0 to ensure
-// CameraAnimationsUtils.calculateCameraAnimationHint(...) is available (fixes #43)
-def MAPBOX_MAPS_MIN_VERSION = "11.11.0"
 
-// ─────────────────────────────────────────────────────────────────────────────
-// NDK 27 — required for 16 KB page size compatibility (Android 15+)
-// See: https://developer.android.com/guide/practices/page-sizes
-// NDK 27 added full support for 16 KB page alignment via -DALIGN_16KB flag
-// ─────────────────────────────────────────────────────────────────────────────
+def MAPBOX_NAV_VERSION = "3.8.1"
+def MAPBOX_MAPS_MIN_VERSION = "11.11.0"
 def REQUIRED_NDK_VERSION = "27.0.12077973"
 
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 35)
     namespace "expo.modules.mapboxnavigation"
-
-    // Force NDK 27 for 16 KB page size compatibility
     ndkVersion REQUIRED_NDK_VERSION
 
     defaultConfig {
         minSdkVersion safeExtGet("minSdkVersion", 24)
         targetSdkVersion safeExtGet("targetSdkVersion", 35)
-
-        // ─────────────────────────────────────────────────────────────────
-        // 16 KB PAGE SIZE SUPPORT (Android 15 / API 35+)
-        // Required for Google Play compliance starting Feb 2025 (64-bit apps)
-        // This ensures native .so libraries are aligned to 16 KB boundaries.
-        // ─────────────────────────────────────────────────────────────────
-        externalNativeBuild {
-            cmake {
-                arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-            }
-        }
-
         ndk {
-            // Only build for 64-bit ABIs — 16 KB page size requirement is 64-bit only
             abiFilters "arm64-v8a", "x86_64"
         }
     }
@@ -60,8 +28,6 @@ android {
     }
 
     packagingOptions {
-        // Ensure .so files are NOT compressed — required for 16 KB page size support
-        // Compressed .so files cannot be aligned in the APK
         jniLibs {
             useLegacyPackaging = false
         }
@@ -75,13 +41,9 @@ android {
 repositories {
     mavenCentral()
     google()
-
-    // Mapbox Maven repository — requires a secret token (sk.*)
     maven {
         url 'https://api.mapbox.com/downloads/v2/releases/maven'
-        authentication {
-            basic(BasicAuthentication)
-        }
+        authentication { basic(BasicAuthentication) }
         credentials {
             username = 'mapbox'
             password = project.hasProperty('MAPBOX_DOWNLOADS_TOKEN')
@@ -95,22 +57,30 @@ dependencies {
     implementation project(':expo-modules-core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${safeExtGet('kotlinVersion', '1.9.0')}"
 
-    // ─────────────────────────────────────────────────────────────────────────
-    // Mapbox Navigation SDK v3 for Android
-    // Group changed from com.mapbox.navigation to com.mapbox.navigationcore in v3
-    // v3.8.1 ships with mapbox-maps-android 11.11.0 (fixes issue #43)
-    // ─────────────────────────────────────────────────────────────────────────
-    implementation "com.mapbox.navigationcore:android:${MAPBOX_NAVIGATION_VERSION}"
+    // Mapbox Navigation SDK v3
+    implementation "com.mapbox.navigationcore:android:${MAPBOX_NAV_VERSION}"
 
-    // Explicitly pin Mapbox Maps SDK to ≥ 11.11.0 to guarantee method compatibility
-    // Prevents gradle from resolving an older transitive version (issue #43 root cause)
+    // Mapbox Maps SDK
     implementation("com.mapbox.maps:android:${MAPBOX_MAPS_MIN_VERSION}") {
         transitive = true
     }
 
-    // Lifecycle support
+    // Navigation UI Components (ManeuverView, SpeedInfoView)
+    implementation "com.mapbox.navigationcore:ui-components:${MAPBOX_NAV_VERSION}"
+
+    // TripData (ManeuverApi, SpeedInfoApi, TripProgressApi)
+    implementation "com.mapbox.navigationcore:tripdata:${MAPBOX_NAV_VERSION}"
+
+    // UI Maps (NavigationStyles, NavigationLocationProvider, NavigationCamera)
+    implementation "com.mapbox.navigationcore:ui-maps:${MAPBOX_NAV_VERSION}"
+
+    // ConstraintLayout — required because MapboxManeuverView extends ConstraintLayout
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+
+    // AndroidX
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
 }
 
 def safeExtGet(prop, fallback) {

package/android/src/main/java/expo/modules/mapboxnavigation/ExpoMapboxNavigationView.kt

@@ -2,13 +2,22 @@ package expo.modules.mapboxnavigation
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Color
 import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.TextView
 import com.mapbox.api.directions.v5.models.RouteOptions
+import com.mapbox.common.location.Location
 import com.mapbox.geojson.Point
 import com.mapbox.maps.MapView
-import com.mapbox.maps.Style
 import com.mapbox.maps.plugin.animation.camera
+import com.mapbox.maps.plugin.locationcomponent.location
+import com.mapbox.navigation.base.TimeFormat
 import com.mapbox.navigation.base.extensions.applyDefaultNavigationOptions
+import com.mapbox.navigation.base.formatter.DistanceFormatterOptions
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.route.NavigationRouterCallback
@@ -18,10 +27,29 @@ import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.MapboxNavigationProvider
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesUpdatedResult
+import com.mapbox.navigation.core.formatter.MapboxDistanceFormatter
+import com.mapbox.navigation.core.trip.session.LocationMatcherResult
+import com.mapbox.navigation.core.trip.session.LocationObserver
 import com.mapbox.navigation.core.trip.session.RouteProgressObserver
+import com.mapbox.navigation.tripdata.maneuver.api.MapboxManeuverApi
+import com.mapbox.navigation.tripdata.progress.api.MapboxTripProgressApi
+import com.mapbox.navigation.tripdata.progress.model.DistanceRemainingFormatter
+import com.mapbox.navigation.tripdata.progress.model.EstimatedTimeToArrivalFormatter
+import com.mapbox.navigation.tripdata.progress.model.PercentDistanceTraveledFormatter
+import com.mapbox.navigation.tripdata.progress.model.TimeRemainingFormatter
+import com.mapbox.navigation.tripdata.progress.model.TripProgressUpdateFormatter
+import com.mapbox.navigation.tripdata.speedlimit.api.MapboxSpeedInfoApi
+import com.mapbox.navigation.ui.components.maneuver.view.MapboxManeuverView
+import com.mapbox.navigation.ui.components.speedlimit.view.MapboxSpeedInfoView
+import com.mapbox.navigation.ui.components.tripprogress.view.MapboxTripProgressView
+import com.mapbox.navigation.ui.maps.NavigationStyles
 import com.mapbox.navigation.ui.maps.camera.NavigationCamera
 import com.mapbox.navigation.ui.maps.camera.data.MapboxNavigationViewportDataSource
 import com.mapbox.navigation.ui.maps.camera.transition.NavigationCameraTransitionOptions
+import com.mapbox.navigation.ui.maps.location.NavigationLocationProvider
+import com.mapbox.navigation.ui.maps.route.arrow.api.MapboxRouteArrowApi
+import com.mapbox.navigation.ui.maps.route.arrow.api.MapboxRouteArrowView
+import com.mapbox.navigation.ui.maps.route.arrow.model.RouteArrowOptions
 import com.mapbox.navigation.ui.maps.route.line.api.MapboxRouteLineApi
 import com.mapbox.navigation.ui.maps.route.line.api.MapboxRouteLineView
 import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineApiOptions
@@ -29,6 +57,7 @@ import com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineViewOptions
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
+import java.util.Calendar
 import java.util.Locale
 
 private const val TAG = "ExpoMapboxNavigation"
@@ -36,8 +65,7 @@ private const val TAG = "ExpoMapboxNavigation"
 class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     ExpoView(context, appContext) {
 
-    // ── EventDispatchers — the correct Expo Modules API for View events ───────
-    // Each event declared here must match the Events(...) list in ExpoMapboxNavigationModule
+    // ── EventDispatchers (correct Expo Modules API for View events) ───────────
     private val onRouteProgressChanged by EventDispatcher()
     private val onRoutesReady by EventDispatcher()
     private val onNavigationFinished by EventDispatcher()
@@ -45,14 +73,32 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     private val onRoutesFailed by EventDispatcher()
     private val onArrival by EventDispatcher()
 
-    // ── Map & Navigation ──────────────────────────────────────────────────────
+    // ── Views ─────────────────────────────────────────────────────────────────
     private val mapView: MapView = MapView(context)
-    private var navigationCamera: NavigationCamera? = null
-    private var viewportDataSource: MapboxNavigationViewportDataSource? = null
-    private var routeLineApi: MapboxRouteLineApi? = null
-    private var routeLineView: MapboxRouteLineView? = null
+    private var maneuverView: MapboxManeuverView? = null
+    private var speedInfoView: MapboxSpeedInfoView? = null
+    private var tripProgressView: MapboxTripProgressView? = null
+    private var tvEtaTime: TextView? = null
+    private var tvDuration: TextView? = null
+    private var tvDistance: TextView? = null
+    private var etaBar: LinearLayout? = null
+
+    // ── Navigation APIs (from official TurnByTurnExperienceActivity) ──────────
+    private lateinit var navigationCamera: NavigationCamera
+    private lateinit var viewportDataSource: MapboxNavigationViewportDataSource
+    private lateinit var routeLineApi: MapboxRouteLineApi
+    private lateinit var routeLineView: MapboxRouteLineView
+    private lateinit var maneuverApi: MapboxManeuverApi
+    private lateinit var tripProgressApi: MapboxTripProgressApi
+    private lateinit var speedInfoApi: MapboxSpeedInfoApi
+    private val routeArrowApi = MapboxRouteArrowApi()
+    private lateinit var routeArrowView: MapboxRouteArrowView
+    private val navigationLocationProvider = NavigationLocationProvider()
     private var mapboxNavigation: MapboxNavigation? = null
 
+    // ── Night mode ────────────────────────────────────────────────────────────
+    private var isNightMode = false
+
     // ── Props ─────────────────────────────────────────────────────────────────
     private var coordinates: List<Map<String, Double>> = emptyList()
     private var waypointIndices: List<Int>? = null
@@ -69,67 +115,250 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     private var customRasterAboveLayerId: String? = null
 
     init {
-        mapView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-        addView(mapView)
+        buildUI()
+        initAPIs()
         setupNavigation()
     }
 
-    private fun setupNavigation() {
-        val navigationOptions = NavigationOptions.Builder(context).build()
-        mapboxNavigation = MapboxNavigationProvider.create(navigationOptions)
+    // ─────────────────────────────────────────────────────────────────────────
+    // 1. Build programmatic UI
+    // ─────────────────────────────────────────────────────────────────────────
+    private fun buildUI() {
+        val dp = context.resources.displayMetrics.density
+        val root = FrameLayout(context).apply {
+            layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        }
+
+        // Full-screen MapView
+        root.addView(mapView, FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT
+        ))
 
-        mapView.mapboxMap.loadStyle(mapStyle ?: Style.MAPBOX_STREETS) { _ ->
-            routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
-            routeLineView = MapboxRouteLineView(
-                MapboxRouteLineViewOptions.Builder(context).build()
+        // ManeuverView — top banner
+        // NOTE: MapboxManeuverView extends ConstraintLayout, cast to View for addView()
+        val mv = MapboxManeuverView(context)
+        val mvParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.WRAP_CONTENT
+        )
+        mvParams.gravity = Gravity.TOP
+        mv.visibility = View.INVISIBLE  // matches official example (INVISIBLE not GONE)
+        root.addView(mv as View, mvParams)
+        maneuverView = mv
+
+        // SpeedInfoView — bottom-left
+        val siv = MapboxSpeedInfoView(context)
+        val sivParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.WRAP_CONTENT,
+            FrameLayout.LayoutParams.WRAP_CONTENT
+        )
+        sivParams.gravity = Gravity.BOTTOM or Gravity.START
+        sivParams.setMargins((16 * dp).toInt(), 0, 0, (100 * dp).toInt())
+        siv.visibility = View.GONE
+        root.addView(siv as View, sivParams)
+        speedInfoView = siv
+
+        // TripProgressView — embedded in bottom bar
+        val tpv = MapboxTripProgressView(context)
+        tripProgressView = tpv
+
+        // ETA bottom bar
+        val bar = LinearLayout(context).apply {
+            orientation = LinearLayout.HORIZONTAL
+            setBackgroundColor(Color.WHITE)
+            elevation = 8 * dp
+            visibility = View.INVISIBLE
+            gravity = Gravity.CENTER_VERTICAL
+            setPadding(
+                (16 * dp).toInt(), (8 * dp).toInt(),
+                (16 * dp).toInt(), (8 * dp).toInt()
             )
+        }
+        val barParams = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            (80 * dp).toInt()
+        )
+        barParams.gravity = Gravity.BOTTOM
+
+        val etaTime = TextView(context).apply {
+            textSize = 22f
+            setTextColor(Color.BLACK)
+            typeface = android.graphics.Typeface.DEFAULT_BOLD
+        }
+        bar.addView(etaTime, LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f))
+        tvEtaTime = etaTime
+
+        val center = LinearLayout(context).apply {
+            orientation = LinearLayout.VERTICAL
+            gravity = Gravity.CENTER
+        }
+        val dur = TextView(context).apply { textSize = 16f; setTextColor(Color.DKGRAY); gravity = Gravity.CENTER }
+        val dist = TextView(context).apply { textSize = 13f; setTextColor(Color.GRAY); gravity = Gravity.CENTER }
+        center.addView(dur)
+        center.addView(dist)
+        bar.addView(center, LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 2f))
+        tvDuration = dur
+        tvDistance = dist
+
+        val cancelBtn = TextView(context).apply {
+            text = "✕"
+            textSize = 22f
+            setTextColor(Color.DKGRAY)
+            gravity = Gravity.END or Gravity.CENTER_VERTICAL
+            setOnClickListener { cancelNavigation() }
+        }
+        bar.addView(cancelBtn, LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f))
+        etaBar = bar
+        root.addView(bar, barParams)
+
+        addView(root)
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────
+    // 2. Init APIs (from official example — exact same pattern)
+    // ─────────────────────────────────────────────────────────────────────────
+    private fun initAPIs() {
+        val distanceFormatterOptions = DistanceFormatterOptions.Builder(context).build()
+
+        // EXACT same instantiation as TurnByTurnExperienceActivity
+        maneuverApi = MapboxManeuverApi(
+            MapboxDistanceFormatter(distanceFormatterOptions)
+        )
+
+        tripProgressApi = MapboxTripProgressApi(
+            TripProgressUpdateFormatter.Builder(context)
+                .distanceRemainingFormatter(DistanceRemainingFormatter(distanceFormatterOptions))
+                .timeRemainingFormatter(TimeRemainingFormatter(context))
+                .percentRouteTraveledFormatter(PercentDistanceTraveledFormatter())
+                .estimatedTimeToArrivalFormatter(
+                    EstimatedTimeToArrivalFormatter(context, TimeFormat.NONE_SPECIFIED)
+                )
+                .build()
+        )
+
+        speedInfoApi = MapboxSpeedInfoApi()
+
+        val routeLineViewOptions = MapboxRouteLineViewOptions.Builder(context)
+            .routeLineBelowLayerId("road-label-navigation")
+            .build()
+        routeLineApi = MapboxRouteLineApi(MapboxRouteLineApiOptions.Builder().build())
+        routeLineView = MapboxRouteLineView(routeLineViewOptions)
+
+        val routeArrowOptions = RouteArrowOptions.Builder(context).build()
+        routeArrowView = MapboxRouteArrowView(routeArrowOptions)
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────
+    // 3. Setup Navigation
+    // ─────────────────────────────────────────────────────────────────────────
+    private fun setupNavigation() {
+        mapboxNavigation = MapboxNavigationProvider.create(
+            NavigationOptions.Builder(context).build()
+        )
+
+        val style = mapStyle ?: getAutoStyle()
+        mapView.mapboxMap.loadStyle(style) { mapStyle ->
+
+            // Route line layers must be initialized first
+            routeLineView.initializeLayers(mapStyle)
+
+            // Camera setup — EXACT same as official example
             viewportDataSource = MapboxNavigationViewportDataSource(mapView.mapboxMap)
             navigationCamera = NavigationCamera(
                 mapView.mapboxMap,
                 mapView.camera,
-                viewportDataSource!!
+                viewportDataSource
             )
+
+            // Location puck
+            mapView.location.apply {
+                setLocationProvider(navigationLocationProvider)
+                enabled = true
+            }
+
             registerObservers()
         }
     }
 
+    // ─────────────────────────────────────────────────────────────────────────
+    // 4. Observers — based 100% on official TurnByTurnExperienceActivity
+    // ─────────────────────────────────────────────────────────────────────────
     private fun registerObservers() {
         val nav = mapboxNavigation ?: return
 
+        // ── Routes observer ───────────────────────────────────────────────────
         nav.registerRoutesObserver(object : RoutesObserver {
             override fun onRoutesChanged(result: RoutesUpdatedResult) {
-                val routes = result.navigationRoutes
-                if (routes.isNotEmpty()) {
-                    routeLineApi?.setNavigationRoutes(routes) { value ->
-                        mapView.mapboxMap.style?.let { style ->
-                            routeLineView?.renderRouteDrawData(style, value)
+                if (result.navigationRoutes.isNotEmpty()) {
+                    // Draw route line
+                    routeLineApi.setNavigationRoutes(result.navigationRoutes) { value ->
+                        mapView.mapboxMap.style?.apply {
+                            routeLineView.renderRouteDrawData(this, value)
                         }
                     }
-                    viewportDataSource?.onRouteChanged(routes.first())
-                    viewportDataSource?.evaluate()
-                    safeCameraFollowing()
+                    // Update camera viewport
+                    viewportDataSource.onRouteChanged(result.navigationRoutes.first())
+                    viewportDataSource.evaluate()
+
+                    // Show navigation UI
+                    maneuverView?.visibility = View.VISIBLE
+                    etaBar?.visibility = View.VISIBLE
 
                     onRoutesReady(mapOf(
-                        "routeCount" to routes.size,
-                        "distanceMeters" to (routes.first().directionsRoute.distance() ?: 0.0),
-                        "durationSeconds" to (routes.first().directionsRoute.duration() ?: 0.0)
+                        "routeCount" to result.navigationRoutes.size,
+                        "distanceMeters" to (result.navigationRoutes.first().directionsRoute.distance() ?: 0.0),
+                        "durationSeconds" to (result.navigationRoutes.first().directionsRoute.duration() ?: 0.0)
                     ))
                 } else {
-                    routeLineApi?.clearRouteLine { value ->
-                        mapView.mapboxMap.style?.let { style ->
-                            routeLineView?.renderClearRouteLineValue(style, value)
+                    // Clear route line
+                    val style = mapView.mapboxMap.style
+                    if (style != null) {
+                        routeLineApi.clearRouteLine { value ->
+                            routeLineView.renderClearRouteLineValue(style, value)
                         }
+                        routeArrowView.render(style, routeArrowApi.clearArrows())
                     }
-                    viewportDataSource?.clearRouteData()
-                    viewportDataSource?.evaluate()
+                    viewportDataSource.clearRouteData()
+                    viewportDataSource.evaluate()
+                    hideUI()
                 }
             }
         })
 
+        // ── Route progress observer ───────────────────────────────────────────
+        // EXACT same pattern as TurnByTurnExperienceActivity.routeProgressObserver
         nav.registerRouteProgressObserver(RouteProgressObserver { routeProgress ->
-            viewportDataSource?.onRouteProgressChanged(routeProgress)
-            viewportDataSource?.evaluate()
+            // Update camera
+            viewportDataSource.onRouteProgressChanged(routeProgress)
+            viewportDataSource.evaluate()
 
+            // Draw maneuver arrow
+            val style = mapView.mapboxMap.style
+            if (style != null) {
+                val maneuverArrowResult = routeArrowApi.addUpcomingManeuverArrow(routeProgress)
+                routeArrowView.renderManeuverUpdate(style, maneuverArrowResult)
+            }
+
+            // Maneuver banner — EXACT same fold() pattern as official example
+            val maneuvers = maneuverApi.getManeuvers(routeProgress)
+            maneuvers.fold(
+                { error -> Log.w(TAG, "Maneuver error: ${error.errorMessage}") },
+                {
+                    maneuverView?.visibility = View.VISIBLE
+                    maneuverView?.renderManeuvers(maneuvers)
+                }
+            )
+
+            // Trip progress — EXACT same as official example
+            // getTripProgress returns TripProgressUpdateValue directly (not nullable)
+            val tripProgress = tripProgressApi.getTripProgress(routeProgress)
+            tripProgressView?.render(tripProgress)
+
+            // Update our custom ETA bar from tripProgress fields
+            updateEtaBar(tripProgress)
+
+            // Emit event
             onRouteProgressChanged(mapOf(
                 "distanceRemaining" to routeProgress.distanceRemaining,
                 "durationRemaining" to routeProgress.durationRemaining,
@@ -140,22 +369,145 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                         ?.currentStepProgress?.distanceRemaining ?: 0f)
             ))
         })
+
+        // ── Location observer ─────────────────────────────────────────────────
+        // EXACT same as official example
+        nav.registerLocationObserver(object : LocationObserver {
+            override fun onNewRawLocation(rawLocation: Location) {}
+
+            override fun onNewLocationMatcherResult(locationMatcherResult: LocationMatcherResult) {
+                val enhancedLocation = locationMatcherResult.enhancedLocation
+
+                // Update location puck
+                navigationLocationProvider.changePosition(
+                    location = enhancedLocation,
+                    keyPoints = locationMatcherResult.keyPoints,
+                )
+
+                // Update camera
+                viewportDataSource.onLocationChanged(enhancedLocation)
+                viewportDataSource.evaluate()
+
+                // Speed limit display
+                val formatterOptions = DistanceFormatterOptions.Builder(context).build()
+                val speedInfo = speedInfoApi.updatePostedAndCurrentSpeed(
+                    locationMatcherResult,
+                    formatterOptions
+                )
+                if (speedInfo != null) {
+                    speedInfoView?.visibility = View.VISIBLE
+                    speedInfoView?.render(speedInfo)
+                } else {
+                    speedInfoView?.visibility = View.GONE
+                }
+
+                // Auto day/night switch
+                checkAndSwitchDayNight()
+            }
+        })
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────
+    // 5. ETA bar update
+    // TripProgressUpdateValue fields confirmed from official tripdata API
+    // ─────────────────────────────────────────────────────────────────────────
+    private fun updateEtaBar(tripProgress: com.mapbox.navigation.tripdata.progress.model.TripProgressUpdateValue) {
+        // ETA arrival time
+        val etaSec = tripProgress.formatter.timeRemainingFormatter
+            .formatTime(tripProgress).toString()
+        // Calculate arrival clock time
+        val totalSec = tripProgress.totalTimeRemaining.toLong()
+        val cal = Calendar.getInstance().apply { add(Calendar.SECOND, totalSec.toInt()) }
+        tvEtaTime?.text = String.format("%02d:%02d",
+            cal.get(Calendar.HOUR_OF_DAY),
+            cal.get(Calendar.MINUTE)
+        )
+
+        // Duration remaining
+        val totalMin = (tripProgress.totalTimeRemaining / 60).toInt()
+        tvDuration?.text = if (totalMin >= 60)
+            "${totalMin / 60}h ${totalMin % 60}min"
+        else
+            "${totalMin} min"
+
+        // Distance remaining
+        val distM = tripProgress.distanceRemaining
+        tvDistance?.text = if (distM >= 1000)
+            String.format("%.1f km", distM / 1000.0)
+        else
+            "${distM.toInt()} m"
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────
+    // 6. Day / Night auto switch
+    // ─────────────────────────────────────────────────────────────────────────
+    private fun getAutoStyle(): String {
+        val hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
+        return if (hour in 6..20) NavigationStyles.NAVIGATION_DAY_STYLE
+        else NavigationStyles.NAVIGATION_NIGHT_STYLE
+    }
+
+    private fun checkAndSwitchDayNight() {
+        val hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
+        val shouldBeNight = hour !in 6..20
+        if (shouldBeNight == isNightMode) return
+        isNightMode = shouldBeNight
+
+        val newStyle = if (shouldBeNight) NavigationStyles.NAVIGATION_NIGHT_STYLE
+        else NavigationStyles.NAVIGATION_DAY_STYLE
+
+        mapView.mapboxMap.loadStyle(newStyle) { style ->
+            routeLineView.initializeLayers(style)
+            mapboxNavigation?.getNavigationRoutes()?.takeIf { it.isNotEmpty() }?.let { routes ->
+                routeLineApi.setNavigationRoutes(routes) { value ->
+                    routeLineView.renderRouteDrawData(style, value)
+                }
+            }
+        }
+
+        etaBar?.setBackgroundColor(
+            if (shouldBeNight) Color.parseColor("#1E2433") else Color.WHITE
+        )
+        val tc = if (shouldBeNight) Color.WHITE else Color.BLACK
+        tvEtaTime?.setTextColor(tc)
+        tvDuration?.setTextColor(if (shouldBeNight) Color.LTGRAY else Color.DKGRAY)
+        tvDistance?.setTextColor(Color.GRAY)
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────
+    // 7. Cancel navigation
+    // ─────────────────────────────────────────────────────────────────────────
+    private fun cancelNavigation() {
+        mapboxNavigation?.setNavigationRoutes(listOf())
+        mapboxNavigation?.stopTripSession()
+        hideUI()
+        onNavigationCancelled(mapOf<String, Any>())
     }
 
-    // ── Issue #43: safe camera ────────────────────────────────────────────────
+    private fun hideUI() {
+        maneuverView?.visibility = View.INVISIBLE
+        speedInfoView?.visibility = View.GONE
+        etaBar?.visibility = View.INVISIBLE
+    }
+
+    // ─────────────────────────────────────────────────────────────────────────
+    // 8. Issue #43 — safe camera following
+    // ─────────────────────────────────────────────────────────────────────────
     private fun safeCameraFollowing() {
         try {
-            navigationCamera?.requestNavigationCameraToFollowing(
+            navigationCamera.requestNavigationCameraToFollowing(
                 stateTransitionOptions = NavigationCameraTransitionOptions.Builder()
                     .maxDuration(0)
                     .build()
             )
         } catch (e: Exception) {
-            Log.e(TAG, "Camera transition error (issue #43): ${e.message}")
+            Log.e(TAG, "Camera transition error: ${e.message}")
         }
     }
 
-    // ── Issue #31: voice units ────────────────────────────────────────────────
+    // ─────────────────────────────────────────────────────────────────────────
+    // 9. Issue #31 — Voice units
+    // ─────────────────────────────────────────────────────────────────────────
     private fun resolveVoiceUnits(): String {
         return when (voiceUnits?.lowercase()) {
             "metric" -> "metric"
@@ -167,7 +519,9 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
         }
     }
 
-    // ── Route request ─────────────────────────────────────────────────────────
+    // ─────────────────────────────────────────────────────────────────────────
+    // 10. Route request
+    // ─────────────────────────────────────────────────────────────────────────
     @SuppressLint("MissingPermission")
     private fun fetchRoutes() {
         val nav = mapboxNavigation ?: return
@@ -183,14 +537,13 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
             .language(locale.toLanguageTag())
             .voiceUnits(resolveVoiceUnits())
             .coordinatesList(points)
+            .annotations("maxspeed,congestion,duration")
 
         waypointIndices?.let { builder.waypointIndicesList(it) }
         navigationProfile?.let {
             builder.profile(if (it.startsWith("mapbox/")) it else "mapbox/$it")
         }
-        excludeTypes?.takeIf { it.isNotEmpty() }?.let {
-            builder.exclude(it.joinToString(","))
-        }
+        excludeTypes?.takeIf { it.isNotEmpty() }?.let { builder.exclude(it.joinToString(",")) }
         maxHeight?.let { builder.maxHeight(it) }
         maxWidth?.let { builder.maxWidth(it) }
 
@@ -207,12 +560,10 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
                     }
                     nav.setNavigationRoutes(routes)
                     nav.startTripSession()
+                    safeCameraFollowing()
                 }
 
-                override fun onFailure(
-                    reasons: List<RouterFailure>,
-                    routeOptions: RouteOptions
-                ) {
+                override fun onFailure(reasons: List<RouterFailure>, routeOptions: RouteOptions) {
                     val msg = reasons.firstOrNull()?.message ?: "Unknown error"
                     Log.e(TAG, "Route request failed: $msg")
                     onRoutesFailed(mapOf("message" to msg))
@@ -249,8 +600,9 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     // ── Lifecycle ─────────────────────────────────────────────────────────────
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        routeLineApi?.cancel()
-        routeLineView?.cancel()
+        maneuverApi.cancel()
+        routeLineApi.cancel()
+        routeLineView.cancel()
         mapboxNavigation?.stopTripSession()
         MapboxNavigationProvider.destroy()
         mapView.onStop()

package/app.plugin.js

@@ -4,8 +4,6 @@ const path = require('path');
 
 const NDK_VERSION = '27.0.12077973';
 const MAPBOX_MAPS_MIN_VERSION = '11.11.0';
-// Navigation SDK v3 uses com.mapbox.navigationcore group
-const MAPBOX_NAV_VERSION = '3.8.1';
 
 const withMapboxNavigation = (config, options = {}) => {
   const {
@@ -22,13 +20,11 @@ const withMapboxNavigation = (config, options = {}) => {
     );
   }
 
-  // Validate mapboxMapsVersion >= 11.11.0
   const [major, minor] = mapboxMapsVersion.split('.').map(Number);
   if (major < 11 || (major === 11 && minor < 11)) {
     throw new Error(
       `[@jacques_gordon/expo-mapbox-navigation] mapboxMapsVersion must be >= 11.11.0.\n` +
-      `Provided: ${mapboxMapsVersion}\n` +
-      `This minimum version is required to fix the CameraAnimationsUtils crash (issue #43).`
+      `Provided: ${mapboxMapsVersion}`
     );
   }
 
@@ -36,7 +32,6 @@ const withMapboxNavigation = (config, options = {}) => {
   config = withProjectBuildGradle(config, (mod) => {
     let contents = mod.modResults.contents;
 
-    // Add Mapbox Maven repo if not already present
     if (!contents.includes('api.mapbox.com/downloads/v2/releases/maven')) {
       const mavenBlock = `
         maven {
@@ -49,7 +44,6 @@ const withMapboxNavigation = (config, options = {}) => {
                     : System.getenv('MAPBOX_DOWNLOADS_TOKEN') ?: ""
             }
         }`;
-
       if (contents.includes('allprojects') && contents.includes('repositories')) {
         contents = contents.replace(
           /allprojects\s*\{[\s\S]*?repositories\s*\{/,
@@ -58,7 +52,6 @@ const withMapboxNavigation = (config, options = {}) => {
       }
     }
 
-
     mod.modResults.contents = contents;
     return mod;
   });
@@ -67,37 +60,32 @@ const withMapboxNavigation = (config, options = {}) => {
   config = withAppBuildGradle(config, (mod) => {
     let contents = mod.modResults.contents;
 
-    // Force NDK 27 for 16 KB page size
     if (!contents.includes('ndkVersion')) {
       contents = contents.replace(
         /android\s*\{/,
-        `android {\n    ndkVersion "${NDK_VERSION}" // Required for 16 KB page size (expo-mapbox-navigation)`
+        `android {\n    ndkVersion "${NDK_VERSION}"`
       );
     } else if (!contents.includes(NDK_VERSION)) {
       contents = contents.replace(
         /ndkVersion\s+["'][^"']*["']/,
-        `ndkVersion "${NDK_VERSION}" // Forced by expo-mapbox-navigation for 16KB page size`
+        `ndkVersion "${NDK_VERSION}"`
       );
     }
 
-    // Enable useLegacyPackaging = false for 16 KB page alignment
     if (!contents.includes('useLegacyPackaging')) {
       contents = contents.replace(
         /android\s*\{/,
-        `android {\n    packagingOptions {\n        jniLibs {\n            useLegacyPackaging = false // 16 KB page size support\n        }\n    }`
+        `android {\n    packagingOptions {\n        jniLibs {\n            useLegacyPackaging = false\n        }\n    }`
       );
     }
 
-    // Pin Mapbox Maps + Navigation versions via resolutionStrategy
     const resolutionBlock = `
 configurations.all {
     resolutionStrategy {
-        // Force Mapbox Maps SDK >= ${mapboxMapsVersion} — required for NavigationCamera compatibility (issue #43)
         force "com.mapbox.maps:android:${mapboxMapsVersion}"
         force "com.mapbox.maps:android-ndk27:${mapboxMapsVersion}"
     }
 }`;
-
     if (!contents.includes('com.mapbox.maps:android:')) {
       contents = contents + '\n' + resolutionBlock;
     }
@@ -106,31 +94,57 @@ configurations.all {
     return mod;
   });
 
-  // ── Android: AndroidManifest — add access token as meta-data ─────────────
+  // ── Android: AndroidManifest ─────────────────────────────────────────────
   config = withAndroidManifest(config, (mod) => {
-    const mainApp = mod.modResults.manifest.application?.[0];
-    if (mainApp) {
-      if (!mainApp['meta-data']) {
-        mainApp['meta-data'] = [];
+    const manifest = mod.modResults.manifest;
+
+    // ── Permissions required by Mapbox Navigation SDK (targetSdk 35) ────────
+    //
+    // SecurityException: Starting FGS with type location requires:
+    //   - android.permission.FOREGROUND_SERVICE_LOCATION   (mandatory API 34+)
+    //   - android.permission.FOREGROUND_SERVICE             (mandatory)
+    //   - android.permission.ACCESS_FINE_LOCATION           (at least one of coarse/fine)
+    //   - android.permission.ACCESS_COARSE_LOCATION
+    //
+    const requiredPermissions = [
+      'android.permission.ACCESS_FINE_LOCATION',
+      'android.permission.ACCESS_COARSE_LOCATION',
+      'android.permission.FOREGROUND_SERVICE',
+      'android.permission.FOREGROUND_SERVICE_LOCATION',  // ← fixes the crash
+      'android.permission.POST_NOTIFICATIONS',            // needed for nav notification (API 33+)
+    ];
+
+    if (!manifest['uses-permission']) {
+      manifest['uses-permission'] = [];
+    }
+
+    for (const permission of requiredPermissions) {
+      const already = manifest['uses-permission'].some(
+        (p) => p.$?.['android:name'] === permission
+      );
+      if (!already) {
+        manifest['uses-permission'].push({ $: { 'android:name': permission } });
       }
+    }
 
+    // ── Mapbox access token meta-data ────────────────────────────────────────
+    const mainApp = manifest.application?.[0];
+    if (mainApp) {
+      if (!mainApp['meta-data']) mainApp['meta-data'] = [];
       const tokenMeta = mainApp['meta-data'].find(
         (m) => m.$?.['android:name'] === 'com.mapbox.token'
       );
-
       if (!tokenMeta) {
         mainApp['meta-data'].push({
-          $: {
-            'android:name': 'com.mapbox.token',
-            'android:value': accessToken,
-          },
+          $: { 'android:name': 'com.mapbox.token', 'android:value': accessToken },
         });
       }
     }
+
     return mod;
   });
 
-  // ── Android: Write color overrides resource file ──────────────────────────
+  // ── Android: color overrides ─────────────────────────────────────────────
   if (Object.keys(androidColorOverrides).length > 0) {
     config = withDangerousMod(config, [
       'android',
@@ -139,27 +153,16 @@ configurations.all {
           mod.modRequest.platformProjectRoot,
           'app/src/main/res/values'
         );
-
-        if (!fs.existsSync(colorsDir)) {
-          fs.mkdirSync(colorsDir, { recursive: true });
-        }
+        if (!fs.existsSync(colorsDir)) fs.mkdirSync(colorsDir, { recursive: true });
 
         const colorEntries = Object.entries(androidColorOverrides)
           .map(([name, value]) => `    <color name="${name}">${value}</color>`)
           .join('\n');
 
-        const colorsXml = `<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by @jacques_gordon/expo-mapbox-navigation config plugin -->
-<resources>
-${colorEntries}
-</resources>
-`;
-
         fs.writeFileSync(
           path.join(colorsDir, 'mapbox_navigation_colors.xml'),
-          colorsXml
+          `<?xml version="1.0" encoding="utf-8"?>\n<resources>\n${colorEntries}\n</resources>\n`
         );
-
         return mod;
       },
     ]);
@@ -177,16 +180,12 @@ ${colorEntries}
       mod.modResults.NSLocationAlwaysAndWhenInUseUsageDescription =
         'Your location is used for turn-by-turn navigation even when the app is in the background.';
     }
-
-    if (!mod.modResults.UIBackgroundModes) {
-      mod.modResults.UIBackgroundModes = [];
-    }
+    if (!mod.modResults.UIBackgroundModes) mod.modResults.UIBackgroundModes = [];
     for (const mode of ['audio', 'location']) {
       if (!mod.modResults.UIBackgroundModes.includes(mode)) {
         mod.modResults.UIBackgroundModes.push(mode);
       }
     }
-
     return mod;
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "Expo module for Mapbox Navigation SDK with 16KB page size support, NDK27, and Mapbox Maps v11.11.0+",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,14 +23,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/jacques_gordon/expo-mapbox-navigation.git"
+    "url": "https://github.com/jacquesngomeheffa/expo-mapbox-navigation.git"
   },
   "bugs": {
-    "url": "https://github.com/jacques_gordon/expo-mapbox-navigation/issues"
+    "url": "https://github.com/jacquesngomeheffa/expo-mapbox-navigation/issues"
   },
   "author": "Jacques Gordon",
   "license": "MIT",
-  "homepage": "https://github.com/jacques_gordon/expo-mapbox-navigation#readme",
+  "homepage": "https://github.com/jacquesngomeheffa/expo-mapbox-navigation#readme",
   "peerDependencies": {
     "expo": ">=53.0.0",
     "react": "*",

package/plugin/src/index.js

@@ -4,8 +4,6 @@ const path = require('path');
 
 const NDK_VERSION = '27.0.12077973';
 const MAPBOX_MAPS_MIN_VERSION = '11.11.0';
-// Navigation SDK v3 uses com.mapbox.navigationcore group
-const MAPBOX_NAV_VERSION = '3.8.1';
 
 const withMapboxNavigation = (config, options = {}) => {
   const {
@@ -22,13 +20,11 @@ const withMapboxNavigation = (config, options = {}) => {
     );
   }
 
-  // Validate mapboxMapsVersion >= 11.11.0
   const [major, minor] = mapboxMapsVersion.split('.').map(Number);
   if (major < 11 || (major === 11 && minor < 11)) {
     throw new Error(
       `[@jacques_gordon/expo-mapbox-navigation] mapboxMapsVersion must be >= 11.11.0.\n` +
-      `Provided: ${mapboxMapsVersion}\n` +
-      `This minimum version is required to fix the CameraAnimationsUtils crash (issue #43).`
+      `Provided: ${mapboxMapsVersion}`
     );
   }
 
@@ -36,7 +32,6 @@ const withMapboxNavigation = (config, options = {}) => {
   config = withProjectBuildGradle(config, (mod) => {
     let contents = mod.modResults.contents;
 
-    // Add Mapbox Maven repo if not already present
     if (!contents.includes('api.mapbox.com/downloads/v2/releases/maven')) {
       const mavenBlock = `
         maven {
@@ -49,7 +44,6 @@ const withMapboxNavigation = (config, options = {}) => {
                     : System.getenv('MAPBOX_DOWNLOADS_TOKEN') ?: ""
             }
         }`;
-
       if (contents.includes('allprojects') && contents.includes('repositories')) {
         contents = contents.replace(
           /allprojects\s*\{[\s\S]*?repositories\s*\{/,
@@ -58,7 +52,6 @@ const withMapboxNavigation = (config, options = {}) => {
       }
     }
 
-
     mod.modResults.contents = contents;
     return mod;
   });
@@ -67,37 +60,32 @@ const withMapboxNavigation = (config, options = {}) => {
   config = withAppBuildGradle(config, (mod) => {
     let contents = mod.modResults.contents;
 
-    // Force NDK 27 for 16 KB page size
     if (!contents.includes('ndkVersion')) {
       contents = contents.replace(
         /android\s*\{/,
-        `android {\n    ndkVersion "${NDK_VERSION}" // Required for 16 KB page size (expo-mapbox-navigation)`
+        `android {\n    ndkVersion "${NDK_VERSION}"`
       );
     } else if (!contents.includes(NDK_VERSION)) {
       contents = contents.replace(
         /ndkVersion\s+["'][^"']*["']/,
-        `ndkVersion "${NDK_VERSION}" // Forced by expo-mapbox-navigation for 16KB page size`
+        `ndkVersion "${NDK_VERSION}"`
       );
     }
 
-    // Enable useLegacyPackaging = false for 16 KB page alignment
     if (!contents.includes('useLegacyPackaging')) {
       contents = contents.replace(
         /android\s*\{/,
-        `android {\n    packagingOptions {\n        jniLibs {\n            useLegacyPackaging = false // 16 KB page size support\n        }\n    }`
+        `android {\n    packagingOptions {\n        jniLibs {\n            useLegacyPackaging = false\n        }\n    }`
       );
     }
 
-    // Pin Mapbox Maps + Navigation versions via resolutionStrategy
     const resolutionBlock = `
 configurations.all {
     resolutionStrategy {
-        // Force Mapbox Maps SDK >= ${mapboxMapsVersion} — required for NavigationCamera compatibility (issue #43)
         force "com.mapbox.maps:android:${mapboxMapsVersion}"
         force "com.mapbox.maps:android-ndk27:${mapboxMapsVersion}"
     }
 }`;
-
     if (!contents.includes('com.mapbox.maps:android:')) {
       contents = contents + '\n' + resolutionBlock;
     }
@@ -106,31 +94,57 @@ configurations.all {
     return mod;
   });
 
-  // ── Android: AndroidManifest — add access token as meta-data ─────────────
+  // ── Android: AndroidManifest ─────────────────────────────────────────────
   config = withAndroidManifest(config, (mod) => {
-    const mainApp = mod.modResults.manifest.application?.[0];
-    if (mainApp) {
-      if (!mainApp['meta-data']) {
-        mainApp['meta-data'] = [];
+    const manifest = mod.modResults.manifest;
+
+    // ── Permissions required by Mapbox Navigation SDK (targetSdk 35) ────────
+    //
+    // SecurityException: Starting FGS with type location requires:
+    //   - android.permission.FOREGROUND_SERVICE_LOCATION   (mandatory API 34+)
+    //   - android.permission.FOREGROUND_SERVICE             (mandatory)
+    //   - android.permission.ACCESS_FINE_LOCATION           (at least one of coarse/fine)
+    //   - android.permission.ACCESS_COARSE_LOCATION
+    //
+    const requiredPermissions = [
+      'android.permission.ACCESS_FINE_LOCATION',
+      'android.permission.ACCESS_COARSE_LOCATION',
+      'android.permission.FOREGROUND_SERVICE',
+      'android.permission.FOREGROUND_SERVICE_LOCATION',  // ← fixes the crash
+      'android.permission.POST_NOTIFICATIONS',            // needed for nav notification (API 33+)
+    ];
+
+    if (!manifest['uses-permission']) {
+      manifest['uses-permission'] = [];
+    }
+
+    for (const permission of requiredPermissions) {
+      const already = manifest['uses-permission'].some(
+        (p) => p.$?.['android:name'] === permission
+      );
+      if (!already) {
+        manifest['uses-permission'].push({ $: { 'android:name': permission } });
       }
+    }
 
+    // ── Mapbox access token meta-data ────────────────────────────────────────
+    const mainApp = manifest.application?.[0];
+    if (mainApp) {
+      if (!mainApp['meta-data']) mainApp['meta-data'] = [];
       const tokenMeta = mainApp['meta-data'].find(
         (m) => m.$?.['android:name'] === 'com.mapbox.token'
       );
-
       if (!tokenMeta) {
         mainApp['meta-data'].push({
-          $: {
-            'android:name': 'com.mapbox.token',
-            'android:value': accessToken,
-          },
+          $: { 'android:name': 'com.mapbox.token', 'android:value': accessToken },
         });
       }
     }
+
     return mod;
   });
 
-  // ── Android: Write color overrides resource file ──────────────────────────
+  // ── Android: color overrides ─────────────────────────────────────────────
   if (Object.keys(androidColorOverrides).length > 0) {
     config = withDangerousMod(config, [
       'android',
@@ -139,27 +153,16 @@ configurations.all {
           mod.modRequest.platformProjectRoot,
           'app/src/main/res/values'
         );
-
-        if (!fs.existsSync(colorsDir)) {
-          fs.mkdirSync(colorsDir, { recursive: true });
-        }
+        if (!fs.existsSync(colorsDir)) fs.mkdirSync(colorsDir, { recursive: true });
 
         const colorEntries = Object.entries(androidColorOverrides)
           .map(([name, value]) => `    <color name="${name}">${value}</color>`)
           .join('\n');
 
-        const colorsXml = `<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by @jacques_gordon/expo-mapbox-navigation config plugin -->
-<resources>
-${colorEntries}
-</resources>
-`;
-
         fs.writeFileSync(
           path.join(colorsDir, 'mapbox_navigation_colors.xml'),
-          colorsXml
+          `<?xml version="1.0" encoding="utf-8"?>\n<resources>\n${colorEntries}\n</resources>\n`
         );
-
         return mod;
       },
     ]);
@@ -177,16 +180,12 @@ ${colorEntries}
       mod.modResults.NSLocationAlwaysAndWhenInUseUsageDescription =
         'Your location is used for turn-by-turn navigation even when the app is in the background.';
     }
-
-    if (!mod.modResults.UIBackgroundModes) {
-      mod.modResults.UIBackgroundModes = [];
-    }
+    if (!mod.modResults.UIBackgroundModes) mod.modResults.UIBackgroundModes = [];
     for (const mode of ['audio', 'location']) {
       if (!mod.modResults.UIBackgroundModes.includes(mode)) {
         mod.modResults.UIBackgroundModes.push(mode);
       }
     }
-
     return mod;
   });