From 4eef7998285ebd2e1c9baace3c027023e2907cba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 15 Oct 2014 13:29:20 +0400
Subject: remove actionbarsherlock, switch to appcompat stuff

---
 res/menu/article_content_img_context_menu.xml | 12 +++---
 res/menu/article_link_context_menu.xml        |  6 +--
 res/menu/headlines_action_menu.xml            |  8 ++--
 res/menu/headlines_context_menu.xml           | 18 ++++-----
 res/menu/main_menu.xml                        | 58 +++++++++++++--------------
 res/menu/offline_menu.xml                     | 36 ++++++++---------
 res/menu/share_menu.xml                       |  4 +-
 res/values-v14/arrays.xml                     | 16 --------
 res/values/style.xml                          | 36 ++---------------
 9 files changed, 74 insertions(+), 120 deletions(-)
 delete mode 100644 res/values-v14/arrays.xml

(limited to 'res')

diff --git a/res/menu/article_content_img_context_menu.xml b/res/menu/article_content_img_context_menu.xml
index 128a21df..691a1401 100644
--- a/res/menu/article_content_img_context_menu.xml
+++ b/res/menu/article_content_img_context_menu.xml
@@ -1,26 +1,26 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/article_img_open"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/article_img_open"/>
     <item
         android:id="@+id/article_img_copy"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/article_link_copy"/>
     <item
         android:id="@+id/article_img_share"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/article_img_share"/>
     <item
         android:id="@+id/article_img_view_caption"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/article_img_view_caption"/>
 
     <!--
           <item
         android:id="@+id/article_img_save"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="Save image to file"/>
     -->
 
diff --git a/res/menu/article_link_context_menu.xml b/res/menu/article_link_context_menu.xml
index 21fa3f76..8317d5e0 100644
--- a/res/menu/article_link_context_menu.xml
+++ b/res/menu/article_link_context_menu.xml
@@ -1,13 +1,13 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/article_link_share"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/share_article"/>
 
     <item
         android:id="@+id/article_link_copy"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/article_link_copy"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml
index f6e97d93..462fac40 100644
--- a/res/menu/headlines_action_menu.xml
+++ b/res/menu/headlines_action_menu.xml
@@ -1,21 +1,21 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/selection_toggle_unread"
-        android:showAsAction="ifRoom"
+        ugh:showAsAction="ifRoom"
         android:icon="@drawable/ic_unread_light"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
         android:icon="@drawable/ic_unimportant_light"
-        android:showAsAction="ifRoom"
+        ugh:showAsAction="ifRoom"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
         android:icon="@drawable/ic_menu_unpublished_light"
-        android:showAsAction="ifRoom"
+        ugh:showAsAction="ifRoom"
         android:title="@string/selection_toggle_published"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/headlines_context_menu.xml b/res/menu/headlines_context_menu.xml
index d50fac1d..de930a23 100644
--- a/res/menu/headlines_context_menu.xml
+++ b/res/menu/headlines_context_menu.xml
@@ -1,41 +1,41 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/selection_toggle_unread"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/context_selection_toggle_unread"/>
     <item
         android:id="@+id/selection_toggle_marked"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/context_selection_toggle_marked"/>
     <item
         android:id="@+id/selection_toggle_published"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/context_selection_toggle_published"/>
 
     <group android:id="@+id/menu_group_single_article" >
         <item
             android:id="@+id/headlines_share_article"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/share_article"/>
         <item
             android:id="@+id/headlines_article_link_open"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/open_article_in_web_browser"/>
         <item
             android:id="@+id/headlines_article_link_copy"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/article_link_copy"/>
         <item
             android:id="@+id/catchup_above"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/article_mark_read_above"/>
         <item
             android:id="@+id/set_labels"
             android:title="@string/article_set_labels"/>
         <item
             android:id="@+id/article_set_note"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/article_set_note"/>
     </group>
 
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index b6708983..e4a9776b 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -1,4 +1,4 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
 
     <group android:id="@+id/menu_group_logged_in" >
         <group android:id="@+id/menu_group_feeds" >
@@ -7,74 +7,74 @@
                  <item
                 android:id="@+id/back_to_categories"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/back_to_categories"/>
             -->
 
             <item
                 android:id="@+id/subscribe_to_feed"
                 android:icon="@drawable/ic_new_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/subscribe_to_feed"/>
 
             <item
                 android:id="@+id/show_feeds"
                 android:icon="@drawable/ic_list_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/menu_all_feeds"/>
             <item
                 android:id="@+id/go_offline"
                 android:icon="@drawable/ic_cloud_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/go_offline"/>            
             <item
                 android:id="@+id/update_feeds"
                 android:icon="@drawable/ic_refresh_light"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/update_feeds"/>
             <item
                 android:id="@+id/logout"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/logout"/>
         </group>
         <group android:id="@+id/menu_group_headlines" >
             <item
                 android:id="@+id/update_headlines"
                 android:icon="@drawable/ic_refresh_light" 
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/update_headlines"/>
             <item
                 android:id="@+id/search"
