From 51127d4c588face4c1378b695c9ecbc44c51eed7 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 18 Mar 2015 15:52:05 +0100
Subject: [PATCH] Fix color

---
 OsmAnd/res/drawable/btn_inset_circle.xml   | 18 ++----------------
 OsmAnd/res/drawable/btn_inset_circle_n.xml | 18 ++++++++++++++++++
 OsmAnd/res/drawable/btn_inset_circle_p.xml | 20 ++++++++++++++++++++
 OsmAnd/res/layout/map_hud_top.xml          |  3 ++-
 OsmAnd/res/values/colors.xml               |  8 ++++----
 5 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_inset_circle_n.xml
 create mode 100644 OsmAnd/res/drawable/btn_inset_circle_p.xml

diff --git a/OsmAnd/res/drawable/btn_inset_circle.xml b/OsmAnd/res/drawable/btn_inset_circle.xml
index 722a79f782..f1a5a3b87a 100644
--- a/OsmAnd/res/drawable/btn_inset_circle.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
-            <shape android:shape="oval">
-                <solid android:color="@color/map_widget_light_pressed" />
-
-                <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-            </shape>
-        </inset></item>
-    <item><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
-            <shape android:shape="oval">
-                <solid android:color="@color/map_widget_light" />
-
-                <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-            </shape>
-        </inset></item>
-
+    <item android:drawable="@drawable/btn_inset_circle_p" android:state_pressed="true"/>
+    <item android:drawable="@drawable/btn_inset_circle_n"></item>
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_inset_circle_n.xml b/OsmAnd/res/drawable/btn_inset_circle_n.xml
new file mode 100644
index 0000000000..345597df85
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_inset_circle_n.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <bitmap android:src="@drawable/bt_round_2_shadow" android:gravity="center" />
+    </item>
+    <item>
+        <inset
+            android:insetBottom="@dimen/map_button_inset"
+            android:insetLeft="@dimen/map_button_inset"
+            android:insetRight="@dimen/map_button_inset"
+            android:insetTop="@dimen/map_button_inset" >
+            <shape android:shape="oval" >
+                <solid android:color="@color/map_widget_light" />
+            </shape>
+        </inset>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_inset_circle_p.xml b/OsmAnd/res/drawable/btn_inset_circle_p.xml
new file mode 100644
index 0000000000..7890976523
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_inset_circle_p.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        
+         <bitmap android:src="@drawable/bt_round_2_shadow" android:gravity="center" />
+        
+    </item>  
+    <item>
+        <inset
+            android:insetBottom="@dimen/map_button_inset"
+            android:insetLeft="@dimen/map_button_inset"
+            android:insetRight="@dimen/map_button_inset"
+            android:insetTop="@dimen/map_button_inset" >
+            <shape android:shape="oval" >
+                <solid android:color="@color/map_widget_light_pressed" />
+            </shape>
+        </inset>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index d1755613c8..150fcd79ed 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:background="@color/color_favorite" >
 
     <!-- TOP ROW -->
 
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index a63011a802..12d7571111 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -18,11 +18,11 @@
 	<color name="list_item_background_dark_pressed">#be39464d</color>
 	
 	<color name="map_widget_stroke">#333333</color>
-	<color name="map_widget_light">#eeffffff</color>
-	<color name="map_widget_dark">#aa3f3f3f</color>
+	<color name="map_widget_light">#ffffff</color>
+	<color name="map_widget_dark">#bb3f3f3f</color>
 	<color name="map_widget_dark_pressed">#ddcccccc</color>
-	<color name="map_widget_light_trans">#88bbbbbb</color>
-	<color name="map_widget_light_pressed">#ddcccccc</color>
+	<color name="map_widget_light_trans">#40ffffff</color>
+	<color name="map_widget_light_pressed">#e5e5e5</color>
 	<color name="map_widget_blue">#30A0FF</color>
 	<color name="map_widget_blue_pressed">#dd30D0FF</color>