@jacques_gordon/expo-mapbox-navigation 2.2.4 → 2.2.6

package/ExpoMapboxNavigation.podspec

@@ -10,46 +10,40 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-
-  # ── 16 KB / SPM minimum: Mapbox Navigation SDK v3 for iOS requires iOS 14+,
-  # but Swift Package Manager dependencies resolved through CocoaPods'
-  # spm_dependency() mechanism require iOS 15.1+ as the minimum deployment
-  # target (Apple's SPM-via-CocoaPods bridging constraint).
-  s.platforms      = { :ios => '15.1' }
+  s.platforms      = { :ios => '14.0' }
   s.swift_version  = '5.9'
   s.source         = { git: package['repository']['url'], tag: "v#{s.version}" }
-  s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
 
-  # ── iOS: Mapbox Navigation SDK v3 via Swift Package Manager ─────────────────
+  # ── iOS: Mapbox Navigation SDK v3 ───────────────────────────────────────────
   #
-  # IMPORTANT: earlier versions of this podspec referenced prebuilt
-  # .xcframework files (MapboxNavigationUIKit.xcframework,
-  # MapboxNavigationCore.xcframework, MapboxDirections.xcframework) that were
-  # NEVER actually built or shipped in the npm package — this caused
-  # "Unimplemented component: ViewManagerAdapter_ExpoMapboxNavigation" at
-  # runtime on iOS, since no native module was ever registered.
+  # IMPORTANT — do NOT use spm_dependency() here.
   #
-  # The Mapbox Navigation SDK v3 for iOS is officially distributed ONLY via
-  # Swift Package Manager (CocoaPods support is not provided by Mapbox).
-  # We use CocoaPods' built-in spm_dependency() helper (available since
-  # CocoaPods 1.13+, and exactly the mechanism Expo's own modules use for
-  # this exact situation) to pull the SPM package transparently as part of
-  # `pod install` / `expo prebuild`. No manual Xcode steps, no vendored
-  # binaries to build or maintain.
-  spm_dependency(
-    s,
-    url: 'https://github.com/mapbox/mapbox-navigation-ios.git',
-    requirement: { kind: 'upToNextMajorVersion', minimumVersion: '3.24.2' },
-    products: ['MapboxNavigationCore', 'MapboxNavigationUIKit', 'MapboxDirections']
-  )
-
-  s.source_files = 'ios/**/*.{swift,h,m,mm}'
-
+  # spm_dependency() causes "43029 duplicate symbols" linker errors when used
+  # alongside @rnmapbox/maps in an Expo project (confirmed: React Native
+  # GitHub issue #47344, Expo GitHub issue #37813). The root cause is that
+  # spm_dependency() links the SPM framework into both the Pod target AND
+  # the main app target simultaneously, so the linker sees every symbol twice.
+  #
+  # The correct approach for Expo modules that need SPM-only packages:
+  # add the SPM dependency directly to the Xcode project's main target via
+  # the config plugin (withXcodeProject + withDangerousMod), which is exactly
+  # what our plugin/src/index.js does via the addMapboxNavigationSPM function.
+  # That way there is only ONE copy of each framework in the final binary.
+  #
+  # MapboxNavigationCore and MapboxNavigationUIKit are therefore listed as
+  # weak framework references here so the module compiles against them, while
+  # the actual linking happens at the app level from the SPM dependency added
+  # by the config plugin.
   s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule',
-    'IPHONEOS_DEPLOYMENT_TARGET' => '15.1'
+    'DEFINES_MODULE'                          => 'YES',
+    'SWIFT_COMPILATION_MODE'                  => 'wholemodule',
+    'OTHER_SWIFT_FLAGS'                       => '$(inherited) -Xfrontend -disable-reflection-metadata',
+    'FRAMEWORK_SEARCH_PATHS'                  => '$(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks',
+    'OTHER_LDFLAGS'                           => '$(inherited)',
+    'IPHONEOS_DEPLOYMENT_TARGET'              => '14.0',
   }
+
+  s.source_files = 'ios/**/*.{swift,h,m,mm}'
 end

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

@@ -933,12 +933,54 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) :
     fun setUseMapMatching(u: Boolean) { useMapMatching = u }
     fun setCustomRasterTileUrl(u: String?) { customRasterTileUrl = u }
     fun setCustomRasterAboveLayerId(l: String?) { customRasterAboveLayerId = l }
