From fc87d761268be0e5745fb82349c1cf66caf0477f Mon Sep 17 00:00:00 2001
From: Pavol Zibrita <pavol.zibrita@gmail.com>
Date: Sat, 18 Feb 2012 02:42:09 +0100
Subject: [PATCH] Fixed the white on white problem. Settings reverted to black.
 Correctly applying the theme

---
 OsmAnd/res/layout/editing_poi.xml             |  3 +-
 OsmAnd/res/values/styles.xml                  | 45 ++++++++++---------
 .../plus/activities/CustomTitleBar.java       |  6 ++-
 .../plus/activities/SettingsActivity.java     |  4 +-
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml
index 1777b68b3c..6b20cd6143 100644
--- a/OsmAnd/res/layout/editing_poi.xml
+++ b/OsmAnd/res/layout/editing_poi.xml
@@ -14,7 +14,8 @@
 </TableRow>
 <TableRow>
 <Button android:text="&lt;Type&gt;" android:id="@+id/TypeButton" android:layout_width="wrap_content" android:layout_height="wrap_content"/> 
-<AutoCompleteTextView style="@style/OsmandAutoCompleteTextView" android:text="" android:id="@+id/Type" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:layout_height="wrap_content"  android:layout_width ="fill_parent"/>    
+<AutoCompleteTextView 
+    android:text="" android:id="@+id/Type" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:layout_height="wrap_content"  android:layout_width ="fill_parent"/>    
 <!--  <EditText android:text="" android:id="@+id/Type" android:layout_marginLeft="5dp" android:layout_marginRight="5dp" android:layout_height="wrap_content" android:layout_width = "fill_parent" /> -->
 </TableRow>
 <TableRow>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 943098aa8c..f7b7af6434 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -48,6 +48,9 @@
 	<!-- The gray theme related styles -->
     <style name="WhiteTitleText" parent="android:style/TextAppearance.Large">
     </style>
+    <style name="WhiteText" parent="android:style/TextAppearance">
+        <item name="android:textColor">@color/activity_text</item>
+    </style>
     <style name="ListText">
         <item name="android:textSize">25sp</item>
     </style>
@@ -59,40 +62,40 @@
         <item name="android:textColor">@color/color_black</item>
     </style>
     <style name="OsmandTheme" parent="@android:style/Theme">
+        
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@color/activity_background</item>
-        <item name="android:textColor">@color/activity_text</item>
-        <item name="android:spinnerItemStyle">@style/OsmandSpinnerItem</item>
-        <item name="android:autoCompleteTextViewStyle">@style/Widget.AutoCompleteTextViewLight</item>
-    </style>
-    <style name="OsmandAutoCompleteTextView">
-		<item name="android:textColor">@color/color_black</item>
-    </style>
-    <style name="Widget.AutoCompleteTextViewLight" parent="@android:style/Widget.AutoCompleteTextView">
-		<item name="android:textColor">@color/color_black</item>
-    </style>
+        <item name="android:colorBackground">@color/activity_background</item>
+        <item name="android:colorBackgroundCacheHint">?android:attr/colorBackground</item>
+
+            
+        <item name="android:textColorPrimary">@color/activity_text</item>
+        <item name="android:textColorSecondary">@color/activity_text</item>
+        <item name="android:textColorTertiary">@color/activity_text</item>
+        
+        <item name="android:listViewStyle">@style/OsmandListView</item> <!-- makes problem on preference sub-screen, because, that is still black-->
+     </style>
     <style name="Widget.DropDownItem" parent="@android:style/Widget.DropDownItem">
 		<item name="android:textColor">@color/color_black</item>
     </style>
-    <style name="OsmandSpinnerItem" parent="android:Widget.TextView.SpinnerItem">
-        <item name="android:textAppearance">@style/OsmandTextAppearanceSpinnerItem</item>
-    </style>
-    <style name="OsmandTextAppearanceSpinnerItem" parent="android:TextAppearance.Widget.TextView.SpinnerItem">
-        <item name="android:textColor">@color/color_black</item>
-    </style>
     <style name="CustomWindowTitleBackground">
         <item name="android:background">@color/activity_background</item>
     </style>
     <style name="CustomTitleTheme" parent="OsmandTheme">
         <item name="android:windowTitleSize">46dp</item>
         <item name="android:windowTitleBackgroundStyle">@style/CustomWindowTitleBackground</item>
-        <item name="android:preferenceScreenStyle">@style/OsmandTheme</item>
     </style>
-    <style name="OsmandListView">
-        <item name="android:cacheColorHint">@color/activity_background</item>
+    <style name="CustomTitleTheme.Preference" parent="CustomTitleTheme">
+        <item name="android:windowBackground">@android:color/background_dark</item>
+        <item name="android:colorBackground">@android:color/background_dark</item>
+        <item name="android:colorBackgroundCacheHint">?android:attr/colorBackground</item>
+        </style>
+    <style name="OsmandListView" parent="@android:style/Widget.ListView">
         <item name="android:divider">@drawable/tab_text_separator</item>
     </style>
-    <style name="OsmandSpinner">
+    <style name="OsmandSpinner" parent="@android:style/Widget.TextView.SpinnerItem">
         <item name="android:textColor">@color/color_black</item>
-    </style>    
+    </style>
+    
+        
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/activities/CustomTitleBar.java b/OsmAnd/src/net/osmand/plus/activities/CustomTitleBar.java
index 4fea775f21..d79940b85f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/CustomTitleBar.java
+++ b/OsmAnd/src/net/osmand/plus/activities/CustomTitleBar.java
@@ -15,11 +15,15 @@ public class CustomTitleBar {
 	private int titleImageRes;
 
 	public CustomTitleBar(final Activity activity, int titleStringRes, int titleImageRes) {
+		this(activity,titleStringRes,titleImageRes,R.style.CustomTitleTheme);
+	}
+	
+	public CustomTitleBar(final Activity activity, int titleStringRes, int titleImageRes, int style) {
 		this.activity = activity;
 		this.titleStringRes = titleStringRes;
 		this.titleImageRes = titleImageRes;
 		
-		this.activity.setTheme(R.style.CustomTitleTheme);
+		this.activity.setTheme(style);
 		this.activity.requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 9742045767..823443c17e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -160,10 +160,8 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-    	CustomTitleBar titleBar = new CustomTitleBar(this, R.string.settings_activity, R.drawable.tab_settings_screen_icon);
+    	CustomTitleBar titleBar = new CustomTitleBar(this, R.string.settings_activity, R.drawable.tab_settings_screen_icon, R.style.CustomTitleTheme_Preference);
 		super.onCreate(savedInstanceState);
-		getListView().setCacheColorHint(getResources().getColor(R.color.activity_background));
-		getListView().setDivider(getResources().getDrawable(R.drawable.tab_text_separator));
 		addPreferencesFromResource(R.xml.settings_pref);
 		titleBar.afterSetContentView();