Merge branch 'protected/spring-cleaning' into 'master'

Protected/spring cleaning

See merge request tt-rss/tt-rss-android!29

7 files changed, 53 insertions, 58 deletions

diff --git a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
index b3afdafc..35981c01 100644
--- a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
+++ b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
@@ -3,18 +3,21 @@
     <item
         android:id="@+id/selection_toggle_unread"
         app:showAsAction="always"
-        android:icon="@drawable/ic_email_open"
+        app:iconTint="?attr/colorControlNormal"
+        android:icon="@drawable/baseline_mark_as_unread_24"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
-        android:icon="@drawable/ic_star_outline"
+        android:icon="@drawable/baseline_star_outline_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
-        android:icon="@drawable/ic_rss_box"
+        android:icon="@drawable/baseline_rss_feed_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always"
         android:title="@string/selection_toggle_published"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
index 52ee9b26..66734665 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
@@ -2,13 +2,15 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/logcat_refresh"
-        android:icon="@drawable/ic_refresh"
+        android:icon="@drawable/baseline_refresh_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_refresh"/>
 
     <item
         android:id="@+id/logcat_copy"
-        android:icon="@drawable/ic_content_copy"
+        android:icon="@drawable/baseline_content_copy_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_copy"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index d2ef27a0..f983e224 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -12,22 +12,27 @@
         <group android:id="@+id/menu_group_headlines" >
             <item
                 android:id="@+id/search"
-                android:icon="@drawable/ic_search"
+                android:icon="@drawable/baseline_search_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/search"/>
             <item
                 android:id="@+id/headlines_mark_as_read"
                 app:showAsAction=""
+                app:iconTint="?attr/colorControlNormal"
+                android:icon="@drawable/baseline_mark_email_read_24"
                 android:title="@string/headlines_mark_as_read"/>
             <item
                 android:id="@+id/headlines_select"
                 app:showAsAction="ifRoom"
-                android:icon="@drawable/ic_select"
+                app:iconTint="?attr/colorControlNormal"
+                android:icon="@drawable/baseline_select_all_24"
                 android:title="@string/headlines_select"/>
 
             <item
                 android:id="@+id/headlines_toggle_sort_order"
-                android:icon="@drawable/ic_sort"
+                app:iconTint="?attr/colorControlNormal"
+                android:icon="@drawable/baseline_sort_by_alpha_24"
                 app:showAsAction="ifRoom"
                 android:title="@string/toggle_sort_order"/>
 
@@ -45,29 +50,31 @@
         <group android:id="@+id/menu_group_article" >
             <item
                 android:id="@+id/toggle_marked"
-                android:icon="@drawable/ic_star_outline"
+                android:icon="@drawable/baseline_star_outline_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
             <item
                 android:id="@+id/toggle_published"
-                android:icon="@drawable/ic_rss_box"
+                android:icon="@drawable/baseline_rss_feed_24"
+                app:iconTint="?attr/colorControlNormal"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
             <item
                 android:id="@+id/toggle_unread"
-                android:icon="@drawable/ic_email"
-                app:showAsAction="ifRoom"
+                android:icon="@drawable/baseline_email_24"
+                app:iconTint="?attr/colorControlNormal"
                 android:title="@string/article_toggle_unread"/>
-            <!-- <item
+            <item
                 android:id="@+id/toggle_attachments"
-                android:icon="@drawable/ic_attachment"
+                android:icon="@drawable/baseline_attach_file_24"
                 app:showAsAction=""
-                android:title="@string/attachments_prompt"/> -->
-            <!-- <item
+                android:title="@string/attachments_prompt"/>
+            <item
                 android:id="@+id/share_article"
-                android:icon="@drawable/ic_share"
+                android:icon="@drawable/baseline_share_24"
                 app:showAsAction="ifRoom"
-                android:title="@string/share_article"/> -->
+                android:title="@string/share_article"/>
             <item
                 android:id="@+id/set_labels"
                 app:showAsAction=""
@@ -76,6 +83,10 @@
                 android:id="@+id/article_set_note"
                 app:showAsAction=""
                 android:title="@string/article_set_note"/>
+            <item
+                android:id="@+id/article_set_score"
+                app:showAsAction=""
+                android:title="@string/set_score"/>
 
             <item
                 android:id="@+id/catchup_above"
@@ -83,26 +94,21 @@
 
         </group>
 