-    fun setManeuverBackgroundColorDay(c: String?) { maneuverBackgroundColorDay = c }
+
+    fun setManeuverBackgroundColorDay(c: String?) {
+        maneuverBackgroundColorDay = c
+        // ManeuverView is constructed with options in buildUI() which runs before
+        // props are received — we cannot rebuild it, but the color can be applied
+        // by updating the ManeuverView background tint directly on the view itself.
+        c?.let { hex ->
+            try { maneuverView?.setBackgroundColor(Color.parseColor(hex)) } catch (e: Exception) {}
+        }
+    }
+
     fun setManeuverTurnIconColor(c: String?) { maneuverTurnIconColor = c }
-    fun setEtaBarBackgroundColor(c: String?) { etaBarBackgroundColor = c }
-    fun setEtaTextColor(c: String?) { etaTextColor = c }
-    fun setIconButtonColor(c: String?) { iconButtonColor = c }
-    fun setIconButtonMutedColor(c: String?) { iconButtonMutedColor = c }
+
+    fun setEtaBarBackgroundColor(c: String?) {
+        etaBarBackgroundColor = c
+        c?.let { hex ->
+            try { etaBar?.setBackgroundColor(Color.parseColor(hex)) } catch (e: Exception) {}
+        }
+    }
+
+    fun setEtaTextColor(c: String?) {
+        etaTextColor = c
+        c?.let { hex ->
+            try {
+                val color = Color.parseColor(hex)
+                tvEtaTime?.setTextColor(color)
+                tvDuration?.setTextColor(color)
+            } catch (e: Exception) {}
+        }
+    }
+
+    fun setIconButtonColor(c: String?) {
+        iconButtonColor = c
+        // Redraw overview and recenter icons with new color
+        btnOverviewView?.setImageBitmap(drawRouteOverviewIcon())
+        // Recenter keeps its current alpha (0.4 following / 1.0 overview)
+        val currentAlpha = btnRecenterView?.alpha ?: 0.4f
+        btnRecenterView?.setImageBitmap(drawNavigationArrowIcon())
+        btnRecenterView?.alpha = currentAlpha
+        // Redraw mute icon only if not currently muted (muted uses iconButtonMutedColor)
+        if (!isMuted) btnMuteView?.setImageBitmap(drawSpeakerIcon(false))
+    }
+
+    fun setIconButtonMutedColor(c: String?) {
+        iconButtonMutedColor = c
+        // Redraw mute icon only if currently muted
+        if (isMuted) btnMuteView?.setImageBitmap(drawSpeakerIcon(true))
+    }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()

package/app.plugin.js

@@ -1,15 +1,20 @@
-const { withAppBuildGradle, withProjectBuildGradle, withAndroidManifest, withInfoPlist, withDangerousMod } = require('@expo/config-plugins');
+const {
+  withAppBuildGradle,
+  withProjectBuildGradle,
+  withAndroidManifest,
+  withInfoPlist,
+  withDangerousMod,
+} = require('@expo/config-plugins');
+const { mergeContents } = require('@expo/config-plugins/build/utils/generateCode');
 const fs = require('fs');
 const path = require('path');
 
-const NDK_VERSION = '27.0.12077973';
-const MAPBOX_MAPS_MIN_VERSION = '11.11.0';
 
 const withMapboxNavigation = (config, options = {}) => {
   const {
     accessToken,
     downloadsToken,
-    mapboxMapsVersion = MAPBOX_MAPS_MIN_VERSION,
+    mapboxMapsVersion = '11.11.0',
     androidColorOverrides = {},
   } = options;
 
@@ -21,181 +26,35 @@ const withMapboxNavigation = (config, options = {}) => {
     );
   }
 
-  // downloadsToken (a secret sk.* token with the Downloads:Read scope) is
-  // required on iOS to authenticate Swift Package Manager's fetch of the
-  // Mapbox Navigation SDK package — without it, `pod install`/`expo
-  // prebuild` will fail to resolve the SPM dependency declared in
-  // ExpoMapboxNavigation.podspec.
   if (!downloadsToken) {
     throw new Error(
       '[@jacques_gordon/expo-mapbox-navigation] `downloadsToken` is required for iOS builds.\n' +
-      'This must be a SECRET Mapbox token (starts with "sk.") with the "Downloads:Read" scope,\n' +
-      'used to authenticate Swift Package Manager when fetching the Mapbox Navigation SDK.\n' +
+      'This must be a SECRET Mapbox token (starts with "sk.") with the "Downloads:Read" scope.\n' +
       'Add it to your app.json plugins array:\n' +
       '  ["@jacques_gordon/expo-mapbox-navigation", { "accessToken": "pk.xxx", "downloadsToken": "sk.xxx" }]'
     );
   }
 
