From f1d26557b8c3970130c6abf7f6abcdbd8c9a23d6 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Mon, 2 Feb 2015 11:54:36 +0200
Subject: [PATCH] Fix dark dashboard (partial)

---
 .../res/layout-land/dash_search_fragment.xml  |   6 +-
 OsmAnd/res/layout/dash_favorites_item.xml     | 148 ++++++++++--------
 OsmAnd/res/layout/dash_search_fragment.xml    |  17 +-
 OsmAnd/res/layout/dash_updates_fragment.xml   |  46 +++---
 OsmAnd/res/layout/dash_updates_item.xml       |  97 +++++++-----
 OsmAnd/res/values/attrs.xml                   |   1 +
 OsmAnd/res/values/colors.xml                  |   4 +-
 OsmAnd/res/values/styles.xml                  |  17 +-
 8 files changed, 200 insertions(+), 136 deletions(-)

diff --git a/OsmAnd/res/layout-land/dash_search_fragment.xml b/OsmAnd/res/layout-land/dash_search_fragment.xml
index 9f3d021fdd..397bc082fa 100644
--- a/OsmAnd/res/layout-land/dash_search_fragment.xml
+++ b/OsmAnd/res/layout-land/dash_search_fragment.xml
@@ -33,7 +33,7 @@
 
         <Button
             android:id="@+id/poi"
-            style="@style/DashboardSearchButton"
+			style="?attr/dashboardSearchButtonStyle"
             android:drawableTop="@drawable/ic_action_info2"
             android:text="@string/poi" />
 
@@ -44,7 +44,7 @@
 
         <Button
             android:id="@+id/address"
-            style="@style/DashboardSearchButton"
+			style="?attr/dashboardSearchButtonStyle"
             android:drawableTop="@drawable/ic_action_home2"
             android:text="@string/address" />
 
@@ -55,7 +55,7 @@
 
         <Button
             android:id="@+id/coord"
-            style="@style/DashboardSearchButton"
+			style="?attr/dashboardSearchButtonStyle"
             android:drawableTop="@drawable/ic_action_marker2"
             android:text="@string/coordinates" />
 
diff --git a/OsmAnd/res/layout/dash_favorites_item.xml b/OsmAnd/res/layout/dash_favorites_item.xml
index 3ff52f7f2c..0e40fafb65 100644
--- a/OsmAnd/res/layout/dash_favorites_item.xml
+++ b/OsmAnd/res/layout/dash_favorites_item.xml
@@ -1,69 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dashListItemHeight"
+	android:background="?attr/dashboard_button"
+	android:orientation="vertical">
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="match_parent"
-			  android:background="?attr/dashboard_button"
-			  android:layout_height="@dimen/dashListItemHeight">
-    <View android:layout_width="match_parent"
-		  android:background="?attr/dashboard_divider"
-          android:layout_height="1dp"/>
-    <LinearLayout android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent">
-        <ImageView android:id="@+id/icon"
-                   android:layout_gravity="center_vertical"
-                   android:layout_marginLeft="@dimen/dashFavIconMargin"
-                   android:layout_marginRight="@dimen/dashFavIconMargin"
-                   android:layout_width="wrap_content"
-                   android:layout_height="fill_parent"/>
-        <LinearLayout android:orientation="vertical"
-                      android:layout_weight="1"
-                      android:layout_gravity="center_vertical"
-                      android:layout_width="0dp"
-                      android:layout_height="wrap_content">
-            <TextView android:id="@+id/name"
-                      android:textSize="@dimen/dashFavNameTextSize"
-                      android:textColor="@color/dashboard_black"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"/>
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content">
-				<ImageView android:visibility="gone"
-						   android:id="@+id/direction"
-						   android:layout_gravity="center_vertical"
-						   android:layout_width="@dimen/dashFavDirectionSize"
-						   android:layout_height="@dimen/dashFavDirectionSize"/>
-				<TextView android:id="@+id/distance"
-						  android:textSize="@dimen/showAllButtonTextSize"
-						  android:textColor="@color/dashboard_blue"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
-				<ImageView android:id="@+id/group_image"
-						   android:layout_marginLeft="4dp"
-						   android:src="@drawable/ic_small_group"
-						   android:layout_width="wrap_content"
-						   android:layout_height="wrap_content"/>
-				<TextView android:id="@+id/group_name"
-						  android:layout_marginLeft="4dp"
-						  android:layout_gravity="center_vertical"
-						  android:textSize="@dimen/showAllButtonTextSize"
-						  android:textColor="@color/dashboard_descr_colol"
-						  android:layout_width="wrap_content"
-						  android:layout_height="wrap_content"/>
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:id="@+id/icon"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/dashFavIconMargin"
+			android:layout_marginRight="@dimen/dashFavIconMargin"/>
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/dashFavNameTextSize"
+				android:maxLines="1"
+				android:ellipsize="end"
+				tools:text="@string/lorem_ipsum" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:id="@+id/direction"
+					android:layout_width="@dimen/dashFavDirectionSize"
+					android:layout_height="@dimen/dashFavDirectionSize"
+					android:layout_gravity="center_vertical"
+					android:visibility="gone" />
+
+				<TextView
+					android:id="@+id/distance"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textColor="@color/dashboard_blue"
+					android:textSize="@dimen/showAllButtonTextSize"
+					tools:text="100500 km"/>
+
+				<ImageView
+					android:id="@+id/group_image"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="4dp"
+					android:src="@drawable/ic_small_group"/>
+
+				<TextView
+					android:id="@+id/group_name"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:layout_marginLeft="4dp"
+					android:textColor="@color/dashboard_descr_colol"
+					android:textSize="@dimen/showAllButtonTextSize"/>
 			</LinearLayout>
 
