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

Format code

Browse source
This commit is contained in:
Alexander Sytnyk 2017-11-07 11:48:22 +02:00
parent e9aef89dee
commit 2d01a9e72b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -821,8 +821,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
colorId = ((BaseOsmAndFragment) fragment).getStatusBarColorId(); colorId = ((BaseOsmAndFragment) fragment).getStatusBarColorId();
} else if (dashboardOnMap.isVisible()) { } else if (dashboardOnMap.isVisible()) {
colorId = dashboardOnMap.getStatusBarColor(); colorId = dashboardOnMap.getStatusBarColor();
} else if (mapLayers.getMapQuickActionLayer() != null && } else if (mapLayers.getMapQuickActionLayer() != null
mapLayers.getMapQuickActionLayer().isWidgetVisible()) { && mapLayers.getMapQuickActionLayer().isWidgetVisible()) {
colorId = R.color.status_bar_transparent_gradient; colorId = R.color.status_bar_transparent_gradient;
} }
if (colorId != -1) { if (colorId != -1) {
@ -831,8 +831,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
} }
boolean night = app.getDaynightHelper().isNightModeForMapControls(); boolean night = app.getDaynightHelper().isNightModeForMapControls();
boolean mapTopBar = findViewById(R.id.map_top_bar).getVisibility() == View.VISIBLE; boolean mapTopBar = findViewById(R.id.map_top_bar).getVisibility() == View.VISIBLE;
boolean markerTopBar = mapLayers.getMapMarkersLayer() != null && boolean markerTopBar = mapLayers.getMapMarkersLayer() != null
mapLayers.getMapMarkersLayer().getWidgetsFactory().isTopBarVisible(); && mapLayers.getMapMarkersLayer().getWidgetsFactory().isTopBarVisible();
if (mapTopBar) { if (mapTopBar) {
colorId = night ? R.color.status_bar_route_dark : R.color.status_bar_route_light; colorId = night ? R.color.status_bar_route_dark : R.color.status_bar_route_light;
} else if (markerTopBar) { } else if (markerTopBar) {