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

[android] Fixed toggle traffic mode in routing

Browse source
This commit is contained in:
Dmitry Donskoy 2018-08-09 11:22:28 +03:00 • committed by Aleksey Belousov
parent 42c1eec56b
commit 25f48891ee
1 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
android/src/com/mapswithme/maps/routing/NavigationController.java
View file

@ -147,35 +147,39 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
private NavMenu createNavMenu()
{
return new NavMenu(mBottomFrame, item -> {
final MwmActivity parent = ((MwmActivity) mFrame.getContext());
switch (item)
{
case STOP:
mNavMenu.close(false /* animate */);
Statistics.INSTANCE.trackRoutingFinish(true,
RoutingController.get().getLastRouterType(),
TrafficManager.INSTANCE.isEnabled());
RoutingController.get().cancel();
break;
case SETTINGS:
Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_SETTINGS);
parent.closeMenu(() -> parent.startActivity(new Intent(parent, SettingsActivity.class)));
break;
case TTS_VOLUME:
TtsPlayer.setEnabled(!TtsPlayer.isEnabled());
mNavMenu.refreshTts();
break;
case TRAFFIC:
TrafficManager.INSTANCE.toggle();
mNavMenu.refreshTraffic();
//TODO: Add statistics reporting (in separate task)
break;
case TOGGLE:
mNavMenu.toggle(true);
parent.refreshFade();
}
});
return new NavMenu(mBottomFrame, this::onMenuItemClicked);
}
private void onMenuItemClicked(NavMenu.Item item)
{
final MwmActivity parent = ((MwmActivity) mFrame.getContext());
switch (item)
{
case STOP:
mNavMenu.close(false);
Statistics.INSTANCE.trackRoutingFinish(true,
RoutingController.get().getLastRouterType(),
TrafficManager.INSTANCE.isEnabled());
RoutingController.get().cancel();
break;
case SETTINGS:
Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_SETTINGS);
parent.closeMenu(() -> parent.startActivity(new Intent(parent, SettingsActivity.class)));
break;
case TTS_VOLUME:
TtsPlayer.setEnabled(!TtsPlayer.isEnabled());
mNavMenu.refreshTts();
break;
case TRAFFIC:
TrafficManager.INSTANCE.toggle();
parent.onTrafficLayerSelected();
mNavMenu.refreshTraffic();
//TODO: Add statistics reporting (in separate task)
break;
case TOGGLE:
mNavMenu.toggle(true);
parent.refreshFade();
}
}
public void stop(MwmActivity parent)