From eaf63156714b361298400236b02371c0994545fe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 30 Oct 2014 13:04:01 +0300
Subject: [PATCH] switch to v21 support library w/ material themes

---
 org.fox.ttrss/build.gradle                    |  4 +-
 org.fox.ttrss/org.fox.ttrss.iml               |  5 ++-
 .../java/org/fox/ttrss/OnlineActivity.java    |  8 ++--
 .../fox/ttrss/offline/OfflineActivity.java    |  4 +-
 org.fox.ttrss/src/main/res/values/style.xml   | 38 +++++++------------
 5 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 565f3b88..c92edd94 100644
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
     compile 'com.viewpagerindicator:library:2.4.1'
     compile 'com.android.support:cardview-v7:21.0.0'
-    compile 'com.android.support:support-v4:19.1.0'
+    compile 'com.android.support:support-v4:21.0.0'
     compile 'com.google.code.gson:gson:1.7.1'
-    compile 'com.android.support:appcompat-v7:19.1.0'
+    compile 'com.android.support:appcompat-v7:21.0.0'
 }
diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml
index 2b67f407..74cb1d02 100644
--- a/org.fox.ttrss/org.fox.ttrss.iml
+++ b/org.fox.ttrss/org.fox.ttrss.iml
@@ -81,15 +81,16 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="dashclock-api-r1.1" level="project" />
     <orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.6.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
     <orderEntry type="library" exported="" name="library-1.3" level="project" />
     <orderEntry type="library" exported="" name="gson-1.7.1" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.1" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
     <orderEntry type="module" module-name="taskerlocaleapi" exported="" />
   </component>
 </module>
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 7cf496d4..ef08c18f 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -153,14 +153,14 @@ public class OnlineActivity extends CommonActivity {
 		m_prefs = PreferenceManager
 				.getDefaultSharedPreferences(getApplicationContext());
 
+//        if (canUseProgress()) {
+        requestWindowFeature(Window.FEATURE_PROGRESS);
+//        }
+
 		setAppTheme(m_prefs);
 
 		super.onCreate(savedInstanceState);
 
-		if (canUseProgress()) {
-			requestWindowFeature(Window.FEATURE_PROGRESS);
-		}
-
 		//requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
 		setProgressBarVisibility(false);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index 3add9c90..d6d88c63 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -168,12 +168,12 @@ public class OfflineActivity extends CommonActivity {
 		m_prefs = PreferenceManager
 				.getDefaultSharedPreferences(getApplicationContext());
 
+        requestWindowFeature(Window.FEATURE_PROGRESS);
+
 		setAppTheme(m_prefs);
 
 		super.onCreate(savedInstanceState);
 
-		requestWindowFeature(Window.FEATURE_PROGRESS);
-
 		setProgressBarVisibility(false);
 		
 		setContentView(R.layout.login);
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index ab7f9b8f..c03d32c9 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -29,7 +29,10 @@
     	<item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item>
     	<item name="articleNoteTextColor">#9a8c59</item>
     	<item name="articleNoteBackground">#fff7d5</item>
-        <item name="android:actionBarStyle">@style/ActionBar.Light</item>    	
+
+        <item name="colorPrimary">#6482af</item>
+        <item name="colorPrimaryDark">#526A8E</item>
+        <item name="colorAccent">#88b0f0</item>
 	</style>
 
     <style name="LightTheme" parent="LightThemeBase">
@@ -48,7 +51,10 @@
 		<item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
 		<item name="feedlistTextColor">#35281C</item>
 		<item name="linkColor">#C46262</item>
-        <item name="android:actionBarStyle">@style/ActionBar.Sepia</item>
+
+        <item name="colorPrimary">#C46262</item>
+        <item name="colorPrimaryDark">#7F3F3F</item>
+        <item name="colorAccent">#E5B0A0</item>
 	</style>
 	
 	<style name="SepiaTheme" parent="SepiaThemeBase">
@@ -103,33 +109,17 @@
         <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
         <item name="headlineTextColor">@android:color/secondary_text_dark</item>
         <!--  <item name="actionBarStyle">@style/ActionBarDarkGray</item> -->
-        <item name="android:actionBarStyle">@style/ActionBar.DarkGray</item>
-        <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>        
+        <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
+
+        <item name="colorPrimary">#22667f</item>
+        <item name="colorPrimaryDark">#394a63</item>
+        <item name="colorAccent">#22667f</item>
 	</style>
 
 	<style name="DarkTheme" parent="DarkThemeBase">
 	</style>
-		
-	<style name="ActionBar.Light" parent="Widget.AppCompat.ActionBar.Solid">
-    	<item name="android:background">#6482AF</item>
-    	<item name="android:titleTextStyle">@style/ActionBarText.Light</item>
-	</style>
 
-	<style name="ActionBar.Sepia" parent="Widget.AppCompat.ActionBar.Solid">
-    	<item name="android:background">#7F3F3F</item>
-    	<item name="android:titleTextStyle">@style/ActionBarText.Light</item>
-	</style>
-	
-	<style name="ActionBarText.Light"
-           parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-		
-	<style name="ActionBar.DarkGray" parent="Widget.AppCompat.ActionBar.Solid">
-    	<item name="android:background">#394A63</item>
-	</style>
-
-	<style name="DarkDialogTheme" parent="android:Theme.Dialog">
+	<style name="DarkDialogTheme" parent="android:Theme">
     </style>
 	
 </resources>
\ No newline at end of file