diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java index d0159af40..90624f414 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java @@ -31,7 +31,8 @@ public class DrivingOptionsScreen extends BaseMapScreen private final DrivingOption[] mDrivingOptions = {new DrivingOption(RoadType.Toll, R.string.avoid_tolls), new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved), new DrivingOption(RoadType.Ferry, R.string.avoid_ferry), - new DrivingOption(RoadType.Motorway, R.string.avoid_motorways)}; + new DrivingOption(RoadType.Motorway, R.string.avoid_motorways), + new DrivingOption(RoadType.Steps, R.string.avoid_steps)}; @NonNull private final Map mInitialDrivingOptionsState = new HashMap<>(); diff --git a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java index 18349133b..aee0aa2ce 100644 --- a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java @@ -107,6 +107,11 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment dirtyRoadsBtn.setChecked(RoutingOptions.hasOption(RoadType.Dirty)); CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty); dirtyRoadsBtn.setOnCheckedChangeListener(dirtyBtnListener); + + SwitchCompat stepsBtn = root.findViewById(R.id.avoid_steps_btn); + stepsBtn.setChecked(RoutingOptions.hasOption(RoadType.Steps)); + CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps); + stepsBtn.setOnCheckedChangeListener(stepsBtnListener); } private static class ToggleRoutingOptionListener implements CompoundButton.OnCheckedChangeListener diff --git a/android/app/src/main/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml index fac1bf455..746b39952 100644 --- a/android/app/src/main/res/layout/fragment_driving_options.xml +++ b/android/app/src/main/res/layout/fragment_driving_options.xml @@ -104,4 +104,26 @@ android:padding="@dimen/margin_half_double_plus" android:layout_height="match_parent"/> + + + + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 1ba4c7944..5d890ae99 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -676,6 +676,7 @@ Avoid ferries Avoid freeways + Avoid steps Unable to calculate route A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry. Define roads to avoid diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java index e74f08aed..976702e68 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java @@ -6,5 +6,6 @@ public enum RoadType Toll, Motorway, Ferry, - Dirty + Dirty, + Steps }