diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index 0fc34ab4f3..960cb6b8f5 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -177,8 +177,10 @@ #0000 #90000000 #ffC8C8C8 + #000 #dc262626 + #fff #A5A5A5 diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index 81596879d0..ce3647e38c 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -91,7 +91,6 @@ public class MapControlsLayer extends OsmandMapLayer { private List controls = new ArrayList<>(); private final MapActivity mapActivity; - private int shadowColor = -1; // private RulerControl rulerControl; // private List allControls = new ArrayList(); @@ -750,13 +749,12 @@ public class MapControlsLayer extends OsmandMapLayer { private void updateControls(@NonNull RotatedTileBox tileBox, DrawSettings drawSettings) { boolean isNight = drawSettings != null && drawSettings.isNightMode(); boolean portrait = isPotrait(); - int shadw = isNight ? Color.TRANSPARENT : Color.WHITE; - int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : Color.BLACK; - if (shadowColor != shadw) { - shadowColor = shadw; - // TODOnightMode - // updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls); - } +// int shadw = isNight ? mapActivity.getResources().getColor(R.color.widgettext_shadow_night) : +// mapActivity.getResources().getColor(R.color.widgettext_shadow_day); + int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : + mapActivity.getResources().getColor(R.color.widgettext_day); + // TODOnightMode + // updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls); // default buttons boolean routePlanningMode = false; RoutingHelper rh = mapActivity.getRoutingHelper(); diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index 09edbfd582..5148b1f035 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -305,9 +305,11 @@ public class MapInfoLayer extends OsmandMapLayer { TextState ts = new TextState(); ts.textBold = following; ts.night = nightMode; - ts.textColor = nightMode ? ContextCompat.getColor(view.getContext(), R.color.widgettext_night) : Color.BLACK; + ts.textColor = nightMode ? ContextCompat.getColor(view.getContext(), R.color.widgettext_night) : + ContextCompat.getColor(view.getContext(), R.color.widgettext_day); // Night shadowColor always use widgettext_shadow_night, same as widget background color for non-transparent - ts.textShadowColor = nightMode ? ContextCompat.getColor(view.getContext(), R.color.widgettext_shadow_night) : Color.WHITE; + ts.textShadowColor = nightMode ? ContextCompat.getColor(view.getContext(), R.color.widgettext_shadow_night) : + ContextCompat.getColor(view.getContext(), R.color.widgettext_shadow_day); if (!transparent && !nightMode) { ts.textShadowRadius = 0; } else {