Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-03-06 09:18:38 +01:00
commit 6d935f89ec
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -512,9 +512,12 @@ public class MapControlsLayer extends OsmandMapLayer {
updateMyLocation(rh, dialogOpened); updateMyLocation(rh, dialogOpened);
boolean showButtons = (showRouteCalculationControls || !routeFollowingMode); boolean showButtons = (showRouteCalculationControls || !routeFollowingMode);
//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions); //routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions);
if (routePlanningMode || routeFollowingMode) { if (rh.isFollowingMode()) {
routePlanningBtn.setIconResId(R.drawable.map_start_navigation); routePlanningBtn.setIconResId(R.drawable.map_start_navigation);
routePlanningBtn.setIconColorId(R.color.color_myloc_distance); routePlanningBtn.setIconColorId(R.color.color_myloc_distance);
} else if (routePlanningMode) {
routePlanningBtn.setIconResId(R.drawable.map_directions);
routePlanningBtn.setIconColorId(R.color.color_myloc_distance);
} else { } else {
routePlanningBtn.setIconResId(R.drawable.map_directions); routePlanningBtn.setIconResId(R.drawable.map_directions);
routePlanningBtn.resetIconColors(); routePlanningBtn.resetIconColors();
@ -741,9 +744,14 @@ public class MapControlsLayer extends OsmandMapLayer {
return true; return true;
} }
public void resetIconColors() { public boolean resetIconColors() {
if (resClrLight == R.color.icon_color && resClrDark == 0) {
return false;
}
resClrLight = R.color.icon_color; resClrLight = R.color.icon_color;
resClrDark = 0; resClrDark = 0;
f = true;
return true;
} }
public MapHudButton setIconColorId(int clr) { public MapHudButton setIconColorId(int clr) {