From 9f08db7f3968c588d8145ab470a0506e77df5567 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Sun, 1 Feb 2015 09:58:53 +0100
Subject: [PATCH] Move text color to colors.xml

---
 OsmAnd/res/values/colors.xml                  | 27 ++++++++++---------
 .../osmand/plus/views/MapControlsLayer.java   |  5 ++--
 .../net/osmand/plus/views/MapInfoLayer.java   |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 173a9df3dc..373e552100 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="actionbar_dark_color">#39464d</color>
+	<color name="actionbar_dark_color">#39464d</color>
 	<color name="tool_bar_dark_color">#CC080B0D</color>
 	<color name="actionbar_light_color">#ff8f00</color>
 	<color name="tool_bar_light_color">#b4ff8f00</color>
@@ -15,20 +15,13 @@
 	<color name="dashboard_subheader_text_light">#212121</color>
 	<color name="dashboard_general_button_dark">#ff8f00</color>
 	<color name="dashboard_general_button_light">#536DFE</color>
-    <color name="gpx_color_point">#cd2c33</color>
-    <color name="gpx_speed">#c79c00</color>
-    <color name="gpx_altitude_desc">#32CD32</color>
-    <color name="gpx_altitude_asc">#EE3232</color>
-    <color name="gpx_distance_color">#ffa500</color>
-    <color name="gpx_time_span_color">#0080FF</color>
-
-
-	<color name="background_tab_pressed">#1AFFFFFF</color>
 
 	<color name="color_transparent">#00000000</color>
-    <color name="color_favorite">#eecc22</color>
+	<color name="widgettext_night">0xffC8C8C8</color>
+
 	<!-- style colors  -->
 	<color name="group_background">#A5A5A5</color>
+	<color name="background_tab_pressed">#1AFFFFFF</color>
 	<!-- <color name="activity_background">#666666</color>  -->
 
 	<!-- Distance to object suitable for all themes -->
@@ -40,6 +33,16 @@
 	
 	<color name="row_selection_color">#CC33BBE0</color>
 	
+	<!-- GPX analysis colors -->
+	<color name="gpx_color_point">#cd2c33</color>
+	<color name="gpx_speed">#c79c00</color>
+	<color name="gpx_altitude_desc">#32CD32</color>
+	<color name="gpx_altitude_asc">#EE3232</color>
+	<color name="gpx_distance_color">#ffa500</color>
+	<color name="gpx_time_span_color">#0080FF</color>
+
+	<color name="color_favorite">#eecc22</color>
+
 	<!-- Themed color list items -->
 	<!-- invalid -red, localindex not supported,  -->
 	<color name="color_invalid">#EE3232</color>
@@ -86,7 +89,7 @@
 	<color name="sherpafy_selection">#ff33b5e5</color>
 	<color name="sherpafy_add_text">#b9b9b9</color>
 
-    <color name="dark_drawer_bg_color">#303030</color>
+	<color name="dark_drawer_bg_color">#303030</color>
 
 	<color name="card_bg_color_light">#ffffff</color>
 	<color name="card_bg_color_dark">#333b40</color>
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 9e4e2305ff..a6a8a1e67e 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -42,7 +42,7 @@ import android.widget.SeekBar;
 
 public class MapControlsLayer extends OsmandMapLayer {
 
-	private static final int NIGHT_COLOR = 0xffC8C8C8;
+	//private static final int NIGHT_COLOR = 0xffC8C8C8;
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 5000;
 	private final MapActivity mapActivity;
 	private int shadowColor = -1;
@@ -156,7 +156,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
 		boolean isNight = nightMode != null && nightMode.isNightMode();
 		int shadw = isNight ? Color.TRANSPARENT : Color.WHITE;
-		int textColor = isNight ? NIGHT_COLOR : Color.BLACK ;
+		//int textColor = isNight ? NIGHT_COLOR : Color.BLACK ;
+		int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : Color.BLACK ;
 		if(shadowColor != shadw) {
 			shadowColor = shadw;
 			updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls);
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index a843d242f0..8b000ba750 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -388,7 +388,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		if (themeId != calcThemeId) {
 			themeId = calcThemeId;
 			boolean textBold = following;
-			int textColor = nightMode ? 0xffC8C8C8:Color.BLACK ;
+			int textColor = nightMode ? view.getResources().getColor(R.color.widgettext_night):Color.BLACK ;
 			int textShadowColor = transparent && !nightMode? Color.WHITE : Color.TRANSPARENT ;
 			int boxTop;
 			int boxTopStack;