@baeckerherz/expo-mapbox-navigation 1.0.3 → 1.0.5

package/README.md

@@ -4,7 +4,7 @@
 
 **Expo module for turn-by-turn navigation on iOS and Android** using [Mapbox Navigation SDK v3](https://docs.mapbox.com/ios/navigation/guides/) (iOS) / [Android](https://docs.mapbox.com/android/navigation/guides/). Single `MapboxNavigation` component, Expo config plugin for credentials, no vendored binaries. Minimal alternative to existing community wrappers.
 
-> **Alpha** — Working on **iOS and Android** in our project builds (Expo prebuild, EAS Build). You may use it, but we need more feedback and real-world testing. APIs may change. Not recommended for production without your own testing. **Contributions welcome.** **We’d love to hear from individuals and companies using this package** — open an issue or reach out.
+> **Alpha** — iOS is working in our builds; Android is not yet working (dependency resolution / Mapbox Maven). We need help to get Android over the line. APIs may change. **Contributions welcome.** Open an issue or reach out.
 
 **Package summary:** Expo config plugin + native module; Mapbox Navigation SDK v3; iOS (SPM) and Android (Maven, drop-in NavigationView); turn-by-turn driving/walking/cycling; requires Expo ≥51, React Native ≥0.74, Mapbox public + secret tokens; alpha stage; TypeScript API via `MapboxNavigation` component.
 
@@ -25,8 +25,17 @@
 ## Prerequisites
 
 - [Mapbox account](https://account.mapbox.com/) with Navigation SDK access
-- **Public token** (`pk.xxx`) and **secret/download token** (`sk.xxx`)
-- **iOS:** Add Mapbox credentials to `~/.netrc` for SPM:
+
+Mapbox requires **two tokens** (create both in your [Mapbox tokens page](https://account.mapbox.com/access-tokens/)):
+
+| Token | Prefix | Purpose |
+|-------|--------|---------|
+| **Public (access) token** | `pk.xxx` | Used by the app at runtime: map tiles, Directions API, voice, etc. Set as `mapboxAccessToken` in the plugin. |
+| **Secret (downloads) token** | `sk.xxx` | Used only at **build time**: Gradle (Android) and SPM (iOS) use it to download the Navigation SDK from Mapbox. Must have **Downloads:Read** scope. Not used by the app at runtime. |
+
+The same **secret token** is used for both platforms. For EAS Build, one EAS secret (e.g. `MAPBOX_DOWNLOADS_TOKEN` or `MAPBOX_SECRET_TOKEN`) can back both: iOS needs it in `~/.netrc` for SPM; Android needs it in `gradle.properties` (the plugin writes it from `mapboxSecretToken`) and, when using centralized repo resolution, as env var `MAPBOX_DOWNLOADS_TOKEN`.
+
+- **iOS:** Add the secret token to `~/.netrc` so SPM can download the SDK (local dev and EAS Build):
 
   ```plaintext
   machine api.mapbox.com
@@ -34,7 +43,7 @@
     password YOUR_SECRET_TOKEN
   ```
 
-- **Android:** The plugin writes `mapboxSecretToken` to `android/gradle.properties` as `MAPBOX_DOWNLOADS_TOKEN` so Maven can download the SDK. Use the same plugin config as for iOS.
+- **Android:** The plugin writes `mapboxSecretToken` to `android/gradle.properties` as `MAPBOX_DOWNLOADS_TOKEN` so Maven can download the SDK. For EAS Build, also set `MAPBOX_DOWNLOADS_TOKEN` as an EAS secret so the build can authenticate.
 
 ## Installation
 
@@ -155,17 +164,20 @@ Existing wrappers have major drawbacks:
 
 ## Status
 
-**Alpha.** Actively used in Bäckerherz project builds (iOS and Android). Goals:
+**Alpha.** Platform status:
+
+| Platform | Status | Notes |
+|----------|--------|-------|
+| **iOS** | Working (Alpha) | SPM via config plugin; tested in our project builds. |
+| **Android** | Not yet working | Mapbox Maven / dependency resolution issues; help wanted to fix. |
 
-1. Reliable SPM injection with Xcode + CocoaPods
-2. Sufficient drop-in NavigationView/NavigationViewController integration
-3. Event bridging for required use cases
+Goals: reliable SPM injection (iOS), drop-in NavigationView/NavigationViewController, event bridging. We want more feedback and testing. For prerelease we may publish under the `alpha` npm tag.
 
-We want more feedback and testing from the community. Install with `npx expo install @baeckerherz/expo-mapbox-navigation`; for prerelease channels we may publish under the `alpha` npm tag.
+**Help wanted** — especially to get Android builds working (Gradle, Mapbox repo auth, or switching to `ui-components` if the drop-in artifact is unavailable).
 
 **Known risks**
 
-- **Android:** Drop-in `NavigationView` may need more config for full parity with iOS.
+- **Android:** Build and dependency resolution need community input.
 - **Licensing:** Mapbox Navigation SDK requires a commercial Mapbox license; this wrapper does not change that.
 
 ## Contributing

package/android/build.gradle

@@ -74,7 +74,7 @@ dependencies {
   implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion}"
 
-  // Mapbox Navigation SDK v3 - drop-in UI
+  // Mapbox Navigation SDK v3 - core, drop-in UI, and maps
   implementation "com.mapbox.navigationcore:android:3.5.0"
   implementation "com.mapbox.navigationcore:dropin:3.5.0"
   implementation "com.mapbox.navigationcore:ui-maps:3.5.0"

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

@@ -13,6 +13,7 @@ import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.OffRouteObserver
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.dropin.NavigationView
+import com.mapbox.navigation.core.directions.session.RoutesSetCallback
 import com.mapbox.api.directions.v5.DirectionsCriteria
 import com.mapbox.api.directions.v5.models.RouteOptions
 
@@ -45,12 +46,40 @@ class ExpoMapboxNavigationView(
   private var hasStartedNavigation = false
 
   fun setCoordinates(raw: List<Map<String, Double>>) {
-    coordinates = raw.mapNotNull { map ->
+    val newCoords = raw.mapNotNull { map ->
       val lat = map["latitude"] ?: return@mapNotNull null
       val lng = map["longitude"] ?: return@mapNotNull null
       Point.fromLngLat(lng, lat)
     }
-    startNavigationIfReady()
+    val isRouteChange = hasStartedNavigation && coordinatesChanged(newCoords)
+    if (isRouteChange) {
+      removeCurrentNavigationView { startNavigationIfReady() }
+    }
+    coordinates = newCoords
+    if (!isRouteChange) {
+      startNavigationIfReady()
+    }
+  }
+
+  private fun coordinatesChanged(newCoords: List<Point>): Boolean {
+    if (coordinates.size != newCoords.size) return true
+    return coordinates.zip(newCoords).any { (a, b) ->
+      a.latitude() != b.latitude() || a.longitude() != b.longitude()
+    }
+  }
+
+  private fun removeCurrentNavigationView(onCleared: (() -> Unit)? = null) {
+    navigationView?.let { removeView(it) }
+    navigationView = null
+    hasStartedNavigation = false
+    val nav = MapboxNavigationApp.current()
+    if (nav != null) {
+      nav.setNavigationRoutes(emptyList(), 0, RoutesSetCallback { _ ->
+        post { onCleared?.invoke() }
+      })
+    } else {
+      post { onCleared?.invoke() }
+    }
   }
 
   private fun startNavigationIfReady() {
@@ -158,7 +187,6 @@ class ExpoMapboxNavigationView(
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    navigationView?.let { removeView(it) }
-    navigationView = null
+    removeCurrentNavigationView()
   }
 }

package/ios/ExpoMapboxNavigationView.swift

@@ -156,13 +156,39 @@ class ExpoMapboxNavigationView: ExpoView {
   // MARK: Props
 
   func setCoordinates(_ raw: [[String: Double]]) {
-    coordinates = raw.compactMap { dict in
+    let newCoords = raw.compactMap { dict -> CLLocationCoordinate2D? in
       guard let lat = dict["latitude"], let lng = dict["longitude"] else {
         return nil
       }
       return CLLocationCoordinate2D(latitude: lat, longitude: lng)
     }
-    startNavigationIfReady()
+    let isRouteChange = hasStartedNavigation && coordinatesDiffer(from: newCoords)
+    if isRouteChange {
+      removeCurrentNavigation()
+    }
+    coordinates = newCoords
+    if isRouteChange {
+      DispatchQueue.main.async { [weak self] in
+        self?.startNavigationIfReady()
+      }
+    } else {
+      startNavigationIfReady()
+    }
+  }
+
+  private func coordinatesDiffer(from newCoords: [CLLocationCoordinate2D]) -> Bool {
+    guard coordinates.count == newCoords.count else { return true }
+    return zip(coordinates, newCoords).contains { a, b in
+      a.latitude != b.latitude || a.longitude != b.longitude
+    }
+  }
+
+  private func removeCurrentNavigation() {
+    navigationViewController?.willMove(toParent: nil)
+    navigationViewController?.view.removeFromSuperview()
+    navigationViewController?.removeFromParent()
+    navigationViewController = nil
+    hasStartedNavigation = false
   }
 
   // MARK: Layout
@@ -308,9 +334,7 @@ class ExpoMapboxNavigationView: ExpoView {
   // MARK: Cleanup
 
   deinit {
-    navigationViewController?.willMove(toParent: nil)
-    navigationViewController?.view.removeFromSuperview()
-    navigationViewController?.removeFromParent()
+    removeCurrentNavigation()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baeckerherz/expo-mapbox-navigation",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Expo module for turn-by-turn navigation (Mapbox Navigation SDK v3) on iOS and Android. Alpha. Single MapboxNavigation component, Expo config plugin.",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/plugin/build/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const withMapboxNavPodfile_1 = require("./withMapboxNavPodfile");
 const withMapboxNavGradle_1 = require("./withMapboxNavGradle");
+const withMapboxNavSettingsGradle_1 = require("./withMapboxNavSettingsGradle");
 const withMapboxNavGradleProperties_1 = require("./withMapboxNavGradleProperties");
 const withMapboxNavigation = (config, { mapboxAccessToken, mapboxSecretToken, navigationSdkVersion = "3.5.0", }) => {
     if (!mapboxAccessToken) {
@@ -27,8 +28,9 @@ const withMapboxNavigation = (config, { mapboxAccessToken, mapboxSecretToken, na
     // iOS: Adds Mapbox Navigation SPM to the Pods project, sets search paths,
     // and adds a script phase to strip duplicate xcframework signatures.
     config = (0, withMapboxNavPodfile_1.withMapboxNavPodfile)(config, { navigationSdkVersion });
-    // Android: Mapbox Maven repository and optional token for SDK download
+    // Android: Mapbox Maven repository (build.gradle and settings.gradle) and optional token
     config = (0, withMapboxNavGradle_1.withMapboxNavGradle)(config);
+    config = (0, withMapboxNavSettingsGradle_1.withMapboxNavSettingsGradle)(config);
     config = (0, withMapboxNavGradleProperties_1.withMapboxNavGradleProperties)(config, { mapboxSecretToken });
     return config;
 };

package/plugin/build/withMapboxNavSettingsGradle.d.ts

@@ -0,0 +1,9 @@
+import { ConfigPlugin } from "@expo/config-plugins";
+/**
+ * Adds the Mapbox Maven repository to settings.gradle when the project uses
+ * dependencyResolutionManagement (e.g. FAIL_ON_PROJECT_REPOS). In that mode
+ * project-level repositories are ignored, so the root build.gradle injection
+ * is not enough and we must add the repo here.
+ * Uses env MAPBOX_DOWNLOADS_TOKEN so EAS Build and local builds can supply the secret.
+ */
+export declare const withMapboxNavSettingsGradle: ConfigPlugin;

package/plugin/build/withMapboxNavSettingsGradle.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withMapboxNavSettingsGradle = void 0;
+const config_plugins_1 = require("@expo/config-plugins");
+/**
+ * Adds the Mapbox Maven repository to settings.gradle when the project uses
+ * dependencyResolutionManagement (e.g. FAIL_ON_PROJECT_REPOS). In that mode
+ * project-level repositories are ignored, so the root build.gradle injection
+ * is not enough and we must add the repo here.
+ * Uses env MAPBOX_DOWNLOADS_TOKEN so EAS Build and local builds can supply the secret.
+ */
+const withMapboxNavSettingsGradle = (config) => {
+    return (0, config_plugins_1.withSettingsGradle)(config, (config) => {
+        let contents = config.modResults.contents;
+        if (contents.includes("api.mapbox.com/downloads/v2/releases/maven")) {
+            return config;
+        }
+        if (!contents.includes("dependencyResolutionManagement") ||
+            !contents.includes("repositories {")) {
+            return config;
+        }
+        const mapboxMaven = `
+        // @baeckerherz/expo-mapbox-navigation: Mapbox Navigation SDK Maven repository
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username = "mapbox"
+                password = (System.getenv("MAPBOX_DOWNLOADS_TOKEN") ?: "")
+            }
+        }`;
+        contents = contents.replace(/(repositories\s*\{)/, `$1${mapboxMaven}`);
+        config.modResults.contents = contents;
+        return config;
+    });
+};
+exports.withMapboxNavSettingsGradle = withMapboxNavSettingsGradle;

package/plugin/src/index.ts

@@ -1,6 +1,7 @@
 import { ConfigPlugin, createRunOncePlugin } from "@expo/config-plugins";
 import { withMapboxNavPodfile } from "./withMapboxNavPodfile";
 import { withMapboxNavGradle } from "./withMapboxNavGradle";
+import { withMapboxNavSettingsGradle } from "./withMapboxNavSettingsGradle";
 import { withMapboxNavGradleProperties } from "./withMapboxNavGradleProperties";
 
 interface PluginConfig {
@@ -47,8 +48,9 @@ const withMapboxNavigation: ConfigPlugin<PluginConfig> = (
   // and adds a script phase to strip duplicate xcframework signatures.
   config = withMapboxNavPodfile(config, { navigationSdkVersion });
 
-  // Android: Mapbox Maven repository and optional token for SDK download
+  // Android: Mapbox Maven repository (build.gradle and settings.gradle) and optional token
   config = withMapboxNavGradle(config);
+  config = withMapboxNavSettingsGradle(config);
   config = withMapboxNavGradleProperties(config, { mapboxSecretToken });
 
   return config;

package/plugin/src/withMapboxNavSettingsGradle.ts

@@ -0,0 +1,45 @@
+import { withSettingsGradle, ConfigPlugin } from "@expo/config-plugins";
+
+/**
+ * Adds the Mapbox Maven repository to settings.gradle when the project uses
+ * dependencyResolutionManagement (e.g. FAIL_ON_PROJECT_REPOS). In that mode
+ * project-level repositories are ignored, so the root build.gradle injection
+ * is not enough and we must add the repo here.
+ * Uses env MAPBOX_DOWNLOADS_TOKEN so EAS Build and local builds can supply the secret.
+ */
+export const withMapboxNavSettingsGradle: ConfigPlugin = (config) => {
+  return withSettingsGradle(config, (config) => {
+    let contents = config.modResults.contents;
+
+    if (contents.includes("api.mapbox.com/downloads/v2/releases/maven")) {
+      return config;
+    }
+    if (
+      !contents.includes("dependencyResolutionManagement") ||
+      !contents.includes("repositories {")
+    ) {
+      return config;
+    }
+
+    const mapboxMaven = `
+        // @baeckerherz/expo-mapbox-navigation: Mapbox Navigation SDK Maven repository
+        maven {
+            url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username = "mapbox"
+                password = (System.getenv("MAPBOX_DOWNLOADS_TOKEN") ?: "")
+            }
+        }`;
+
+    contents = contents.replace(
+      /(repositories\s*\{)/,
+      `$1${mapboxMaven}`
+    );
+
+    config.modResults.contents = contents;
+    return config;
+  });
+};