From 70f7330f0df85693a74c3d4f186cba5c0f410148 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 6 Feb 2015 14:55:09 +0200
Subject: [PATCH] Removed darklight actionbar theme

---
 OsmAnd/res/values/styles.xml                  | 40 +++++++++++--------
 .../net/osmand/plus/OsmandApplication.java    |  4 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 4072ee9e66..05ad2cfe83 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -95,10 +95,6 @@
 		<!-- Support library compatibility -->
 		<item name="windowActionBarOverlay">true</item>
     </style>
-    
-    <style name="SpinnerItemLight" parent="@android:style/Widget.TextView.SpinnerItem">
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
 
 	<style name="SettingsLightTheme" parent="Theme.AppCompat.Light">
 		<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
@@ -128,7 +124,6 @@
         <item name="bottomToolBarColor">@color/tool_bar_color_light</item>
 		<item name="downloadButtonBackground">@drawable/download_light</item>
         <item name="pstsTabBackground">@color/actionbar_light_color</item>
-        
         <item name="pstsUnderlineColor">@color/actionbar_light_color</item>
         <item name="pstsIndicatorColor">@color/color_white</item>
         <item name="pstsTextColor">@color/color_white</item>
@@ -165,7 +160,7 @@
 		<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_light</item>
 		<item name="ic_world_globe">@drawable/ic_world_globe_light</item>
 		<item name="plugin_description_header_text_color">#727272</item>
-    </style>
+	</style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
         <item name="reset_image">@drawable/ic_action_delete_dark</item> <!--  @drawable/a_1_navigation_cancel_dark -->
@@ -204,16 +199,6 @@
 		<item name="plugin_description_header_text_color">#70818c</item>
     </style>
 
-    <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
-        <item name="expandable_category_color">@color/group_background</item>
-        <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>
-        <item name="pstsTabBackground">@color/actionbar_dark_color</item>
-        <item name="pstsIndicatorColor">@color/actionbar_light_color</item>
-        <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
-        <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
-    </style>
-
     <style name="Widget.Styled.ActionBarDark" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
         <item name="background">@color/actionbar_dark_color</item>
         <item name="android:background">@color/actionbar_dark_color</item>
@@ -222,11 +207,14 @@
     <style name="Widget.Styled.ActionBarLight" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="background">@color/actionbar_light_color</item>
         <item name="android:background">@color/actionbar_light_color</item>
-        <item name="android:spinnerDropDownItemStyle">@style/SpinnerItemLight</item>
         <item name="android:titleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
 		<item name="titleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
 		<item name="android:subtitleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
 		<item name="subtitleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
+		<item name="android:actionDropDownStyle">@style/ActionBarDropDownLight</item>
+		<item name="actionDropDownStyle">@style/ActionBarDropDownLight</item>
+		<item name="android:actionBarWidgetTheme">@style/ActionBarWidgetLight</item>
+		<item name="actionBarWidgetTheme">@style/ActionBarWidgetLight</item>
     </style>
 
     <style name="Widget.Styled.LightActionBarHeader" parent="@android:style/TextAppearance">
@@ -242,6 +230,24 @@
 		<item name="android:textColor">@color/color_white</item>
 	</style>
 
+	<style name="ActionBarWidgetLight" parent="@style/Theme.AppCompat">
+		<item name="android:spinnerDropDownItemStyle">@style/ActionBarDropDownSpinnerLight</item>
+	</style>
+
+	<style name="ActionBarDropDownLight" parent="@style/Widget.AppCompat.Spinner.DropDown.ActionBar">
+		<item name="background">@color/actionbar_light_color</item>
+		<item name="android:background">@color/actionbar_light_color</item>
+		<item name="android:popupBackground">@color/actionbar_light_color</item>
+	</style>
+
+	<style name="ActionBarDropDownSpinnerLight" parent="Widget.AppCompat.DropDownItem.Spinner">
+		<item name="android:textAppearance">@style/ActionBarDropDownTextLight</item>
+	</style>
+
+	<style name="ActionBarDropDownTextLight" parent="TextAppearance.AppCompat.Widget.DropDownItem">
+		<item name="android:textColor">@color/color_white</item>
+	</style>
+
 	<!-- Dialog popup -->
 	<style name="Animations" />
 	<!-- PopDownMenu -->
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 0055b30849..ea7a0d108a 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -795,14 +795,12 @@ public class OsmandApplication extends Application {
 	}
 
 	public void applyTheme(Context c) {
-		int t = R.style.OsmandLightDarkActionBarTheme;
+		int t = R.style.OsmandDarkTheme;
         boolean mainmenu = c instanceof MainMenuActivity;
 		if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_DARK_THEME) {
 			t = mainmenu ? R.style.DashboardDarkTheme : R.style.OsmandDarkTheme;
 		} else if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME) {
 			t = mainmenu ? R.style.DashboardLightTheme : R.style.OsmandLightTheme;
-		} else if (osmandSettings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_DARK_ACTIONBAR_THEME) {
-			t = R.style.OsmandLightDarkActionBarTheme;
 		}
 		setLanguage(c);
 		c.setTheme(t);