pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Go back to planning state on Android back button press

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-02-01 12:08:31 +01:00 • committed by Viktor Govako
parent f9e6c85387
commit 0790ec4ad5
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -1053,6 +1053,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
hideBookmarkCategoryToolbar();
return;
}
if (RoutingController.get().isNavigating())
{
RoutingController.get().resetToPlanningState();
return;
}
boolean isRoutingCancelled = RoutingController.get().cancel();
if (!closePlacePage() && !closeSidePanel() && !isRoutingCancelled
&& !closePositionChooser())
@ -1676,6 +1683,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
closePlacePage();
}
@Override
public void onResetToPlanningState()
{
closePlacePage();
}
@Override
public void onBuiltRoute()
{

9
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -67,6 +67,7 @@ public class RoutingController implements Initializable<Void>
void onNavigationStarted();
void onAddedStop();
void onRemovedStop();
void onResetToPlanningState();
void onBuiltRoute();
void onDrivingOptionsWarning();
boolean isSubwayEnabled();
@ -521,6 +522,14 @@ public class RoutingController implements Initializable<Void>
backToPlaningStateIfNavigating();
}
public void resetToPlanningState()
{
build();
if (mContainer != null)
mContainer.onResetToPlanningState();
backToPlaningStateIfNavigating();
}
private void backToPlaningStateIfNavigating()
{
if (!isNavigating())