feat: update Android and iOS SDKs

jokerttu · jokerttu · commit 6da0bbe43541 · 2025-08-08T16:41:42.000+03:00
- add support for prompt visibility change events
- add support for controlling report incident button visibility
diff --git a/CARPLAY.md b/CARPLAY.md
@@ -4,7 +4,7 @@ This guide explains how to enable and integrate Apple CarPlay with the React Nat
 
 ## Requirements
 
-- iOS device or iOS simulator (iOS 15.0+)
+- iOS device or iOS simulator (iOS 16.0+)
 - CarPlay Simulator
 - CarPlay entitlement for your application (provided by Apple)
 
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This repository contains a React Native plugin that provides a [Google Navigatio
 
 |                                 | Android | iOS       |
 | ------------------------------- | ------- | --------- |
-| **Minimum mobile OS supported** | SDK 23+ | iOS 15.0+ |
+| **Minimum mobile OS supported** | SDK 23+ | iOS 16.0+ |
 
 * A React Native project
 * A Google Cloud project
diff --git a/android/build.gradle b/android/build.gradle
@@ -15,7 +15,7 @@
 import groovy.json.JsonSlurper
 
 buildscript {
-    ext.kotlin_version = '2.0.0'
+    ext.kotlin_version = '2.1.21'
     repositories {
         google()
         mavenCentral()
@@ -39,7 +39,7 @@ if (isNewArchitectureEnabled()) {
 
 android {
     namespace "com.google.android.react.navsdk"
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -76,6 +76,6 @@ dependencies {
     implementation "androidx.car.app:app-projected:1.4.0"
     implementation 'com.facebook.react:react-native:+'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "com.google.android.libraries.navigation:navigation:6.1.0"
+    implementation "com.google.android.libraries.navigation:navigation:6.3.1"
     api 'com.google.guava:guava:31.0.1-android'
 }
diff --git a/android/src/main/java/com/google/android/react/navsdk/Command.java b/android/src/main/java/com/google/android/react/navsdk/Command.java
@@ -55,7 +55,8 @@ public enum Command {
   REMOVE_GROUND_OVERLAY(36, "removeGroundOverlay"),
   SET_ZOOM_CONTROLS_ENABLED(37, "setZoomControlsEnabled"),
   SET_RECENTER_BUTTON_ENABLED(38, "setRecenterButtonEnabled"),
-  SET_PADDING(39, "setPadding");
+  SET_PADDING(39, "setPadding"),
+  SET_REPORT_INCIDENT_BUTTON_ENABLED(40, "setReportIncidentButtonEnabled");
 
   private final int value;
   private final String name;
diff --git a/android/src/main/java/com/google/android/react/navsdk/INavViewFragment.java b/android/src/main/java/com/google/android/react/navsdk/INavViewFragment.java
@@ -33,4 +33,6 @@ public interface INavViewFragment extends IMapViewFragment {
   void showRouteOverview();
 
   void setNightModeOption(int jsValue);
+
+  void setReportIncidentButtonEnabled(boolean enabled);
 }
diff --git a/android/src/main/java/com/google/android/react/navsdk/INavigationViewCallback.java b/android/src/main/java/com/google/android/react/navsdk/INavigationViewCallback.java
@@ -23,8 +23,6 @@
 public interface INavigationViewCallback {
   void onMapReady();
 
-  void onRecenterButtonClick();
-
   void onMarkerClick(Marker marker);
 
   void onPolylineClick(Polyline polyline);
diff --git a/android/src/main/java/com/google/android/react/navsdk/MapViewFragment.java b/android/src/main/java/com/google/android/react/navsdk/MapViewFragment.java
@@ -91,11 +91,6 @@ public void onMapReady() {
     emitEvent("onMapReady", null);
   }
 
-  @Override
-  public void onRecenterButtonClick() {
-    emitEvent("onRecenterButtonClick", null);
-  }
-
   @Override
   public void onMarkerClick(Marker marker) {
     emitEvent("onMarkerClick", ObjectTranslationUtil.getMapFromMarker(marker));
diff --git a/android/src/main/java/com/google/android/react/navsdk/NavViewFragment.java b/android/src/main/java/com/google/android/react/navsdk/NavViewFragment.java
@@ -33,6 +33,7 @@
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.libraries.navigation.NavigationView;
+import com.google.android.libraries.navigation.PromptVisibilityChangedListener;
 import com.google.android.libraries.navigation.StylingOptions;
 import com.google.android.libraries.navigation.SupportNavigationFragment;
 
@@ -55,14 +56,24 @@ public NavViewFragment(ReactApplicationContext reactContext, int viewTag) {
     this.viewTag = viewTag;
   }
 
-  private NavigationView.OnRecenterButtonClickedListener onRecenterButtonClickedListener =
+  private final NavigationView.OnRecenterButtonClickedListener onRecenterButtonClickedListener =
       new NavigationView.OnRecenterButtonClickedListener() {
         @Override
         public void onRecenterButtonClick() {
           emitEvent("onRecenterButtonClick", null);
         }
       };
 
+  private final PromptVisibilityChangedListener onPromptVisibilityChangedListener =
+      new PromptVisibilityChangedListener() {
+        @Override
+        public void onVisibilityChanged(boolean isVisible) {
+          WritableMap map = Arguments.createMap();
+          map.putBoolean("visible", isVisible);
+          emitEvent("onPromptVisibilityChanged", map);
+        }
+      };
+
   private String style = "";
 
   @SuppressLint("MissingPermission")
@@ -87,6 +98,7 @@ public void onMapReady(GoogleMap googleMap) {
 
             setNavigationUiEnabled(NavModule.getInstance().getNavigator() != null);
             addOnRecenterButtonClickedListener(onRecenterButtonClickedListener);
+            addPromptVisibilityChangedListener(onPromptVisibilityChangedListener);
           }
         });
   }
@@ -118,11 +130,6 @@ public void onMapReady() {
     emitEvent("onMapReady", null);
   }
 
-  @Override
-  public void onRecenterButtonClick() {
-    emitEvent("onRecenterButtonClick", null);
-  }
-
   @Override
   public void onMarkerClick(Marker marker) {
     emitEvent("onMarkerClick", ObjectTranslationUtil.getMapFromMarker(marker));
@@ -176,6 +183,7 @@ public GoogleMap getGoogleMap() {
 
   private void cleanup() {
     removeOnRecenterButtonClickedListener(onRecenterButtonClickedListener);
+    removePromptVisibilityChangedListener(onPromptVisibilityChangedListener);
   }
 
   private void emitEvent(String eventName, @Nullable WritableMap data) {
diff --git a/android/src/main/java/com/google/android/react/navsdk/NavViewManager.java b/android/src/main/java/com/google/android/react/navsdk/NavViewManager.java
@@ -303,6 +303,10 @@ public void receiveCommand(
         getFragmentForRoot(root)
             .getMapController()
             .setPadding(args.getInt(0), args.getInt(1), args.getInt(2), args.getInt(3));
+        break;
+      case SET_REPORT_INCIDENT_BUTTON_ENABLED:
+        getNavFragmentForRoot(root).setReportIncidentButtonEnabled(args.getBoolean(0));
+        break;
     }
   }
 
@@ -318,6 +322,9 @@ public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
                 .put(
                     "onRecenterButtonClick",
                     MapBuilder.of("registrationName", "onRecenterButtonClick"))
+                .put(
+                    "onPromptVisibilityChanged",
+                    MapBuilder.of("registrationName", "onPromptVisibilityChanged"))
                 .put("onMapReady", MapBuilder.of("registrationName", "onMapReady"))
                 .put("onMapClick", MapBuilder.of("registrationName", "onMapClick"))
                 .put("onMarkerClick", MapBuilder.of("registrationName", "onMarkerClick"))
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -78,10 +78,10 @@ def enableProguardInReleaseBuilds = true
 
 
 /**
- * Set this to true to enable desugaring if minSdkVersion is set to 34 or below.
- * Note that this currently affects Detox testing with release builds and therefore is not enabled by default.
+ * Desugaring is required to be set on from navigation-sdk version 6.3.0 onwards.
+ * Note that this enableDesugaring currently affects Detox testing with release builds.
  */
-def enableDesugaring = false
+def enableDesugaring = true
 
 /**
  * The preferred build flavor of JavaScriptCore (JSC)
@@ -155,7 +155,7 @@ dependencies {
     implementation "androidx.car.app:app-projected:1.4.0"
 
     // Include the Google Navigation SDK.
-    implementation 'com.google.android.libraries.navigation:navigation:6.1.0'
+    implementation 'com.google.android.libraries.navigation:navigation:6.3.1'
 
     // Desugar Java 8+ APIs
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -13,7 +13,7 @@ end
 node_require('react-native/scripts/react_native_pods.rb')
 node_require('react-native-permissions/scripts/setup.rb')
 
-platform :ios, "15.1"
+platform :ios, "16.0"
 prepare_react_native_project!
 
 setup_permissions([
diff --git a/example/ios/SampleApp/Keys.plist.sample b/example/ios/SampleApp/Keys.plist.sample
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>API_KEY</key>
-	<string>[Add your key]</string>
+	<string>[Add Google Maps API key here]</string>
 </dict>
 </plist>
diff --git a/example/src/controls/navigationControls.tsx b/example/src/controls/navigationControls.tsx
@@ -55,12 +55,14 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
   const nightModeOptions = ['Auto', 'Force Day', 'Force Night'];
   const audioGuidanceOptions = ['Silent', 'Alerts only', 'Alerts and guidance'];
   const [tripProgressBarEnabled, setTripProgressBarEnabled] = useState(false);
+  const [reportIncidentButtonEnabled, setReportIncidentButtonEnabled] =
+    useState(true);
   const [navigationUiEnabled, setNavigationUIEnabled] = useState(true);
   const [turnByTurnLoggingEnabled, setTurnByTurnLoggingEnabled] =
     useState(false);
   const [speedLimitIconEnabled, setSpeedLimitIconEnabled] = useState(false);
   const [speedometerEnabled, setSpeedometerEnabled] = useState(false);
-  const [trafficIncidentsCardEnabled, setTrafficIncidentsCardEnabled] =
+  const [trafficIncidentCardsEnabled, setTrafficIncidentCardsEnabled] =
     useState(false);
   const [recenterButtonEnabled, setRecenterButtonEnabled] = useState(true);
   const [
@@ -212,6 +214,12 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
     navigationViewController.setTripProgressBarEnabled(isOn);
   };
 
+  const toggleReportIncidentButtonEnabled = (isOn: boolean) => {
+    console.log('setReportIncidentButtonEnabled', isOn);
+    setReportIncidentButtonEnabled(isOn);
+    navigationViewController.setReportIncidentButtonEnabled(isOn);
+  };
+
   const toggleSpeedLimitIconEnabled = (isOn: boolean) => {
     console.log('setSpeedLimitIconEnabled', isOn);
     setSpeedLimitIconEnabled(isOn);
@@ -236,9 +244,9 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
     navigationController.setTurnByTurnLoggingEnabled(isOn);
   };
 
-  const toggleTrafficIncidentsCardEnabled = (isOn: boolean) => {
-    console.log('toggleTrafficIncidentsCardEnabled:', isOn);
-    setTrafficIncidentsCardEnabled(isOn);
+  const toggleTrafficIncidentCardsEnabled = (isOn: boolean) => {
+    console.log('toggleTrafficIncidentCardsEnabled:', isOn);
+    setTrafficIncidentCardsEnabled(isOn);
     navigationViewController.setTrafficIncidentCardsEnabled(isOn);
   };
 
@@ -354,7 +362,7 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
       />
       <Button title="Set target as Destination" onPress={initWaypoint} />
       <View style={styles.controlButtonGap} />
-      <Button title="Multiple Destination" onPress={initWaypoints} />
+      <Button title="Set multiple destinations" onPress={initWaypoints} />
       <Button title="Dispose navigation" onPress={disposeNavigation} />
       <Button
         title="Continue to next destination"
@@ -392,6 +400,15 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
           }}
         />
       </View>
+      <View style={styles.rowContainer}>
+        <Text>Report incident button</Text>
+        <Switch
+          value={reportIncidentButtonEnabled}
+          onValueChange={() => {
+            toggleReportIncidentButtonEnabled(!reportIncidentButtonEnabled);
+          }}
+        />
+      </View>
       <View style={styles.rowContainer}>
         <Text>Speed limit icon</Text>
         <Switch
@@ -413,9 +430,9 @@ const NavigationControls: React.FC<NavigationControlsProps> = ({
       <View style={styles.rowContainer}>
         <Text>Traffic incidents card</Text>
         <Switch
-          value={trafficIncidentsCardEnabled}
+          value={trafficIncidentCardsEnabled}
           onValueChange={() => {
-            toggleTrafficIncidentsCardEnabled(!trafficIncidentsCardEnabled);
+            toggleTrafficIncidentCardsEnabled(!trafficIncidentCardsEnabled);
           }}
         />
       </View>
diff --git a/example/src/screens/NavigationScreen.tsx b/example/src/screens/NavigationScreen.tsx
@@ -176,6 +176,10 @@ const NavigationScreen = () => {
     console.log('called onRemainingTimeOrDistanceChanged');
   }, [navigationController]);
 
+  const onPromptVisibilityChanged = useCallback((visible: boolean) => {
+    console.log('Prompt visibility changed to:', visible);
+  }, []);
+
   const onRouteStatusResult = useCallback(
     (routeStatus: RouteStatus) => {
       switch (routeStatus) {
@@ -304,6 +308,7 @@ const NavigationScreen = () => {
 
   const navigationViewCallbacks: NavigationViewCallbacks = {
     onRecenterButtonClick,
+    onPromptVisibilityChanged,
   };
 
   const mapViewCallbacks: MapViewCallbacks = useMemo(() => {
diff --git a/ios/react-native-navigation-sdk/INavigationCallback.h b/ios/react-native-navigation-sdk/INavigationCallback.h
@@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)onRouteStatusResult:(GMSRouteStatus)routeStatus;
 - (void)onReroutingRequestedByOffRoute;
 - (void)onLocationChanged:(NSDictionary *)location;
+- (void)onPromptVisibilityChange:(BOOL)visible;
 @end
 
 #endif /* INavigationCallback_h */
diff --git a/ios/react-native-navigation-sdk/INavigationViewCallback.h b/ios/react-native-navigation-sdk/INavigationViewCallback.h
@@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)handlePolygonClick:(GMSPolygon *)polygon;
 - (void)handleCircleClick:(GMSCircle *)circle;
 - (void)handleGroundOverlayClick:(GMSGroundOverlay *)groundOverlay;
+- (void)handlePromptVisibilityChanged:(BOOL)isVisible;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/react-native-navigation-sdk/NavEventDispatcher.m b/ios/react-native-navigation-sdk/NavEventDispatcher.m
@@ -41,7 +41,6 @@ + (id)allocWithZone:(NSZone *)zone {
     @"onNavigationReady",
     @"onNavigationInitError",
     @"onStartGuidance",
-    @"onRecenterButtonClick",
     @"onRouteStatusResult",
     @"onReroutingRequestedByOffRoute",
     @"onLocationChanged",
diff --git a/ios/react-native-navigation-sdk/NavModule.m b/ios/react-native-navigation-sdk/NavModule.m
@@ -658,6 +658,14 @@ - (void)locationProvider:(GMSRoadSnappedLocationProvider *)locationProvider
   [self onLocationChanged:[ObjectTranslationUtil transformCLLocationToDictionary:location]];
 }
 
+- (void)navigatorWillPresentPrompt:(GMSNavigator *)navigator {
+  [self onPromptVisibilityChange:YES];
+}
+
+- (void)navigatorDidDismissPrompt:(GMSNavigator *)navigator {
+  [self onPromptVisibilityChange:NO];
+}
+
 // Listener to handle arrival events.
 - (void)navigator:(GMSNavigator *)navigator didArriveAtWaypoint:(GMSNavigationWaypoint *)waypoint {
   NSMutableDictionary *eventMap = [[NSMutableDictionary alloc] init];
@@ -701,6 +709,11 @@ - (void)onArrival:(NSDictionary *)eventMap {
   [self sendCommandToReactNative:@"onArrival" args:eventMap];
 }
 
+- (void)onPromptVisibilityChange:(BOOL)visible {
+  NavViewModule *navViewModule = [NavViewModule sharedInstance];
+  [navViewModule informPromptVisibilityChange:visible];
+}
+
 - (void)onNavigationReady {
   [self sendCommandToReactNative:@"onNavigationReady"];
 }
diff --git a/ios/react-native-navigation-sdk/NavView.h b/ios/react-native-navigation-sdk/NavView.h
@@ -33,6 +33,7 @@
 @property(nonatomic, copy) RCTDirectEventBlock onPolygonClick;
 @property(nonatomic, copy) RCTDirectEventBlock onCircleClick;
 @property(nonatomic, copy) RCTDirectEventBlock onGroundOverlayClick;
+@property(nonatomic, copy) RCTDirectEventBlock onPromptVisibilityChanged;
 
 - (NavViewController *)initializeViewControllerWithStylingOptions:(NSDictionary *)stylingOptions
                                                      fragmentType:(FragmentType)fragmentType;
diff --git a/ios/react-native-navigation-sdk/NavView.m b/ios/react-native-navigation-sdk/NavView.m
@@ -65,6 +65,14 @@ - (void)handleRecenterButtonClick {
   }
 }
 
+- (void)handlePromptVisibilityChanged:(BOOL)visible {
+  if (self.onPromptVisibilityChanged) {
+    self.onPromptVisibilityChanged(@{
+      @"visible" : @(visible),
+    });
+  }
+}
+
 - (void)handleMapReady {
   if (self.onMapReady) {
     self.onMapReady(nil);
diff --git a/ios/react-native-navigation-sdk/NavViewController.h b/ios/react-native-navigation-sdk/NavViewController.h
@@ -39,6 +39,7 @@ typedef void (^OnArrayResult)(NSArray *_Nullable result);
 - (void)isMyLocationEnabled:(OnBooleanResult)completionBlock;
 - (void)moveCamera:(NSDictionary *)cameraPositionMap;
 - (void)setTripProgressBarEnabled:(BOOL)isEnabled;
+- (void)setReportIncidentButtonEnabled:(BOOL)isEnabled;
 - (void)setNavigationUIEnabled:(BOOL)isEnabled;
 - (void)setFollowingPerspective:(NSNumber *)index;
 - (void)setNightMode:(NSNumber *)index;
@@ -82,6 +83,7 @@ typedef void (^OnArrayResult)(NSArray *_Nullable result);
 - (void)removeCircle:(NSString *)circleId;
 - (void)removeGroundOverlay:(NSString *)overlayId;
 - (BOOL)attachToNavigationSession:(GMSNavigationSession *)session;
+- (void)onPromptVisibilityChange:(BOOL)visible;
 - (void)setTravelMode:(GMSNavigationTravelMode)travelMode;
 - (void)setPadding:(UIEdgeInsets)insets;
 //- (void)removeNavigationListeners;
diff --git a/ios/react-native-navigation-sdk/NavViewController.m b/ios/react-native-navigation-sdk/NavViewController.m
diff --git a/ios/react-native-navigation-sdk/NavViewModule.h b/ios/react-native-navigation-sdk/NavViewModule.h
diff --git a/ios/react-native-navigation-sdk/NavViewModule.m b/ios/react-native-navigation-sdk/NavViewModule.m
diff --git a/ios/react-native-navigation-sdk/RCTNavViewManager.m b/ios/react-native-navigation-sdk/RCTNavViewManager.m
diff --git a/react-native-navigation-sdk.podspec b/react-native-navigation-sdk.podspec
diff --git a/src/navigation/navigationView/navigationView.tsx b/src/navigation/navigationView/navigationView.tsx
diff --git a/src/navigation/navigationView/navigationViewController.ts b/src/navigation/navigationView/navigationViewController.ts
diff --git a/src/navigation/navigationView/types.ts b/src/navigation/navigationView/types.ts
diff --git a/src/shared/viewManager.ts b/src/shared/viewManager.ts

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,6 @@ public interface INavViewFragment extends IMapViewFragment {`
`33`	`33`	`void showRouteOverview();`
`34`	`34`
`35`	`35`	`void setNightModeOption(int jsValue);`
	`36`	`+`
	`37`	`+ void setReportIncidentButtonEnabled(boolean enabled);`
`36`	`38`	`}`