Skip to content

Commit 7e1aff6

Browse files
feat: migrate to new audioguidance function from deprecated one
1 parent 5216d7e commit 7e1aff6

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.google.android.gms.maps.GoogleMap.CameraPerspective;
1818
import com.google.android.gms.maps.model.MapColorScheme;
1919
import com.google.android.libraries.navigation.AlternateRoutesStrategy;
20+
import com.google.android.libraries.navigation.AudioGuidanceSettings;
2021
import com.google.android.libraries.navigation.ForceNightMode;
2122
import com.google.android.libraries.navigation.Navigator;
2223
import com.google.android.libraries.navigation.RoutingOptions;
@@ -33,16 +34,12 @@ public static AlternateRoutesStrategy getAlternateRoutesStrategyFromJsValue(int
3334
}
3435
}
3536

36-
public static @Navigator.AudioGuidance int getAudioGuidanceFromJsValue(int jsValue) {
37-
switch (jsValue) {
38-
case 0:
39-
return Navigator.AudioGuidance.SILENT;
40-
case 1:
41-
return Navigator.AudioGuidance.VOICE_ALERTS_ONLY;
42-
case 2:
43-
default:
44-
return Navigator.AudioGuidance.VOICE_ALERTS_AND_GUIDANCE;
45-
}
37+
public static AudioGuidanceSettings.GuidanceMode getAudioGuidanceModeFromJsValue(int jsValue) {
38+
return switch (jsValue) {
39+
case 0 -> AudioGuidanceSettings.GuidanceMode.SILENT;
40+
case 1 -> AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_ONLY;
41+
default -> AudioGuidanceSettings.GuidanceMode.VOICE_ALERTS_AND_GUIDANCE;
42+
};
4643
}
4744

4845
public static @Navigator.TaskRemovedBehavior int getTaskRemovedBehaviourFromJsValue(int jsValue) {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.google.android.libraries.mapsplatform.turnbyturn.model.NavInfo;
3232
import com.google.android.libraries.mapsplatform.turnbyturn.model.StepInfo;
3333
import com.google.android.libraries.navigation.ArrivalEvent;
34+
import com.google.android.libraries.navigation.AudioGuidanceSettings;
3435
import com.google.android.libraries.navigation.CustomRoutesOptions;
3536
import com.google.android.libraries.navigation.DisplayOptions;
3637
import com.google.android.libraries.navigation.ListenableResultFuture;
@@ -821,7 +822,10 @@ public void setAudioGuidanceType(double index, final Promise promise) {
821822

822823
UiThreadUtil.runOnUiThread(
823824
() -> {
824-
mNavigator.setAudioGuidance(EnumTranslationUtil.getAudioGuidanceFromJsValue(jsValue));
825+
mNavigator.setAudioGuidanceSettings(
826+
AudioGuidanceSettings.builder()
827+
.setGuidanceMode(EnumTranslationUtil.getAudioGuidanceModeFromJsValue(jsValue))
828+
.build());
825829
});
826830
promise.resolve(null);
827831
}

0 commit comments

Comments
 (0)