diff --git a/android/res/layout/routing_plan.xml b/android/res/layout/routing_plan.xml index 89122c622e..999734df8e 100644 --- a/android/res/layout/routing_plan.xml +++ b/android/res/layout/routing_plan.xml @@ -81,14 +81,14 @@ tools:button="@drawable/ic_bike" tools:buttonTint="?iconTintLight" /> - + + + + + + + + - + + + + + + + diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index 1f247cdaf3..535f6be0df 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -42,8 +42,9 @@ public class RoutingPlanController extends ToolbarController private final WheelProgressView mProgressTransit; @NonNull private final WheelProgressView mProgressBicycle; - @NonNull - private final WheelProgressView mProgressTaxi; + +// @NonNull +// private final WheelProgressView mProgressTaxi; @NonNull private final RoutingBottomMenuController mRoutingBottomMenuController; @@ -100,7 +101,7 @@ public class RoutingPlanController extends ToolbarController mProgressPedestrian = (WheelProgressView) progressFrame.findViewById(R.id.progress_pedestrian); mProgressTransit = (WheelProgressView) progressFrame.findViewById(R.id.progress_transit); mProgressBicycle = (WheelProgressView) progressFrame.findViewById(R.id.progress_bicycle); - mProgressTaxi = (WheelProgressView) progressFrame.findViewById(R.id.progress_taxi); +// mProgressTaxi = (WheelProgressView) progressFrame.findViewById(R.id.progress_taxi); mRoutingBottomMenuController = RoutingBottomMenuController.newInstance(requireActivity(), mFrame, listener); @@ -131,7 +132,7 @@ public class RoutingPlanController extends ToolbarController setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected); setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected); setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected); - setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected); +// setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected); setupRouterButton(R.id.transit, R.drawable.ic_transit, v -> onTransitModeSelected()); } @@ -217,7 +218,7 @@ public class RoutingPlanController extends ToolbarController public void updateBuildProgress(int progress, @Framework.RouterType int router) { UiUtils.invisible(mProgressVehicle, mProgressPedestrian, mProgressTransit, - mProgressBicycle, mProgressTaxi); + mProgressBicycle); WheelProgressView progressView; if (router == Framework.ROUTER_TYPE_VEHICLE) { @@ -229,11 +230,11 @@ public class RoutingPlanController extends ToolbarController mRouterTypes.check(R.id.pedestrian); progressView = mProgressPedestrian; } - else if (router == Framework.ROUTER_TYPE_TAXI) - { - mRouterTypes.check(R.id.taxi); - progressView = mProgressTaxi; - } +// else if (router == Framework.ROUTER_TYPE_TAXI) +// { +// mRouterTypes.check(R.id.taxi); +// progressView = mProgressTaxi; +// } else if (router == Framework.ROUTER_TYPE_TRANSIT) { mRouterTypes.check(R.id.transit);