map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Disabled the taxi option in routing.

Browse source 
Signed-off-by: Altynaika <altynaika.toktomuratovaa@gmail.com>
This commit is contained in:
Altynaika 2021-02-04 23:16:49 +06:00 • committed by Roman Tsisyk
parent eb82668fc6
commit 37419a19ec
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
android/res/layout/routing_plan.xml
View file

@ -81,14 +81,14 @@
tools:button="@drawable/ic_bike"
tools:buttonTint="?iconTintLight" />
<com.mapswithme.maps.widget.RoutingToolbarButton
android:id="@+id/taxi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/routing_selector_wheel_margin"
android:layout_marginEnd="@dimen/routing_selector_wheel_margin"
tools:button="@drawable/ic_taxi"
tools:buttonTint="?iconTintLight" />
<!-- <com.mapswithme.maps.widget.RoutingToolbarButton-->
<!-- android:id="@+id/taxi"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginRight="@dimen/routing_selector_wheel_margin"-->
<!-- android:layout_marginEnd="@dimen/routing_selector_wheel_margin"-->
<!-- tools:button="@drawable/ic_taxi"-->
<!-- tools:buttonTint="?iconTintLight" />-->
</RadioGroup>
<LinearLayout
@ -136,13 +136,13 @@
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"/>
<com.mapswithme.maps.widget.WheelProgressView
android:id="@+id/progress_taxi"
style="@style/MwmWidget.ProgressWheel.RoutingPlan"
android:layout_marginTop="@dimen/routing_selector_wheel_margin"
android:layout_marginBottom="@dimen/routing_selector_wheel_margin"
android:layout_marginRight="@dimen/routing_selector_wheel_margin"
android:layout_marginEnd="@dimen/routing_selector_wheel_margin"/>
<!-- <com.mapswithme.maps.widget.WheelProgressView-->
<!-- android:id="@+id/progress_taxi"-->
<!-- style="@style/MwmWidget.ProgressWheel.RoutingPlan"-->
<!-- android:layout_marginTop="@dimen/routing_selector_wheel_margin"-->
<!-- android:layout_marginBottom="@dimen/routing_selector_wheel_margin"-->
<!-- android:layout_marginRight="@dimen/routing_selector_wheel_margin"-->
<!-- android:layout_marginEnd="@dimen/routing_selector_wheel_margin"/>-->
</LinearLayout>

21
android/src/com/mapswithme/maps/routing/RoutingPlanController.java
View file

@ -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);