Merge pull request #5116 from ByteHamster/vector-drawable-compat

Use VectorDrawable compat library

15 files changed, 43 insertions, 44 deletions

diff --git a/app/src/main/res/menu/downloads.xml b/app/src/main/res/menu/downloads.xml
index c8ee20e35..142f251fc 100644
--- a/app/src/main/res/menu/downloads.xml
+++ b/app/src/main/res/menu/downloads.xml
@@ -5,14 +5,14 @@
         android:id="@+id/episode_actions"
         android:menuCategory="container"
         android:title="@string/multi_select"
-        android:icon="?attr/checkbox_multiple"
+        android:icon="@drawable/ic_check_multiple"
         android:visible="false"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/clear_logs_item"
         android:menuCategory="container"
         android:title="@string/clear_history_label"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:visible="false"
         app:showAsAction="ifRoom" />
     <item
@@ -20,5 +20,5 @@
         android:title="@string/refresh_label"
         android:menuCategory="container"
         app:showAsAction="ifRoom"
-        android:icon="?attr/navigation_refresh"/>
+        android:icon="@drawable/ic_refresh"/>
 </menu>
diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml
index 2fac77375..22121c905 100644
--- a/app/src/main/res/menu/episodes.xml
+++ b/app/src/main/res/menu/episodes.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="collapseActionView|always"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
@@ -15,11 +15,11 @@
         android:title="@string/refresh_label"
         android:menuCategory="container"
         custom:showAsAction="always"
-        android:icon="?attr/navigation_refresh"/>
+        android:icon="@drawable/ic_refresh"/>
 
     <item
         android:id="@+id/filter_items"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:menuCategory="container"
         android:title="@string/filter"
         android:visible="false"
@@ -31,7 +31,7 @@
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:visible="false"
-        android:icon="?attr/navigation_accept"/>
+        android:icon="@drawable/ic_check"/>
 
     <item
         android:id="@+id/remove_all_new_flags_item"
@@ -39,6 +39,6 @@
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:visible="false"
-        android:icon="?attr/navigation_accept"/>
+        android:icon="@drawable/ic_check"/>
 
 </menu>
diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml
index 181300fc5..221ec4d59 100644
--- a/app/src/main/res/menu/episodes_apply_action_options.xml
+++ b/app/src/main/res/menu/episodes_apply_action_options.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/sort"
-        android:icon="?attr/ic_sort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort"
         app:showAsAction="always">
         <menu>
@@ -25,7 +25,7 @@
 
     <item
         android:id="@+id/select_options"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:title="@string/filter"
         app:showAsAction="always">
 
diff --git a/app/src/main/res/menu/episodes_apply_action_speeddial.xml b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
index 370cedd90..a2f509ec5 100644
--- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml
+++ b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
@@ -6,29 +6,29 @@
          visually it will be shown at the bottom of the list of actions.
       -->
     <item android:id="@+id/delete_batch"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete_episode_label"
         />
     <item android:id="@+id/download_batch"
-        android:icon="?attr/av_download"
+        android:icon="@drawable/ic_download"
         android:title="@string/download_label"
         />
     <item android:id="@+id/mark_unread_batch"
-        android:icon="?attr/navigation_cancel"
+        android:icon="@drawable/ic_cancel"
         android:title="@string/mark_unread_label"
         />
     <item
         android:id="@+id/mark_read_batch"
-        android:icon="?attr/navigation_accept"
+        android:icon="@drawable/ic_check"
         android:title="@string/mark_read_label"
         />
     <item android:id="@+id/remove_from_queue_batch"
-        android:icon="?attr/content_remove_from_queue"
+        android:icon="@drawable/ic_remove"
         android:title="@string/remove_from_queue_label"
         />
     <item
         android:id="@+id/add_to_queue_batch"
-        android:icon="?attr/content_new"
+        android:icon="@drawable/ic_add"
         android:title="@string/add_to_queue_label"
         />
 </menu>
diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index a5fbe0c20..83ad079b4 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -3,7 +3,7 @@
       xmlns:custom="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="true"/>
@@ -11,7 +11,7 @@
         android:id="@+id/share_parent"
         custom:showAsAction="ifRoom"
         android:title="@string/share_label_with_ellipses"
-        android:icon="?attr/ic_share"
+        android:icon="@drawable/ic_share"
         android:visible="true">
         <menu android:id="@+id/share_submenu">
             <item
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index c29229e37..5b33539e1 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -64,7 +64,7 @@
 
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label">
     </item>
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 3614cfffa..85e7a95ba 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -4,21 +4,21 @@
 
     <item
         android:id="@+id/sort_items"
-        android:icon="?attr/ic_sort"
+        android:icon="@drawable/ic_sort"
         android:menuCategory="container"
         android:title="@string/sort"
         custom:showAsAction="always">
     </item>
     <item
         android:id="@+id/filter_items"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:menuCategory="container"
         android:title="@string/filter"
         custom:showAsAction="always">
     </item>
     <item
         android:id="@+id/refresh_item"
-        android:icon="?attr/navigation_refresh"
+        android:icon="@drawable/ic_refresh"
         android:menuCategory="container"
         android:title="@string/refresh_label"
         custom:showAsAction="always">
@@ -32,7 +32,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="always|collapseActionView"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
@@ -40,13 +40,13 @@
     <item
         android:id="@+id/episode_actions"
         android:menuCategory="container"