-        </LinearLayout>
+		</LinearLayout>
 
-        <ImageButton android:id="@+id/navigate_to"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_action_gdirections_light"
-                android:background="?attr/dashboard_button"
-                android:layout_marginLeft="@dimen/dashFavIconMargin"
-                android:layout_width="@dimen/dashListItemHeight"
-                android:layout_height="@dimen/dashListItemHeight"/>
-    </LinearLayout>
+		<ImageButton
+			android:id="@+id/navigate_to"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/dashFavIconMargin"
+			android:background="?attr/dashboard_button"
+			android:src="@drawable/ic_action_gdirections_light"/>
+	</LinearLayout>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_search_fragment.xml b/OsmAnd/res/layout/dash_search_fragment.xml
index e844d097d0..d1cda779a6 100644
--- a/OsmAnd/res/layout/dash_search_fragment.xml
+++ b/OsmAnd/res/layout/dash_search_fragment.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search"
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/card_bg"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="@dimen/dashHeaderHeight" >
+        android:layout_height="@dimen/dashHeaderHeight">
 
         <TextView
             android:id="@+id/search_for"
@@ -30,11 +31,11 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dashSearchBtnHeight"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/poi"
-            style="@style/DashboardSearchButton"
+            style="?attr/dashboardSearchButtonStyle"
             android:drawableTop="@drawable/ic_action_info2"
             android:text="@string/poi" />
 
@@ -45,7 +46,7 @@
 
         <Button
             android:id="@+id/address"
-            style="@style/DashboardSearchButton"
+			style="?attr/dashboardSearchButtonStyle"
             android:drawableTop="@drawable/ic_action_home2"
             android:text="@string/address" />
 
@@ -56,7 +57,7 @@
 
         <Button
             android:id="@+id/coord"
-            style="@style/DashboardSearchButton"
+			style="?attr/dashboardSearchButtonStyle"
             android:drawableTop="@drawable/ic_action_marker2"
             android:text="@string/coordinates" />
     </LinearLayout>
