diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index b9e838e9d0..c95e62c66f 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -132,7 +132,7 @@ #e58200 #2f3a40 - #33000000 + #66000000 #99000000 #CC000000 #11ab51 diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index ed948cdbac..afbe25242e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -829,12 +829,13 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven getWindow().setStatusBarColor(ContextCompat.getColor(this, colorId)); return; } + boolean mapControlsVisible = findViewById(R.id.MapHudButtonsOverlay).getVisibility() == View.VISIBLE; boolean night = app.getDaynightHelper().isNightModeForMapControls(); boolean mapTopBar = findViewById(R.id.map_top_bar).getVisibility() == View.VISIBLE; boolean markerTopBar = findViewById(R.id.map_markers_top_bar).getVisibility() == View.VISIBLE; - if (mapTopBar) { + if (mapTopBar && mapControlsVisible) { colorId = night ? R.color.status_bar_route_dark : R.color.status_bar_route_light; - } else if (markerTopBar) { + } else if (markerTopBar && mapControlsVisible) { colorId = R.color.status_bar_dark; } else { colorId = night ? R.color.status_bar_transparent_dark : R.color.status_bar_transparent_light; diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index e6e75926a6..cbc21d5c21 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -689,6 +689,7 @@ public class MapControlsLayer extends OsmandMapLayer { } else { showMapControls(); } + mapActivity.updateStatusBarColor(); } public void startNavigation() {