chore: handle merge conflicts

Author: JoachimAmoah

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.11.0"
+  ".": "0.12.0"
 }

CARPLAY.md

@@ -12,8 +12,10 @@ This guide explains how to enable and integrate Apple CarPlay with the React Nat
 
 Refer to the [Apple CarPlay Developer Guide](https://developer.apple.com/carplay/) to understand how CarPlay works and to complete the initial setup. Key steps include:
 
-- Adding the CarPlay entitlement to your Xcode project.
-- Creating a separate scene for the CarPlay map and enabling support for multiple scenes.
+- Adding the CarPlay entitlement to your Xcode project
+- Creating a separate scene for the CarPlay map and enabling support for multiple scenes
+
+For a complete implementation example, refer to [AppDelegateCarPlay.m](example/ios/SampleApp/AppDelegateCarPlay.m), [PhoneSceneDelegate.m](example/ios/SampleApp/PhoneSceneDelegate.m) and [CarSceneDelegate.m](example/ios/SampleApp/CarSceneDelegate.m). Pay special attention to how the React Native window is initialized in `PhoneSceneDelegate` when using multiple scenes.
 
 ### SceneDelegate for CarPlay
 
@@ -83,4 +85,10 @@ For a more detailed example, refer to the `NavigationScreen.tsx` in the React Na
 
 ## Example Project
 
-For a fully functional CarPlay implementation, check out the [SampleApp](./example/ios/) Xcode project, which includes the `SampleAppCarPlay` build target. The sample already contains test entitlement so you don't need to request one from Apple to run it.
+For a fully functional CarPlay implementation, check out the [SampleApp](./example/ios/) Xcode project, which includes the `SampleAppCarPlay` build target. The sample already contains test entitlement so you don't need to request one from Apple to run it. 
+
+Start the CarPlay example from the command line:
+
+```bash
+yarn example ios:carplay
+```

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [0.12.0](https://github.com/googlemaps/react-native-navigation-sdk/compare/v0.11.0...v0.12.0) (2025-12-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* iOS header_dir changed to ReactNativeGoogleMapsNavigation for direct imports.
+* `no_destinations` error string on iOS is changed to `NO_DESTINATIONS`, matching other error code formats and Android implementation
+
+### Features
+
+* support for setting map color schema ([#500](https://github.com/googlemaps/react-native-navigation-sdk/issues/500)) ([6e0cd58](https://github.com/googlemaps/react-native-navigation-sdk/commit/6e0cd587a1a7ce5cefa1e6a592fd74e16a3983d7))
+* support mapId ([#495](https://github.com/googlemaps/react-native-navigation-sdk/issues/495)) ([d639fe4](https://github.com/googlemaps/react-native-navigation-sdk/commit/d639fe4e5f5a9d4a70908a542cb9d0887a41f280))
+* upgrade Android SDK to version 7.2.0 ([#506](https://github.com/googlemaps/react-native-navigation-sdk/issues/506)) ([3032359](https://github.com/googlemaps/react-native-navigation-sdk/commit/3032359e9085a0adbf2a62de52a4c1cf3f3c431d))
+* upgrade iOS SDK to version 10.6.0 ([#507](https://github.com/googlemaps/react-native-navigation-sdk/issues/507)) ([1f17d25](https://github.com/googlemaps/react-native-navigation-sdk/commit/1f17d25f7c16b1c696b1ed4923da6aa656e97dd1))
+
+
+### Bug Fixes
+
+* android view invalidation mechanism ([#505](https://github.com/googlemaps/react-native-navigation-sdk/issues/505)) ([4f770c9](https://github.com/googlemaps/react-native-navigation-sdk/commit/4f770c9c32d61eff19e8b490be172db90d170b7e))
+* iOS navigation session attachment and detachment ([#497](https://github.com/googlemaps/react-native-navigation-sdk/issues/497)) ([cc0aae1](https://github.com/googlemaps/react-native-navigation-sdk/commit/cc0aae12c6294e667b5f561f4f81342ee90143fa))
+* navigation session error handling ([#502](https://github.com/googlemaps/react-native-navigation-sdk/issues/502)) ([a8ddabb](https://github.com/googlemaps/react-native-navigation-sdk/commit/a8ddabbf082c30a00350ace2dda3371d34cf15c7))
+* re-expose public iOS header files ([#509](https://github.com/googlemaps/react-native-navigation-sdk/issues/509)) ([00c4635](https://github.com/googlemaps/react-native-navigation-sdk/commit/00c4635436aed7b1c425077074ea4bb649379c9a))
+* resolve map view initialization timing issue ([#504](https://github.com/googlemaps/react-native-navigation-sdk/issues/504)) ([3c46f4d](https://github.com/googlemaps/react-native-navigation-sdk/commit/3c46f4d2d16553b4529a3fa6efba1fb929cc8ca0))
+
+
+### Miscellaneous Chores
+
+* breaking change on re-expose public iOS header files ([#511](https://github.com/googlemaps/react-native-navigation-sdk/issues/511)) ([e04d42a](https://github.com/googlemaps/react-native-navigation-sdk/commit/e04d42aa2172ca851fba0e7a642c5c4cf2b612d6))
+
 ## [0.11.0](https://github.com/googlemaps/react-native-navigation-sdk/compare/v0.10.3...v0.11.0) (2025-10-13)
 
 

README.md

@@ -287,6 +287,7 @@ in an unbounded widget will cause the application to behave unexpectedly.
 // Permissions must have been granted by this point.
 
 <NavigationView
+    mapId="your-map-id-here" // Optional: Your map ID configured in Google Cloud Console
     androidStylingOptions={{
         primaryDayModeThemeColor: '#34eba8',
         headerDistanceValueTextColor: '#76b5c5',
@@ -310,11 +311,21 @@ You can also add a bare `MapView` that works as a normal map view without naviga
 
 ```tsx
 <MapView
+    mapId="your-map-id-here" // Optional: Your map ID configured in Google Cloud Console
     mapViewCallbacks={mapViewCallbacks}
     onMapViewControllerCreated={setMapViewController}
 />
 ```
 
+### Control light and dark modes
+
+Use the `mapColorScheme` prop on both `NavigationView` and `MapView` to force the map tiles into light, dark, or system-following mode.
+
+For the navigation UI, pass the `navigationNightMode` prop to `NavigationView` to configure the initial lighting mode for navigation session.
+
+> [!NOTE]
+> When navigation UI is enabled, `mapColorScheme` does not affect the view styling. To control the style of the navigation UI, use the `navigationNightMode` prop on `NavigationView` instead.
+
 ### Requesting and handling permissions
 
 The Google Navigation SDK React Native library offers functionalities that necessitate specific permissions from the mobile operating system. These include, but are not limited to, location services, background execution, and receiving background location updates.

android/build.gradle

@@ -82,6 +82,6 @@ dependencies {
   implementation "androidx.car.app:app:1.4.0"
   implementation "androidx.car.app:app-projected:1.4.0"
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-  implementation "com.google.android.libraries.navigation:navigation:7.0.0"
+  implementation "com.google.android.libraries.navigation:navigation:7.1.0"
   api 'com.google.guava:guava:31.0.1-android'
 }

android/src/main/java/com/google/android/react/navsdk/CustomTypes.java

@@ -14,7 +14,7 @@
 package com.google.android.react.navsdk;
 
 public class CustomTypes {
-  public enum FragmentType {
+  public enum MapViewType {
     MAP,
     NAVIGATION
   }

android/src/main/java/com/google/android/react/navsdk/EnumTranslationUtil.java

@@ -15,6 +15,7 @@
 
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.CameraPerspective;
+import com.google.android.gms.maps.model.MapColorScheme;
 import com.google.android.libraries.navigation.AlternateRoutesStrategy;
 import com.google.android.libraries.navigation.ForceNightMode;
 import com.google.android.libraries.navigation.Navigator;
@@ -89,11 +90,22 @@ public static int getMapTypeFromJsValue(int jsValue) {
     }
   }
 
-  public static CustomTypes.FragmentType getFragmentTypeFromJsValue(int jsValue) {
+  public static CustomTypes.MapViewType getMapViewTypeFromJsValue(int jsValue) {
     return switch (jsValue) {
-      case 0 -> CustomTypes.FragmentType.MAP;
-      case 1 -> CustomTypes.FragmentType.NAVIGATION;
-      default -> throw new IllegalStateException("Unexpected FragmentType value: " + jsValue);
+      case 0 -> CustomTypes.MapViewType.MAP;
+      case 1 -> CustomTypes.MapViewType.NAVIGATION;
+      default -> throw new IllegalStateException("Unexpected MapViewType value: " + jsValue);
     };
   }
+
+  public static @MapColorScheme int getMapColorSchemeFromJsValue(int jsValue) {
+    switch (jsValue) {
+      case 1:
+        return MapColorScheme.LIGHT;
+      case 2:
+        return MapColorScheme.DARK;
+      default:
+        return MapColorScheme.FOLLOW_SYSTEM;
+    }
+  }
 }

android/src/main/java/com/google/android/react/navsdk/IMapViewFragment.java

@@ -15,19 +15,17 @@
 
 import android.view.View;
 import com.google.android.gms.maps.GoogleMap;
-import com.google.android.libraries.navigation.StylingOptions;
+import com.google.android.gms.maps.model.MapColorScheme;
 
 public interface IMapViewFragment {
   MapViewController getMapController();
 
-  void setStylingOptions(StylingOptions stylingOptions);
-
-  void applyStylingOptions();
-
   void setMapStyle(String url);
 
   GoogleMap getGoogleMap();
 
+  void setMapColorScheme(@MapColorScheme int colorScheme);
+
   // Fragment
   boolean isAdded();
 

android/src/main/java/com/google/android/react/navsdk/INavViewFragment.java

@@ -13,6 +13,9 @@
  */
 package com.google.android.react.navsdk;
 
+import com.google.android.libraries.navigation.ForceNightMode;
+import com.google.android.libraries.navigation.StylingOptions;
+
 public interface INavViewFragment extends IMapViewFragment {
   void setNavigationUiEnabled(boolean enableNavigationUi);
 
@@ -32,7 +35,11 @@ public interface INavViewFragment extends IMapViewFragment {
 
   void showRouteOverview();
 
-  void setNightModeOption(int jsValue);
+  void setNightModeOption(@ForceNightMode int nightModeOverride);
 
   void setReportIncidentButtonEnabled(boolean enabled);
+
+  void setStylingOptions(StylingOptions stylingOptions);
+
+  void applyStylingOptions();
 }

android/src/main/java/com/google/android/react/navsdk/JsErrors.java

@@ -21,4 +21,7 @@ public class JsErrors {
   public static final String NO_MAP_ERROR_CODE = "NO_MAP_ERROR_CODE";
   public static final String NO_MAP_ERROR_MESSAGE =
       "Make sure to initialize the map view has been initialized before executing.";
+
+  public static final String NO_DESTINATIONS_ERROR_CODE = "NO_DESTINATIONS";
+  public static final String NO_DESTINATIONS_ERROR_MESSAGE = "Destinations not set";
 }