-                android:actionViewClass="android.widget.SearchView"
+                ugh:actionViewClass="android.widget.SearchView"
                 android:icon="@drawable/ic_search_light"
-                android:showAsAction="ifRoom|collapseActionView"
+                ugh:showAsAction="ifRoom|collapseActionView"
                 android:title="@string/search"/>
             <item
                 android:id="@+id/headlines_mark_as_read"
                 android:icon="@drawable/ic_accept_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/headlines_mark_as_read"/>
             <item
                 android:id="@+id/headlines_select"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:icon="@drawable/ic_select_all_light"
                 android:title="@string/headlines_select"/>
 
             <item
                 android:id="@+id/headlines_view_mode"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/headlines_view_mode"/>
             
             <item
                 android:id="@+id/headlines_toggle_sidebar"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/toggle_sidebar"/>
             
             <!--
                   <item
                 android:id="@+id/close_feed"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/close_feed"/>
             -->
 
@@ -82,53 +82,53 @@
         <!--  <group android:id="@+id/menu_group_headlines_selection" >
             <item
                 android:id="@+id/selection_toggle_unread"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_unread"/>
             <item
                 android:id="@+id/selection_toggle_marked"
                 android:icon="@drawable/ic_unimportant_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_marked"/>
             <item
                 android:id="@+id/selection_toggle_published"
                 android:icon="@drawable/ic_menu_unpublished_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_published"/>
             <item
                 android:id="@+id/selection_select_none"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/selection_select_none"/>
         </group> -->
         <group android:id="@+id/menu_group_article" >
             <item
                 android:id="@+id/toggle_marked"
                 android:icon="@drawable/ic_unimportant_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
             <item
                 android:id="@+id/toggle_published"
                 android:icon="@drawable/ic_menu_unpublished_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
             <item
                 android:id="@+id/toggle_attachments"
                 android:icon="@drawable/ic_menu_attaches_light"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/attachments_prompt"/>
             <item
                 android:id="@+id/share_article"
                 android:icon="@drawable/ic_share_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/share_article"/>
             <!--  android:actionProviderClass="android.widget.ShareActionProvider" -->
             <item
                 android:id="@+id/set_labels"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:icon="@drawable/ic_labels_light"
                 android:title="@string/article_set_labels"/>
             <item
                 android:id="@+id/article_set_note"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/article_set_note"/>
 
             <item
@@ -138,28 +138,28 @@
             <item
                 android:id="@+id/set_unread"
                 android:icon="@drawable/ic_read_light"
-                android:showAsAction="ifRoom"
+                ugh:showAsAction="ifRoom"
                 android:title="@string/article_set_unread"/>
 
         </group>
 
         <item
             android:id="@+id/donate"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/trial_purchase"/>
     </group>
 
     <item
         android:id="@+id/preferences"
         android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/preferences"/>
 
     <group android:id="@+id/menu_group_logged_out" >
         <item
             android:id="@+id/login"
             android:icon="@android:drawable/ic_menu_rotate"
-            android:showAsAction="ifRoom|withText"
+            ugh:showAsAction="ifRoom|withText"
             android:title="@string/login_login"/>
     </group>
 
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 90e2e4aa..a1bbf222 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -1,64 +1,64 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" >
 
     <group android:id="@+id/menu_group_feeds" >
         <item
             android:id="@+id/go_online"
             android:icon="@drawable/ic_cloud_light"
-            android:showAsAction="ifRoom|withText"
+            ugh:showAsAction="ifRoom|withText"
             android:title="@string/go_online"
             android:visible="false"/>
         <item
             android:id="@+id/show_feeds"
             android:icon="@drawable/ic_list_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/menu_all_feeds"/>
     </group>
     <group android:id="@+id/menu_group_headlines" >
         <item
             android:id="@+id/search"
-            android:actionViewClass="android.widget.SearchView"
+            ugh:actionViewClass="android.widget.SearchView"
             android:icon="@drawable/ic_search_light"
-            android:showAsAction="ifRoom|collapseActionView"
+            ugh:showAsAction="ifRoom|collapseActionView"
             android:title="@string/search"/>
         <item
             android:id="@+id/headlines_mark_as_read"
             android:icon="@drawable/ic_accept_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/headlines_mark_as_read"/>
         <item
             android:id="@+id/headlines_select"
             android:icon="@drawable/ic_select_all_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/headlines_select"/>
         <item
             android:id="@+id/headlines_view_mode"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/headlines_view_mode"/>
         
         <item
                 android:id="@+id/headlines_toggle_sidebar"
-                android:showAsAction=""
+                ugh:showAsAction=""
                 android:title="@string/toggle_sidebar"/>
     </group>
     <!--
     <group android:id="@+id/menu_group_headlines_selection" >
         <item
             android:id="@+id/selection_toggle_unread"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/selection_toggle_unread"/>
         <item
             android:id="@+id/selection_toggle_marked"
             android:icon="@drawable/ic_unimportant_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/selection_toggle_marked"/>
         <item
             android:id="@+id/selection_toggle_published"
             android:icon="@drawable/ic_menu_unpublished_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/selection_toggle_published"/>
         <item
             android:id="@+id/selection_select_none"