diff --git a/OsmAnd/res/layout/dash_updates_fragment.xml b/OsmAnd/res/layout/dash_updates_fragment.xml
index 8676f73f07..5772aa7bbb 100644
--- a/OsmAnd/res/layout/dash_updates_fragment.xml
+++ b/OsmAnd/res/layout/dash_updates_fragment.xml
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	android:id="@+id/maps"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/card_bg"
+	android:orientation="vertical">
 
-<LinearLayout android:id="@+id/maps"
-			  xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:background="?attr/card_bg"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content">
 	<LinearLayout
-			android:layout_gravity="center_vertical"
-			android:layout_width="match_parent"
-			android:layout_height="@dimen/dashHeaderHeight">
-		<TextView android:text="@string/map_update"
-				  android:id="@+id/header"
-				  style="?attr/dashboardSubHeaderStyle"/>
-		<Button android:id="@+id/show_all"
-				android:text="@string/show_all"
-				style="?attr/dashboardGeneralButtonStyle"/>
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/dashHeaderHeight"
+		android:layout_gravity="center_vertical">
+
+		<TextView
+			android:id="@+id/header"
+			style="?attr/dashboardSubHeaderStyle"
+			android:text="@string/map_update"/>
+
+		<Button
+			android:id="@+id/show_all"
+			style="?attr/dashboardGeneralButtonStyle"
+			android:text="@string/show_all"/>
 	</LinearLayout>
 
-	<LinearLayout android:id="@+id/updates_items"
-				  android:orientation="vertical"
-				  android:layout_width="fill_parent"
-				  android:layout_height="wrap_content"/>
+	<LinearLayout
+		android:id="@+id/updates_items"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml
index d0f52c8b81..a40655275a 100644
--- a/OsmAnd/res/layout/dash_updates_item.xml
+++ b/OsmAnd/res/layout/dash_updates_item.xml
@@ -1,44 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dashListItemHeight"
+	android:layout_marginLeft="@dimen/dashFavIconMargin"
+	android:layout_marginRight="@dimen/dashFavIconMargin"
+	android:orientation="vertical">
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="match_parent"
-			  android:layout_marginLeft="@dimen/dashFavIconMargin"
-			  android:layout_marginRight="@dimen/dashFavIconMargin"
-			  android:layout_height="@dimen/dashListItemHeight">
-	<View android:layout_width="match_parent"
-		  android:background="?attr/dashboard_divider"
-		  android:layout_height="1dp"/>
-	<LinearLayout android:orientation="horizontal"
-				  android:layout_marginLeft="@dimen/subHeaderMarginLeft"
-				  android:layout_width="fill_parent"
-				  android:layout_height="fill_parent">
-		<LinearLayout android:orientation="vertical"
-					  android:layout_gravity="center_vertical"
-					  android:layout_width="0dp"
-					  android:layout_weight="1"
-					  android:layout_height="wrap_content">
-			<TextView android:id="@+id/map_name"
-					  android:textColor="@color/dashboard_black"
-					  android:textSize="@dimen/dashFavNameTextSize"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"/>
-			<TextView android:id="@+id/map_descr"
-					  android:textColor="@color/dashboard_descr_colol"
-					  android:layout_width="wrap_content"
-					  android:layout_height="wrap_content"/>
-			<ProgressBar android:id="@+id/ProgressBar"
-						 android:visibility="gone"
-						 style="?android:attr/progressBarStyleHorizontal"
-						 android:layout_width="fill_parent"
-						 android:layout_height="wrap_content"/>
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:background="?attr/dashboard_divider" />
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_marginLeft="@dimen/subHeaderMarginLeft"
+		android:layout_marginStart="@dimen/subHeaderMarginLeft"
+		android:orientation="horizontal">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/map_name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/dashFavNameTextSize"
+				android:lines="1"
+				android:maxLines="1"
+				android:ellipsize="end"
+				tools:text="@string/lorem_ipsum" />
+
+			<TextView
+				android:id="@+id/map_descr"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textColor="?android:textColorSecondary"
+				tools:text="@string/lorem_ipsum" />
+
+			<ProgressBar
+				android:id="@+id/ProgressBar"
+				style="?android:attr/progressBarStyleHorizontal"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:visibility="gone" />
 		</LinearLayout>