-        android:icon="?attr/checkbox_multiple"
+        android:icon="@drawable/ic_check_multiple"
         android:title="@string/multi_select"
         custom:showAsAction="collapseActionView">
     </item>
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
@@ -79,7 +79,7 @@
 
     <item
         android:id="@+id/remove_item"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:menuCategory="container"
         android:title="@string/remove_feed_label"
         android:visible="true"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 8afdba369..a9f15317b 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -4,40 +4,40 @@
 
     <item
         android:id="@+id/add_to_favorites_item"
-        android:icon="?attr/ic_fav"
+        android:icon="@drawable/ic_star_border"
         android:title="@string/add_to_favorite_label"
         custom:showAsAction="always">
     </item>
     <item
         android:id="@+id/remove_from_favorites_item"
-        android:icon="?attr/ic_unfav"
+        android:icon="@drawable/ic_star"
         android:title="@string/remove_from_favorite_label"
         custom:showAsAction="always">
     </item>
 
     <item
         android:id="@+id/disable_sleeptimer_item"
-        android:icon="?attr/ic_sleep_off"
+        android:icon="@drawable/ic_sleep_off"
         custom:showAsAction="always"
         android:title="@string/sleep_timer_label">
     </item>
     <item
         android:id="@+id/set_sleeptimer_item"
-        android:icon="?attr/ic_sleep"
+        android:icon="@drawable/ic_sleep"
         custom:showAsAction="always"
         android:title="@string/set_sleeptimer_label">
     </item>
 
     <item
         android:id="@+id/audio_controls"
-        android:icon="?attr/ic_sliders"
+        android:icon="@drawable/ic_sliders"
         android:title="@string/audio_controls"
         custom:showAsAction="always">
     </item>
 
     <item
         android:id="@+id/open_feed_item"
-        android:icon="?attr/feed"
+        android:icon="@drawable/ic_feed"
         custom:showAsAction="collapseActionView"
         android:title="@string/open_podcast"
         android:visible="false">
@@ -45,7 +45,7 @@
 
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="false">
diff --git a/app/src/main/res/menu/online_search.xml b/app/src/main/res/menu/online_search.xml
index 93d93157a..374a054fa 100644
--- a/app/src/main/res/menu/online_search.xml
+++ b/app/src/main/res/menu/online_search.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="collapseActionView|ifRoom"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
diff --git a/app/src/main/res/menu/opml_selection_options.xml b/app/src/main/res/menu/opml_selection_options.xml
index 8b3310dc2..1b7bc9331 100644
--- a/app/src/main/res/menu/opml_selection_options.xml
+++ b/app/src/main/res/menu/opml_selection_options.xml
@@ -4,14 +4,14 @@
 
     <item
         android:id="@id/select_all_item"
-        android:icon="?attr/ic_select_all"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all_label"
         custom:showAsAction="ifRoom">
     </item>
 
     <item
         android:id="@id/deselect_all_item"
-        android:icon="?attr/ic_select_none"
+        android:icon="@drawable/ic_select_none"
         android:title="@string/deselect_all_label"
         custom:showAsAction="ifRoom">
     </item>
diff --git a/app/src/main/res/menu/playback_history.xml b/app/src/main/res/menu/playback_history.xml
index 5362f0a25..f8cfd76b0 100644
--- a/app/src/main/res/menu/playback_history.xml
+++ b/app/src/main/res/menu/playback_history.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/clear_history_item"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/clear_history_label"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index 43702e07f..adf44b8b1 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -14,11 +14,11 @@
         android:title="@string/refresh_label"
         android:menuCategory="container"
         custom:showAsAction="always"
-        android:icon="?attr/navigation_refresh"/>
+        android:icon="@drawable/ic_refresh"/>
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="collapseActionView|ifRoom"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
@@ -114,7 +114,7 @@
         android:id="@+id/clear_queue"
         android:title="@string/clear_queue_label"
         custom:showAsAction="collapseActionView"
-        android:icon="?attr/navigation_accept"/>
+        android:icon="@drawable/ic_check"/>
 
     <item
         android:id="@+id/episode_actions"
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index d3a2477be..f6ef15516 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -4,7 +4,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/action_search"
-            android:icon="?attr/action_search"
+            android:icon="@drawable/ic_search"
             app:showAsAction="collapseActionView|always"
             app:actionViewClass="androidx.appcompat.widget.SearchView"
             android:title="@string/search_label"/>
diff --git a/app/src/main/res/menu/statistics.xml b/app/src/main/res/menu/statistics.xml
index eb2a51550..9e4b7fab1 100644
--- a/app/src/main/res/menu/statistics.xml
+++ b/app/src/main/res/menu/statistics.xml
@@ -10,7 +10,7 @@
 
     <item
         android:id="@+id/statistics_mode"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:title="@string/statistics_mode"
         custom:showAsAction="never">
     </item>
diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml
index 99acc4bb6..b1cc89eb6 100644
--- a/app/src/main/res/menu/subscriptions.xml
+++ b/app/src/main/res/menu/subscriptions.xml
@@ -7,7 +7,7 @@
             android:title="@string/refresh_label"
             android:menuCategory="container"
             custom:showAsAction="always"
-            android:icon="?attr/navigation_refresh"/>
+            android:icon="@drawable/ic_refresh"/>
 
 
     <item