From 41ee43171549fe6946d7e561ae6df8a35b32179f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 5 Dec 2011 11:45:50 +0300
Subject: [PATCH] drop compat themes, use values-v11

---
 res/values-v11/style.xml            | 34 +++++++++++++++++++++++++++
 res/values/style.xml                | 36 ++---------------------------
 src/org/fox/ttrss/MainActivity.java |  4 ++--
 3 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 res/values-v11/style.xml

diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
new file mode 100644
index 00000000..454a31a7
--- /dev/null
+++ b/res/values-v11/style.xml
@@ -0,0 +1,34 @@
+<resources>
+	<style name="LightTheme" parent="android:Theme.Holo.Light">
+		<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
+		<item name="feedlistBackground">#fafafa</item>
+		<item name="unreadCounterColor">#0000ff</item>
+		<item name="headlinesBackground">#ffffff</item>
+		<item name="articleDivider">#96c5ff</item>
+		<item name="articleHeader">@android:color/transparent</item>		
+		<item name="headlineSelectedBackground">#fff7d5</item>
+		<item name="headlineUnreadBackground">#ffffff</item>
+		<item name="headlineNormalBackground">@android:color/transparent</item>
+		<item name="feedsSelectedBackground">#96C5FF</item>
+		<item name="headlineSeparatorUnread">#96C5FF</item>
+		<item name="headlineSeparatorNormal">#909090</item>
+		<item name="headlineSeparatorSelected">#DBC981</item>
+	</style>
+
+	<style name="DarkTheme" parent="android:Theme.Holo">
+		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
+		<item name="feedlistBackground">#101010</item>
+		<item name="unreadCounterColor">#303030</item>
+		<item name="headlinesBackground">#000000</item>
+		<item name="articleDivider">#303060</item>
+		<item name="articleHeader">@android:color/transparent</item>
+		<item name="headlineSelectedBackground">#303060</item>
+		<item name="headlineUnreadBackground">#303030</item>
+		<item name="headlineNormalBackground">@android:color/transparent</item>
+		<item name="feedsSelectedBackground">#303060</item>
+		<item name="headlineSeparatorUnread">#303060</item>
+		<item name="headlineSeparatorNormal">#303030</item>
+		<item name="headlineSeparatorSelected">#47478E</item>
+	</style>
+	    
+</resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index 56a0ee20..779b1b3c 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -1,21 +1,5 @@
 <resources>
-	<style name="LightTheme" parent="android:Theme.Holo.Light">
-		<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
-		<item name="feedlistBackground">#fafafa</item>
-		<item name="unreadCounterColor">#0000ff</item>
-		<item name="headlinesBackground">#ffffff</item>
-		<item name="articleDivider">#96c5ff</item>
-		<item name="articleHeader">@android:color/transparent</item>		
-		<item name="headlineSelectedBackground">#fff7d5</item>
-		<item name="headlineUnreadBackground">#ffffff</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">#96C5FF</item>
-		<item name="headlineSeparatorUnread">#96C5FF</item>
-		<item name="headlineSeparatorNormal">#909090</item>
-		<item name="headlineSeparatorSelected">#DBC981</item>
-	</style>
-
-	<style name="LightCompatTheme" parent="android:Theme.Light.NoTitleBar">
+	<style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
 		<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
 		<item name="feedlistBackground">#fafafa</item>
 		<item name="unreadCounterColor">#0000ff</item>
@@ -31,23 +15,7 @@
 		<item name="headlineSeparatorSelected">#DBC981</item>
 	</style>
 	    
-	<style name="DarkTheme" parent="android:Theme.Holo">
-		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
-		<item name="feedlistBackground">#101010</item>
-		<item name="unreadCounterColor">#303030</item>
-		<item name="headlinesBackground">#000000</item>
-		<item name="articleDivider">#303060</item>
-		<item name="articleHeader">@android:color/transparent</item>
-		<item name="headlineSelectedBackground">#303060</item>
-		<item name="headlineUnreadBackground">#303030</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">#303060</item>
-		<item name="headlineSeparatorUnread">#303060</item>
-		<item name="headlineSeparatorNormal">#303030</item>
-		<item name="headlineSeparatorSelected">#47478E</item>
-	</style>
-	
-	<style name="DarkCompatTheme" parent="android:Theme.Black.NoTitleBar">
+	<style name="DarkTheme" parent="android:Theme.Black.NoTitleBar">
 		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
 		<item name="feedlistBackground">#101010</item>
 		<item name="unreadCounterColor">#303030</item>
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 799d5270..834eb584 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -284,9 +284,9 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
 		m_compatMode = android.os.Build.VERSION.SDK_INT <= 10;
 		
 		if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
-			setTheme(m_compatMode ? R.style.DarkCompatTheme : R.style.DarkTheme);
+			setTheme(R.style.DarkTheme);
 		} else {
-			setTheme(m_compatMode ? R.style.LightCompatTheme : R.style.LightTheme);
+			setTheme(R.style.LightTheme);
 		}
 
 		super.onCreate(savedInstanceState);