-            android:showAsAction=""
+            ugh:showAsAction=""
             android:title="@string/selection_select_none"/>
     </group>
     -->
@@ -66,22 +66,22 @@
         <item
             android:id="@+id/toggle_marked"
             android:icon="@drawable/ic_unimportant_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/article_toggle_marked"/>
         <item
             android:id="@+id/toggle_published"
             android:icon="@drawable/ic_menu_unpublished_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/article_toggle_published"/>
         <item
             android:id="@+id/share_article"
             android:icon="@drawable/ic_share_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/share_article"/>
         <item
             android:id="@+id/set_unread"
             android:icon="@drawable/ic_read_light"
-            android:showAsAction="ifRoom"
+            ugh:showAsAction="ifRoom"
             android:title="@string/article_set_unread"/>
         <item
             android:id="@+id/catchup_above"
@@ -90,7 +90,7 @@
 
     <item
         android:id="@+id/preferences"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/preferences"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/share_menu.xml b/res/menu/share_menu.xml
index 7eb79800..f2cb8145 100644
--- a/res/menu/share_menu.xml
+++ b/res/menu/share_menu.xml
@@ -1,9 +1,9 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/preferences"
         android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction=""
+        ugh:showAsAction=""
         android:title="@string/preferences"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/values-v14/arrays.xml b/res/values-v14/arrays.xml
deleted file mode 100644
index 349182f2..00000000
--- a/res/values-v14/arrays.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources>
-    <string-array name="pref_theme_names">
-        <item>@string/theme_dark</item>
-        <item>@string/theme_dark_gray</item>
-        <item>@string/theme_light</item>
-        <item>@string/theme_sepia</item>        
-        <item>@string/theme_system</item>
-    </string-array>
-    <string-array name="pref_theme_values" translatable="false">
-        <item>THEME_DARK</item>
-        <item>THEME_DARK_GRAY</item>
-        <item>THEME_LIGHT</item>
-        <item>THEME_SEPIA</item>
-        <item>THEME_SYSTEM</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index f5cdda92..0d2a1153 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -1,5 +1,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="LightTheme" parent="Theme.Sherlock.Light.DarkActionBar">
+	<style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
 	    <item name="smallScreenBackground">#eeeeee</item>
 		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
 		<item name="feedlistBackground"><!--  #e0e0e0 -->@drawable/shadow_feeds</item>
@@ -46,7 +46,7 @@
         <!--  <item name="android:actionBarStyle">@style/ActionBarSepia</item> -->
 	</style>
 	
-	<style name="DarkTheme" parent="Theme.Sherlock">
+	<style name="DarkTheme" parent="Theme.AppCompat">
 	    <item name="smallScreenBackground">@android:color/transparent</item>
 		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
 		<item name="feedlistBackground">@android:color/transparent</item>
@@ -76,36 +76,6 @@
     	<item name="articleNoteBackground">#303030</item>
 	</style>
 
-	<style name="SystemTheme" parent="Theme.Sherlock.DeviceDefault">
-	    <item name="smallScreenBackground">@android:color/transparent</item>
-		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-		<item name="feedlistBackground">@android:color/transparent</item>
-		<item name="unreadCounterColor">#ffffff</item>
-		<item name="headlinesBackground">@android:color/black</item>
-		<item name="headlinesBackgroundSolid">@android:color/black</item>
-		<item name="articleBackground">@android:color/black</item>
-		<item name="headlineSelectedBackground">@color/ics_cyan</item>
-		<item name="headlineUnreadBackground">#202020</item>
-		<item name="headlineNormalBackground">#151515</item>
-		<item name="feedsSelectedBackground">@color/ics_cyan</item>
-        <item name="feedlistTextColor">@android:color/primary_text_dark</item>
-        <item name="feedlistSelectedTextColor">@android:color/black</item>
-        <item name="headlineTextColor">@android:color/secondary_text_dark</item>
-        <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
-        <item name="headlineSelectedTextColor">@android:color/white</item>
-        <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
-        <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
-        <item name="headlineSecondaryTextColor">#909090</item>
-        <item name="headlineSelectedSecondaryTextColor">#404040</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
-        <item name="linkColor">@color/ics_cyan</item>
-        <item name="loadingBackground">@android:color/black</item>
-        <item name="unreadCounterBackground">@drawable/counter_background_dark</item>
-        <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
-    	<item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
-    	<item name="articleNoteBackground">#303030</item>
-	</style>
-		
 	<style name="DarkGrayTheme" parent="DarkTheme">
 	    <item name="smallScreenBackground">@color/feeds_dark_gray</item>
 		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
@@ -124,7 +94,7 @@
         <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>        
 	</style>
 	
-	<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
+	<style name="ActionBarDarkGray" parent="Widget.AppCompat.ActionBar.Solid">
     	<item name="android:background">#232527</item>
 	</style>
 
-- 
cgit v1.2.3-54-g00ecf