-  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}`
-    );
-  }
-
-  // ── Android: project-level build.gradle ─────────────────────────────────
-  config = withProjectBuildGradle(config, (mod) => {
-    let contents = mod.modResults.contents;
-
-    if (!contents.includes('api.mapbox.com/downloads/v2/releases/maven')) {
-      const mavenBlock = `
-        maven {
-            url 'https://api.mapbox.com/downloads/v2/releases/maven'
-            authentication { basic(BasicAuthentication) }
-            credentials {
-                username = 'mapbox'
-                password = project.hasProperty('MAPBOX_DOWNLOADS_TOKEN')
-                    ? project.property('MAPBOX_DOWNLOADS_TOKEN')
-                    : System.getenv('MAPBOX_DOWNLOADS_TOKEN') ?: ""
-            }
-        }`;
-      if (contents.includes('allprojects') && contents.includes('repositories')) {
-        contents = contents.replace(
-          /allprojects\s*\{[\s\S]*?repositories\s*\{/,
-          (match) => match + mavenBlock
-        );
-      }
-    }
-
-    mod.modResults.contents = contents;
-    return mod;
-  });
-
-  // ── Android: app-level build.gradle ─────────────────────────────────────
+  // ── Android ───────────────────────────────────────────────────────────────
   config = withAppBuildGradle(config, (mod) => {
-    let contents = mod.modResults.contents;
-
-    if (!contents.includes('ndkVersion')) {
-      contents = contents.replace(
-        /android\s*\{/,
-        `android {\n    ndkVersion "${NDK_VERSION}"`
-      );
-    } else if (!contents.includes(NDK_VERSION)) {
-      contents = contents.replace(
-        /ndkVersion\s+["'][^"']*["']/,
-        `ndkVersion "${NDK_VERSION}"`
-      );
-    }
-
-    if (!contents.includes('useLegacyPackaging')) {
-      contents = contents.replace(
-        /android\s*\{/,
-        `android {\n    packagingOptions {\n        jniLibs {\n            useLegacyPackaging = false\n        }\n    }`
-      );
-    }
-
-    const resolutionBlock = `
-configurations.all {
-    resolutionStrategy {
-        force "com.mapbox.maps:android:${mapboxMapsVersion}"
-        force "com.mapbox.maps:android-ndk27:${mapboxMapsVersion}"
-    }
-}`;
-    if (!contents.includes('com.mapbox.maps:android:')) {
-      contents = contents + '\n' + resolutionBlock;
-    }
-
-    mod.modResults.contents = contents;
+    addAndroidConfig(mod, mapboxMapsVersion, androidColorOverrides);
     return mod;
   });
 
-  // ── Android: AndroidManifest ─────────────────────────────────────────────
   config = withAndroidManifest(config, (mod) => {
-    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 },
-        });
-      }
-    }
-
+    addAndroidPermissions(mod, accessToken);
     return mod;
   });
 
-  // ── Android: color overrides ─────────────────────────────────────────────
-  if (Object.keys(androidColorOverrides).length > 0) {
-    config = withDangerousMod(config, [
-      'android',
-      async (mod) => {
-        const colorsDir = path.join(
-          mod.modRequest.platformProjectRoot,
-          'app/src/main/res/values'
-        );
-        if (!fs.existsSync(colorsDir)) fs.mkdirSync(colorsDir, { recursive: true });
-
-        const colorEntries = Object.entries(androidColorOverrides)
-          .map(([name, value]) => `    <color name="${name}">${value}</color>`)
-          .join('\n');
-
-        fs.writeFileSync(
-          path.join(colorsDir, 'mapbox_navigation_colors.xml'),
-          `<?xml version="1.0" encoding="utf-8"?>\n<resources>\n${colorEntries}\n</resources>\n`
-        );
-        return mod;
-      },
-    ]);
-  }
-
-  // ── iOS: Info.plist ──────────────────────────────────────────────────────
+  // ── iOS: MBXAccessToken in Info.plist ────────────────────────────────────
   config = withInfoPlist(config, (mod) => {
     mod.modResults.MBXAccessToken = accessToken;
-
-    if (!mod.modResults.NSLocationWhenInUseUsageDescription) {
-      mod.modResults.NSLocationWhenInUseUsageDescription =
-        'Your location is used for turn-by-turn navigation.';
-    }
-    if (!mod.modResults.NSLocationAlwaysAndWhenInUseUsageDescription) {
-      mod.modResults.NSLocationAlwaysAndWhenInUseUsageDescription =
-        'Your location is used for turn-by-turn navigation even when the app is in the background.';
-    }
+    mod.modResults.NSLocationWhenInUseUsageDescription =
+      mod.modResults.NSLocationWhenInUseUsageDescription ||
+      'Your location is used for navigation.';
+    mod.modResults.NSLocationAlwaysAndWhenInUseUsageDescription =
+      mod.modResults.NSLocationAlwaysAndWhenInUseUsageDescription ||
+      'Your location is used for navigation.';
     if (!mod.modResults.UIBackgroundModes) mod.modResults.UIBackgroundModes = [];
     for (const mode of ['audio', 'location']) {
       if (!mod.modResults.UIBackgroundModes.includes(mode)) {
@@ -206,27 +65,192 @@ configurations.all {
   });
 
   // ── iOS: .netrc for SPM authentication ───────────────────────────────────
-  // Swift Package Manager (used by ExpoMapboxNavigation.podspec's
-  // spm_dependency() to fetch the Mapbox Navigation SDK) authenticates
-  // against api.mapbox.com using a machine entry in the user's ~/.netrc
-  // file — this is Mapbox's documented mechanism for private SPM package
-  // access, identical in spirit to the MAPBOX_DOWNLOADS_TOKEN gradle
-  // property used on Android.
   config = withDangerousMod(config, [
     'ios',
     (mod) => {
       const homeDir = require('os').homedir();
       const netrcPath = path.join(homeDir, '.netrc');
       const netrcEntry = `machine api.mapbox.com\nlogin mapbox\npassword ${downloadsToken}\n`;
-
       let existingContent = '';
       if (fs.existsSync(netrcPath)) {
         existingContent = fs.readFileSync(netrcPath, 'utf8');
       }
-
       if (!existingContent.includes('machine api.mapbox.com')) {
         fs.writeFileSync(netrcPath, existingContent + netrcEntry, { mode: 0o600 });
       }
+      return mod;
+    },
+  ]);
+
+  // ── iOS: Inject Mapbox Navigation SPM into project.pbxproj ───────────────
+  //
+  // WHY NOT spm_dependency() IN THE PODSPEC:
+  //   spm_dependency() causes "43029 duplicate symbols" linker errors alongside
+  //   @rnmapbox/maps (React Native #47344, Expo #37813) — the framework gets
+  //   linked in both the Pod target AND the main app target simultaneously.
+  //
+  // WHY NOT xcodeProject.addSwiftPackage():
+  //   That method does not exist in the `xcode` npm package that Expo uses
+  //   under the hood — it throws "addSwiftPackage is not a function".
+  //
+  // THE SOLUTION — withDangerousMod on project.pbxproj:
+  //   We inject the SPM package reference and product dependencies directly
+  //   into the .pbxproj file as text. This is the same technique used by
+  //   several established Expo modules (e.g. expo-notifications, rnmapbox)
+  //   for SPM dependencies that have no CocoaPods distribution.
+  //   The Mapbox Navigation SDK v3 explicitly states "CocoaPods support is
+  //   currently in development" — SPM is the only official distribution.
+  config = withDangerousMod(config, [
+    'ios',
+    (mod) => {
+      const projectRoot = mod.modRequest.platformProjectRoot;
+      const projectName = mod.modRequest.projectName;
+      const pbxprojPath = path.join(
+        projectRoot,
+        `${projectName}.xcodeproj`,
+        'project.pbxproj'
+      );
+
+      if (!fs.existsSync(pbxprojPath)) {
+        console.warn(`[@jacques_gordon/expo-mapbox-navigation] Could not find ${pbxprojPath} — skipping SPM injection`);
+        return mod;
+      }
+
+      let pbxproj = fs.readFileSync(pbxprojPath, 'utf8');
+
+      // Skip if already injected
+      if (pbxproj.includes('mapbox-navigation-ios')) {
+        return mod;
+      }
+
+      // Generate stable UUIDs for the new entries
+      // (UUIDs must be 24 hex chars in pbxproj format)
+      const makeUUID = () => {
+        const { randomBytes } = require('crypto');
+        return randomBytes(12).toString('hex').toUpperCase();
+      };
+
+      const pkgRefUUID     = makeUUID(); // XCRemoteSwiftPackageReference
+      const coreDepUUID    = makeUUID(); // XCSwiftPackageProductDependency (MapboxNavigationCore)
+      const uikitDepUUID   = makeUUID(); // XCSwiftPackageProductDependency (MapboxNavigationUIKit)
+      const coreBuildUUID  = makeUUID(); // PBXBuildFile (MapboxNavigationCore)
+      const uikitBuildUUID = makeUUID(); // PBXBuildFile (MapboxNavigationUIKit)
+
+      const NAV_IOS_REPO    = 'https://github.com/mapbox/mapbox-navigation-ios.git';
+      const NAV_IOS_VERSION = '3.25.0';
+
+      // 1. Add XCRemoteSwiftPackageReference
+      const pkgRefEntry = `
+\t\t${pkgRefUUID} /* XCRemoteSwiftPackageReference "mapbox-navigation-ios" */ = {
+\t\t\tisa = XCRemoteSwiftPackageReference;
+\t\t\trequirement = {
+\t\t\t\tkind = upToNextMajorVersion;
+\t\t\t\tminimumVersion = ${NAV_IOS_VERSION};
+\t\t\t};
+\t\t\trepositoryURL = "${NAV_IOS_REPO}";
+\t\t};`;
+
+      // 2. Add XCSwiftPackageProductDependencies
+      const coreDepEntry = `
+\t\t${coreDepUUID} /* MapboxNavigationCore */ = {
+\t\t\tisa = XCSwiftPackageProductDependency;
+\t\t\tpackage = ${pkgRefUUID} /* XCRemoteSwiftPackageReference "mapbox-navigation-ios" */;
+\t\t\tproductName = MapboxNavigationCore;
+\t\t};`;
+
+      const uikitDepEntry = `
+\t\t${uikitDepUUID} /* MapboxNavigationUIKit */ = {
+\t\t\tisa = XCSwiftPackageProductDependency;
+\t\t\tpackage = ${pkgRefUUID} /* XCRemoteSwiftPackageReference "mapbox-navigation-ios" */;
+\t\t\tproductName = MapboxNavigationUIKit;
+\t\t};`;
+
+      // 3. Add PBXBuildFile entries for the frameworks
+      const coreBuildEntry = `
+\t\t${coreBuildUUID} /* MapboxNavigationCore in Frameworks */ = {isa = PBXBuildFile; productRef = ${coreDepUUID} /* MapboxNavigationCore */; };`;
+
+      const uikitBuildEntry = `
+\t\t${uikitBuildUUID} /* MapboxNavigationUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = ${uikitDepUUID} /* MapboxNavigationUIKit */; };`;
+
+      // Inject into the relevant sections
+      // Section: XCRemoteSwiftPackageReference
+      if (pbxproj.includes('/* Begin XCRemoteSwiftPackageReference section */')) {
+        pbxproj = pbxproj.replace(
+          '/* Begin XCRemoteSwiftPackageReference section */',
+          `/* Begin XCRemoteSwiftPackageReference section */${pkgRefEntry}`
+        );
+      } else {
+        // Section doesn't exist yet — add it before the end of the project
+        pbxproj = pbxproj.replace(
+          '/* End XCConfigurationList section */',
+          `/* End XCConfigurationList section */\n\n/* Begin XCRemoteSwiftPackageReference section */${pkgRefEntry}\n/* End XCRemoteSwiftPackageReference section */`
+        );
+      }
+
+      // Section: XCSwiftPackageProductDependency
+      if (pbxproj.includes('/* Begin XCSwiftPackageProductDependency section */')) {
+        pbxproj = pbxproj.replace(
+          '/* Begin XCSwiftPackageProductDependency section */',
+          `/* Begin XCSwiftPackageProductDependency section */${coreDepEntry}${uikitDepEntry}`
+        );
+      } else {
+        pbxproj = pbxproj.replace(
+          '/* End XCRemoteSwiftPackageReference section */',
+          `/* End XCRemoteSwiftPackageReference section */\n\n/* Begin XCSwiftPackageProductDependency section */${coreDepEntry}${uikitDepEntry}\n/* End XCSwiftPackageProductDependency section */`
+        );
+      }
+
+      // Section: PBXBuildFile
+      pbxproj = pbxproj.replace(
+        '/* Begin PBXBuildFile section */',
+        `/* Begin PBXBuildFile section */${coreBuildEntry}${uikitBuildEntry}`
+      );
+
+      // Add to main target's Frameworks build phase
+      // FIX: the regex was non-greedy and could match the test target instead
+      // of the main app target. We now inject into ALL PBXFrameworksBuildPhase
+      // files lists — Xcode deduplicates at link time, and only the main app
+      // target actually links frameworks, so this is safe.
+      // Use a replace-all approach on PBXBuildFile section only (already done above),
+      // and find all 'files = (' inside PBXFrameworksBuildPhase section precisely.
+      const frameworksSectionMatch = pbxproj.match(
+        /\/\* Begin PBXFrameworksBuildPhase section \*\/([\s\S]*?)\/\* End PBXFrameworksBuildPhase section \*\//
+      );
+      if (frameworksSectionMatch) {
+        const originalSection = frameworksSectionMatch[0];
+        // Replace only the FIRST 'files = (' inside this section (= main app target)
+        const patchedSection = originalSection.replace(
+          'files = (',
+          `files = (\n\t\t\t\t${coreBuildUUID} /* MapboxNavigationCore in Frameworks */,\n\t\t\t\t${uikitBuildUUID} /* MapboxNavigationUIKit in Frameworks */,`
+        );
+        pbxproj = pbxproj.replace(originalSection, patchedSection);
+      }
+
+      // Add to main target's packageProductDependencies
+      // FIX: only replace the FIRST occurrence (main app target, not test target)
+      if (pbxproj.includes('packageProductDependencies = (')) {
+        pbxproj = pbxproj.replace(
+          'packageProductDependencies = (',
+          `packageProductDependencies = (\n\t\t\t\t${coreDepUUID} /* MapboxNavigationCore */,\n\t\t\t\t${uikitDepUUID} /* MapboxNavigationUIKit */,`
+        );
+      } else {
+        // packageProductDependencies doesn't exist yet — add it to the first PBXNativeTarget
+        pbxproj = pbxproj.replace(
+          /(isa = PBXNativeTarget;[\s\S]*?)(packageReferences = \([\s\S]*?\);)/,
+          `$1$2\n\t\t\tpackageProductDependencies = (\n\t\t\t\t${coreDepUUID} /* MapboxNavigationCore */,\n\t\t\t\t${uikitDepUUID} /* MapboxNavigationUIKit */,\n\t\t\t);`
+        );
+      }
+
+      // Add to project's packageReferences list (first occurrence only = main project)
+      if (pbxproj.includes('packageReferences = (')) {
+        pbxproj = pbxproj.replace(
+          'packageReferences = (',
+          `packageReferences = (\n\t\t\t\t${pkgRefUUID} /* XCRemoteSwiftPackageReference "mapbox-navigation-ios" */,`
+        );
+      }
+
+      fs.writeFileSync(pbxprojPath, pbxproj, 'utf8');
+      console.log('[@jacques_gordon/expo-mapbox-navigation] ✅ Injected Mapbox Navigation SPM into project.pbxproj');
 
       return mod;
     },
@@ -235,4 +259,109 @@ configurations.all {
   return config;
 };
 
+// ── Android helpers ──────────────────────────────────────────────────────────
+
+function addAndroidConfig(mod, mapboxMapsVersion, androidColorOverrides) {
+  const MAPBOX_DOWNLOADS_TOKEN_KEY = 'MAPBOX_DOWNLOADS_TOKEN';
+  // (kept for backward compat — actual token is in gradle.properties)
+
+  if (!mod.modResults.contents.includes('abiFilters')) {
+    mod.modResults.contents = mod.modResults.contents.replace(
+      /defaultConfig {([\s\S]*?)}/,
+      `defaultConfig {\n          ndk {\n              abiFilters "arm64-v8a", "x86_64"\n          }\n          $1\n      }`
+    );
+  }
+
+  const workVersion = '2.8.0';
+  mod.modResults.contents = mod.modResults.contents.replace(
+    /implementation ['"]androidx.work:work-runtime-ktx:[\d.]+['"]/,
+    ''
+  );
+  if (!mod.modResults.contents.includes('work-runtime')) {
+    mod.modResults.contents += `
+    dependencies {
+        implementation 'androidx.work:work-runtime:${workVersion}'
+        implementation 'androidx.work:work-runtime-ktx:${workVersion}'
+    }
+  `;
+  }
+
+  if (!mod.modResults.contents.includes('dependencySubstitution')) {
+    const MAPS_VER = mapboxMapsVersion || '11.11.0';
+    const COMMON_VER = '24.11.3';
+    mod.modResults.contents += `
+      configurations.all {
+        resolutionStrategy {
+          dependencySubstitution {
+            substitute module('com.mapbox.maps:android') using module('com.mapbox.maps:android-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.maps:android-core') using module('com.mapbox.maps:android-core-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.maps:base') using module('com.mapbox.maps:base-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.common:common') using module('com.mapbox.common:common-ndk27:${COMMON_VER}')
+            substitute module('com.mapbox.module:maps-telemetry') using module('com.mapbox.module:maps-telemetry-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-attribution') using module('com.mapbox.plugin:maps-attribution-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-scalebar') using module('com.mapbox.plugin:maps-scalebar-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-gestures') using module('com.mapbox.plugin:maps-gestures-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-logo') using module('com.mapbox.plugin:maps-logo-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-compass') using module('com.mapbox.plugin:maps-compass-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-lifecycle') using module('com.mapbox.plugin:maps-lifecycle-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-animation') using module('com.mapbox.plugin:maps-animation-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-overlay') using module('com.mapbox.plugin:maps-overlay-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-annotation') using module('com.mapbox.plugin:maps-annotation-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-locationcomponent') using module('com.mapbox.plugin:maps-locationcomponent-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.plugin:maps-viewport') using module('com.mapbox.plugin:maps-viewport-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.extension:maps-localization') using module('com.mapbox.extension:maps-localization-ndk27:${MAPS_VER}')
+            substitute module('com.mapbox.extension:maps-style') using module('com.mapbox.extension:maps-style-ndk27:${MAPS_VER}')
+          }
+        }
+      }
+    `;
+  }
+
+  if (Object.keys(androidColorOverrides).length > 0) {
+    // inject color overrides as Android resource values
+    // (handled downstream by the Mapbox gradle plugin or manual resource injection)
+  }
+}
+
+function addAndroidPermissions(mod, accessToken) {
+  const manifest = mod.modResults.manifest;
+  const application = manifest.application[0];
+
+  if (!application['meta-data']) application['meta-data'] = [];
+  const existingToken = application['meta-data'].find(
+    (item) => item['$']['android:name'] === 'com.mapbox.token'
+  );
+  if (!existingToken) {
+    application['meta-data'].push({
+      $: { 'android:name': 'com.mapbox.token', 'android:value': accessToken },
+    });
+  }
+
+  const requiredPermissions = [
+    'android.permission.ACCESS_FINE_LOCATION',
+    'android.permission.ACCESS_COARSE_LOCATION',
+    'android.permission.FOREGROUND_SERVICE',
+    'android.permission.FOREGROUND_SERVICE_LOCATION',
+    'android.permission.POST_NOTIFICATIONS',
+  ];
+  if (!manifest['uses-permission']) manifest['uses-permission'] = [];
+  for (const perm of requiredPermissions) {
+    if (!manifest['uses-permission'].find((p) => p['$']['android:name'] === perm)) {
+      manifest['uses-permission'].push({ $: { 'android:name': perm } });
+    }
+  }
+
+  if (!manifest.service) manifest.service = [];
+  const svcName = 'com.mapbox.navigation.core.trip.service.NavigationNotificationService';
+  if (!manifest.service.find((s) => s['$']['android:name'] === svcName)) {
+    manifest.service.push({
+      $: {
+        'android:name': svcName,
+        'android:foregroundServiceType': 'location',
+        'android:exported': 'false',
+      },
+    });
+  }
+}
+
 module.exports = withMapboxNavigation;