-        <!-- <item
-            android:orderInCategory="999"
-            android:id="@+id/preferences"
-            android:icon="@drawable/ic_settings"
-            app:showAsAction=""
-            android:title="@string/preferences"/> -->
-
     </group>
 
     <group android:id="@+id/menu_group_logged_out" >
         <item
             android:id="@+id/login"
-            android:icon="@drawable/ic_login"
+            android:icon="@drawable/baseline_login_24"
+            app:iconTint="?attr/colorControlNormal"
             app:showAsAction="ifRoom"
             android:title="@string/login_login"/>
 
         <item
             android:orderInCategory="999"
             android:id="@+id/preferences"
-            android:icon="@drawable/ic_settings"
+            android:icon="@drawable/baseline_settings_24"
+            app:iconTint="?attr/colorControlNormal"
             app:showAsAction="ifRoom"
             android:title="@string/preferences"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_offline.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml
index c533ae75..09dbf194 100644
--- a/org.fox.ttrss/src/main/res/menu/activity_offline.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_offline.xml
@@ -5,22 +5,22 @@
     <group android:id="@+id/menu_group_headlines" >
         <item
             android:id="@+id/search"
-            app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_search"
-            android:title="@string/search"/>
+            android:icon="@drawable/baseline_search_24"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
         <item
             android:id="@+id/headlines_mark_as_read"
             app:showAsAction=""
             android:title="@string/headlines_mark_as_read"/>
         <item
             android:id="@+id/headlines_select"
-            android:icon="@drawable/ic_select"
+            android:icon="@drawable/baseline_select_all_24"
             app:showAsAction="ifRoom"
             android:title="@string/headlines_select"/>
 
         <item
             android:id="@+id/headlines_toggle_sort_order"
-            android:icon="@drawable/ic_sort"
+            android:icon="@drawable/baseline_sort_24"
             app:showAsAction="ifRoom"
             android:title="@string/toggle_sort_order"/>
 
@@ -32,17 +32,17 @@
     <group android:id="@+id/menu_group_article" >
         <item
             android:id="@+id/toggle_marked"
-            android:icon="@drawable/ic_star_outline"
+            android:icon="@drawable/baseline_star_outline_24"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_marked"/>
         <item
             android:id="@+id/toggle_published"
-            android:icon="@drawable/ic_rss_box"
+            android:icon="@drawable/baseline_rss_feed_24"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_published"/>
         <item
             android:id="@+id/toggle_unread"
-            android:icon="@drawable/ic_email"
+            android:icon="@drawable/baseline_email_24"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_unread"/>
         <!-- <item
diff --git a/org.fox.ttrss/src/main/res/menu/activity_share.xml b/org.fox.ttrss/src/main/res/menu/activity_share.xml
index 40bb9237..2722f68b 100644
--- a/org.fox.ttrss/src/main/res/menu/activity_share.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_share.xml
@@ -2,7 +2,7 @@
 
     <item
         android:id="@+id/preferences"
-        android:icon="@drawable/ic_settings"
+        android:icon="@drawable/baseline_settings_24"
         app:showAsAction=""
         android:title="@string/preferences"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml b/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml
deleted file mode 100644
index acce1d3a..00000000
--- a/org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <item
-        android:id="@+id/article_vid_open"
-        app:showAsAction=""
-        android:title="@string/open_with"/>
-    <item
-        android:id="@+id/article_vid_copy"
-        app:showAsAction=""
-        android:icon="@drawable/ic_content_copy"
-        android:title="@string/article_link_copy"/>
-    <item
-        android:id="@+id/article_vid_share"
-        android:icon="@drawable/ic_share"
-        app:showAsAction="ifRoom"
-        android:title="@string/video_player_share"/>
-</menu>
diff --git a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
index 70e2bdfb..12bc5c20 100755
--- a/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
+++ b/org.fox.ttrss/src/main/res/menu/content_gallery_entry.xml
@@ -7,16 +7,19 @@
     <item
         android:id="@+id/article_img_copy"
         app:showAsAction=""
-        android:icon="@drawable/ic_content_copy"
+        app:iconTint="?attr/colorControlNormal"
+        android:icon="@drawable/baseline_content_copy_24"
         android:title="@string/article_link_copy"/>
     <item
         android:id="@+id/article_img_share"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/baseline_share_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction=""
         android:title="@string/img_share_image"/>
     <item
         android:id="@+id/article_img_share_url"
-        android:icon="@drawable/ic_share"
+        android:icon="@drawable/baseline_share_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction=""
         android:title="@string/img_share_url"/>
     <item