-		<ImageButton android:id="@+id/btn_download"
-				android:layout_gravity="center_vertical"
-				android:src="@drawable/download_button"
-				android:background="?attr/dashboard_button"
-				android:layout_width="@dimen/dashListItemHeight"
-				android:layout_height="@dimen/dashListItemHeight"/>
+
+		<ImageButton
+			android:id="@+id/btn_download"
+			android:layout_width="@dimen/dashListItemHeight"
+			android:layout_height="@dimen/dashListItemHeight"
+			android:layout_gravity="center_vertical"
+			android:background="?attr/dashboard_button"
+			android:src="@drawable/download_button"/>
 	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 1607759e2b..1da1894a34 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -16,6 +16,7 @@
 		<attr name="dashboardSubHeaderStyle" format="reference" />
 		<attr name="dashboard_divider" format="reference" />
 		<attr name="dashboard_button" format="reference" />
+		<attr name="dashboardSearchButtonStyle" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index c2d6f89b3e..7c35587509 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -13,8 +13,8 @@
 	<color name="dashboard_blue">#536DFE</color>
 	<color name="dashboard_subheader_text_dark">#b4c3cc</color>
 	<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="dashboard_general_button_text_dark">#ff8f00</color>
+	<color name="dashboard_general_button_text_light">#536DFE</color>
 
 	<color name="color_transparent">#00000000</color>
 	<color name="widgettext_night">#ffC8C8C8</color>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index fc7273e47a..68f459d1fb 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -50,12 +50,12 @@
 	</style>
 
 	<style name="DashboardGeneralButton.Light" parent="DashboardGeneralButton.Compat">
-		<item name="android:textColor">@color/dashboard_general_button_light</item>
+		<item name="android:textColor">@color/dashboard_general_button_text_light</item>
 		<item name="android:background">@drawable/dashboard_button_light</item>
 	</style>
 
 	<style name="DashboardGeneralButton.Dark" parent="DashboardGeneralButton.Compat">
-		<item name="android:textColor">@color/dashboard_general_button_dark</item>
+		<item name="android:textColor">@color/dashboard_general_button_text_dark</item>
 		<item name="android:background">@drawable/dashboard_button_dark</item>
 	</style>
 
@@ -64,13 +64,20 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_weight">1</item>
+		<item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textSize">@dimen/showAllButtonTextSize</item>
-        <item name="android:textColor">@color/dashboard_black</item>
-        <item name="android:background">@drawable/dashboard_button_light</item>
 		<item name="android:gravity">bottom|center_horizontal</item>
 		<item name="android:paddingBottom">@dimen/dashSearchPaddingBot</item>
     </style>
 
+	<style name="DashboardSearchButton.Light" parent="DashboardSearchButton">
+		<item name="android:background">@drawable/dashboard_button_light</item>
+	</style>
+
+	<style name="DashboardSearchButton.Dark" parent="DashboardSearchButton">
+		<item name="android:background">@drawable/dashboard_button_dark</item>
+	</style>
+
     <style name="ListText">
         <item name="android:textSize">20sp</item>
     </style>
@@ -120,6 +127,7 @@
 		<item name="dashboardSubHeaderStyle">@style/DashboardSubHeader.Light</item>
 		<item name="dashboard_divider">@color/dashboard_divider_light</item>
 		<item name="dashboard_button">@drawable/dashboard_button_light</item>
+		<item name="dashboardSearchButtonStyle">@style/DashboardSearchButton.Light</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -147,6 +155,7 @@
 		<item name="dashboardSubHeaderStyle">@style/DashboardSubHeader.Dark</item>
 		<item name="dashboard_divider">@color/dashboard_divider_dark</item>
 		<item name="dashboard_button">@drawable/dashboard_button_dark</item>
+		<item name="dashboardSearchButtonStyle">@style/DashboardSearchButton.Dark</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">