feat!: upgrade android sdk to 7.8.0 and ios sdk to 10.15.0

android/build.gradle.kts

@@ -124,7 +124,7 @@ dependencies {
     implementation("androidx.car.app:app:1.7.0")
     implementation("androidx.car.app:app-projected:1.7.0")
     implementation("androidx.startup:startup-runtime:1.2.0")
-    implementation("com.google.android.libraries.navigation:navigation:7.7.0")
+    implementation("com.google.android.libraries.navigation:navigation:7.8.0")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("io.mockk:mockk:1.13.8")
     testImplementation("junit:junit:4.13.2")

android/src/main/kotlin/com/google/maps/flutter/navigation/Convert.kt

@@ -43,6 +43,7 @@ import com.google.android.libraries.mapsplatform.turnbyturn.model.NavInfo
 import com.google.android.libraries.mapsplatform.turnbyturn.model.NavState
 import com.google.android.libraries.mapsplatform.turnbyturn.model.StepInfo
 import com.google.android.libraries.navigation.AlternateRoutesStrategy
+import com.google.android.libraries.navigation.AudioGuidanceSettings
 import com.google.android.libraries.navigation.DisplayOptions
 import com.google.android.libraries.navigation.ForceNightMode
 import com.google.android.libraries.navigation.NavigationRoadStretchRenderingData
@@ -445,21 +446,21 @@ object Convert {
    * @param settings pigeon [NavigationAudioGuidanceSettingsDto].
    * @return Google Navigation [AudioGuidanceTypeDto] int.
    */
-  fun convertAudioGuidanceSettingsToDto(settings: NavigationAudioGuidanceSettingsDto): Int {
-    var base =
+  fun convertAudioGuidanceSettingsToDto(settings: NavigationAudioGuidanceSettingsDto): AudioGuidanceSettings {
+    val guidanceMode =
       when (settings.guidanceType) {
-        AudioGuidanceTypeDto.SILENT -> AudioGuidance.SILENT
-        AudioGuidanceTypeDto.ALERTS_ONLY -> AudioGuidance.VOICE_ALERTS_ONLY
-        AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE -> AudioGuidance.VOICE_ALERTS_AND_GUIDANCE
-        null -> AudioGuidance.SILENT
+        AudioGuidanceTypeDto.SILENT -> AudioGuidanceSettings.GuidanceMode.SILENT
+        AudioGuidanceTypeDto.ALERTS_ONLY -> AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_ONLY
+        AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE -> AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_AND_GUIDANCE
+        null -> AudioGuidanceSettings.GuidanceMode.SILENT
       }
-    if (settings.isBluetoothAudioEnabled == true) {
-      base = base or AudioGuidance.BLUETOOTH_AUDIO
-    }
-    if (settings.isVibrationEnabled == true) {
-      base = base or AudioGuidance.VIBRATION
-    }
-    return base
+
+    return AudioGuidanceSettings
+      .builder()
+      .setGuidanceMode(guidanceMode)
+      .setBluetoothAudioEnabled(settings.isBluetoothAudioEnabled == true)
+      .setVibrationEnabled(settings.isVibrationEnabled == true)
+      .build()
   }
 
   /**

android/src/main/kotlin/com/google/maps/flutter/navigation/GoogleMapsNavigationSessionManager.kt

@@ -26,6 +26,7 @@ import androidx.lifecycle.Observer
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.libraries.mapsplatform.turnbyturn.model.NavInfo
 import com.google.android.libraries.mapsplatform.turnbyturn.model.StepInfo
+import com.google.android.libraries.navigation.AudioGuidanceSettings
 import com.google.android.libraries.navigation.CustomRoutesOptions
 import com.google.android.libraries.navigation.DisplayOptions
 import com.google.android.libraries.navigation.GpsAvailabilityChangeEvent
@@ -515,8 +516,8 @@ constructor(
    * Wraps [Navigator.setAudioGuidance]. See
    * [Google Navigation SDK for Android](https://developers.google.com/maps/documentation/navigation/android-sdk/reference/com/google/android/libraries/navigation/Navigator#setAudioGuidance(int)).
    */
-  fun setAudioGuidance(audioGuidanceSettings: Int) {
-    getNavigator().setAudioGuidance(audioGuidanceSettings)
+  fun setAudioGuidance(audioGuidanceSettings: AudioGuidanceSettings) {
+    getNavigator().setAudioGuidanceSettings(audioGuidanceSettings)
   }
 
   fun setSpeedAlertOptions(options: SpeedAlertOptions) {

android/src/test/kotlin/com/google/maps/flutter/navigation/ConvertTest.kt

@@ -26,6 +26,7 @@ import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.Polygon
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.libraries.navigation.AlternateRoutesStrategy
+import com.google.android.libraries.navigation.AudioGuidanceSettings
 import com.google.android.libraries.navigation.NavigationRoadStretchRenderingData
 import com.google.android.libraries.navigation.NavigationTrafficData
 import com.google.android.libraries.navigation.Navigator.AudioGuidance
@@ -85,54 +86,74 @@ internal class ConvertTest {
   @Test
   fun convertAudioGuidanceSettings_returnsExpectedValue() {
     assertEquals(
-      AudioGuidance.VOICE_ALERTS_AND_GUIDANCE,
+      AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_AND_GUIDANCE,
       Convert.convertAudioGuidanceSettingsToDto(
         NavigationAudioGuidanceSettingsDto(
           isBluetoothAudioEnabled = false,
           isVibrationEnabled = false,
           guidanceType = AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE,
         )
-      ),
+      ).guidanceMode,
     )
     assertEquals(
-      AudioGuidance.SILENT,
+      AudioGuidanceSettings.GuidanceMode.SILENT,
       Convert.convertAudioGuidanceSettingsToDto(
         NavigationAudioGuidanceSettingsDto(
           isBluetoothAudioEnabled = false,
           isVibrationEnabled = false,
           guidanceType = AudioGuidanceTypeDto.SILENT,
         )
-      ),
+      ).guidanceMode,
     )
     assertEquals(
-      AudioGuidance.VOICE_ALERTS_ONLY,
+      AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_ONLY,
       Convert.convertAudioGuidanceSettingsToDto(
         NavigationAudioGuidanceSettingsDto(
           isBluetoothAudioEnabled = false,
           isVibrationEnabled = false,
           guidanceType = AudioGuidanceTypeDto.ALERTS_ONLY,
         )
-      ),
+      ).guidanceMode,
     )
     assertEquals(
-      AudioGuidance.VOICE_ALERTS_AND_GUIDANCE or AudioGuidance.VIBRATION,
+      AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_AND_GUIDANCE,
       Convert.convertAudioGuidanceSettingsToDto(
         NavigationAudioGuidanceSettingsDto(
           isBluetoothAudioEnabled = false,
           isVibrationEnabled = true,
           guidanceType = AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE,
         )
-      ),
+      ).guidanceMode,
     )
     assertEquals(
-      AudioGuidance.VOICE_ALERTS_AND_GUIDANCE or AudioGuidance.BLUETOOTH_AUDIO,
+      true,
+      Convert.convertAudioGuidanceSettingsToDto(
+        NavigationAudioGuidanceSettingsDto(
+          isBluetoothAudioEnabled = false,
+          isVibrationEnabled = true,
+          guidanceType = AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE,
+        )
+      ).vibrationEnabled,
+    )
+    assertEquals(
+      AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_AND_GUIDANCE,
+      Convert.convertAudioGuidanceSettingsToDto(
+        NavigationAudioGuidanceSettingsDto(
+          isBluetoothAudioEnabled = true,
+          isVibrationEnabled = false,
+          guidanceType = AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE,
+        )
+      ).guidanceMode,
+    )
+    assertEquals(
+      true,
       Convert.convertAudioGuidanceSettingsToDto(
         NavigationAudioGuidanceSettingsDto(
           isBluetoothAudioEnabled = true,
           isVibrationEnabled = false,
           guidanceType = AudioGuidanceTypeDto.ALERTS_AND_GUIDANCE,
         )
-      ),
+      ).bluetoothAudioEnabled,
     )
   }
 

example/android/app/build.gradle.kts

@@ -107,7 +107,7 @@ flutter {
 dependencies {
     implementation("androidx.car.app:app:1.7.0")
     implementation("androidx.car.app:app-projected:1.7.0")
-    implementation("com.google.android.libraries.navigation:navigation:7.7.0")
+    implementation("com.google.android.libraries.navigation:navigation:7.8.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.1.5")
     androidTestUtil("androidx.test:orchestrator:1.5.1")
 }

example/lib/pages/navigation.dart

@@ -786,7 +786,7 @@ class _NavigationPageState extends ExamplePageState<NavigationPage> {
       NavigationAudioGuidanceSettings(
         isBluetoothAudioEnabled: true,
         isVibrationEnabled: true,
-        guidanceType: NavigationAudioGuidanceType.alertsAndGuidance,
+        guidanceType: NavigationAudioGuidanceType.silent,
       ),
     );
   }

ios/google_navigation_flutter.podspec

@@ -15,7 +15,7 @@ A Google Maps Navigation Flutter plugin.
   s.source           = { :path => '.' }
   s.source_files = 'google_navigation_flutter/Sources/google_navigation_flutter/**/*.swift'
   s.dependency 'Flutter'
-  s.dependency 'GoogleNavigation', '10.14.0'
+  s.dependency 'GoogleNavigation', '10.15.0'
   s.platform = :ios, '16.0'
   s.static_framework = true
 

ios/google_navigation_flutter/Package.swift

@@ -29,11 +29,11 @@ let package = Package(
     .package(name: "FlutterFramework", path: "../FlutterFramework"),
     .package(
       url: "https://github.com/googlemaps/ios-navigation-sdk",
-      exact: "10.14.0"
+      exact: "10.15.0"
     ),
     .package(
       url: "https://github.com/googlemaps/ios-maps-sdk",
-      exact: "10.14.0"
+      exact: "10.15.0"
     ),
   ],
   targets: [