Made icons black instead of grey

Since switching to the official Toolbar theme, the back arrow and
the overflow dots are black, too.

2 files changed, 83 insertions, 96 deletions

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 40c9514f3..3dcbae206 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <attr name="action_bar_icon_color" format="reference"/>
     <attr name="action_about" format="reference"/>
     <attr name="action_search" format="reference"/>
     <attr name="action_stream" format="reference"/>
@@ -10,9 +8,8 @@
     <attr name="av_pause" format="reference"/>
     <attr name="av_play" format="reference"/>
     <attr name="av_skip" format="reference"/>
-    <attr name="av_speed" format="reference"/>
     <attr name="av_rewind" format="reference"/>
-    <attr name="content_discard" format="reference"/>
+    <attr name="ic_delete" format="reference"/>
     <attr name="content_new" format="reference"/>
     <attr name="content_remove_from_queue" format="reference"/>
     <attr name="storage" format="reference"/>
@@ -21,15 +18,15 @@
     <attr name="location_web_site" format="reference"/>
     <attr name="navigation_accept" format="reference"/>
     <attr name="navigation_cancel" format="reference"/>
-    <attr name="navigation_expand" format="reference"/>
+    <attr name="ic_load_more" format="reference"/>
     <attr name="navigation_refresh" format="reference"/>
     <attr name="navigation_up" format="reference"/>
-    <attr name="social_share" format="reference"/>
     <attr name="stat_playlist" format="reference"/>
     <attr name="ic_folder" format="reference"/>
     <attr name="type_video" format="reference"/>
     <attr name="dragview_background" format="reference"/>
     <attr name="ic_history" format="reference"/>
+    <attr name="ic_sliders" format="reference"/>
     <attr name="ic_settings_playback" format="reference"/>
     <attr name="ic_settings" format="reference"/>
     <attr name="ic_lock_open" format="reference"/>
@@ -46,11 +43,9 @@
     <attr name="ic_sort" format="reference"/>
     <attr name="ic_key" format="reference"/>
     <attr name="ic_volume_adaption" format="reference"/>
-    <attr name="ic_sd_storage" format="reference"/>
-    <attr name="ic_create_new_folder" format="reference"/>
     <attr name="ic_cast_disconnect" format="reference"/>
-    <attr name="ic_swap" format="reference"/>
-    <attr name="ic_cellphone_text" format="reference"/>
+    <attr name="ic_network" format="reference"/>
+    <attr name="ic_appearance" format="reference"/>
     <attr name="ic_questionmark" format="reference" />
     <attr name="ic_chat" format="reference"/>
     <attr name="ic_bug" format="reference" />
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 377347ebd..b6bbedd00 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -12,66 +12,62 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="android:windowBackground">@color/primary_light</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
-        <item name="action_bar_icon_color">@color/grey600</item>
-        <item name="storage">@drawable/ic_sd_grey600_24dp</item>
-        <item name="ic_swap">@drawable/ic_swap_vertical_grey600_24dp</item>
-        <item name="statistics">@drawable/ic_poll_box_grey600_24dp</item>
-        <item name="action_about">@drawable/ic_info_grey600_24dp</item>
-        <item name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item>
-        <item name="action_search">@drawable/ic_search_grey600_24dp</item>
-        <item name="action_stream">@drawable/ic_stream_grey600</item>
-        <item name="av_download">@drawable/ic_file_download_grey600_24dp</item>
-        <item name="av_pause">@drawable/ic_av_pause_dark_48dp</item>
-        <item name="av_play">@drawable/ic_av_play_dark_48dp</item>
-        <item name="av_rewind">@drawable/ic_av_fast_rewind_dark_48dp</item>
-        <item name="av_fast_forward">@drawable/ic_av_fast_forward_dark_48dp</item>
-        <item name="av_skip">@drawable/ic_av_skip_dark_48dp</item>
-        <item name="av_speed">@drawable/ic_playback_speed_dark_48dp</item>
-        <item name="ic_settings_speed">@drawable/ic_playback_speed_dark_24dp</item>
-        <item name="content_discard">@drawable/ic_delete_grey600_24dp</item>
-        <item name="content_new">@drawable/ic_add_grey600_24dp</item>
-        <item name="content_remove_from_queue">@drawable/ic_remove_grey600</item>
-        <item name="feed">@drawable/ic_feed_grey600_24dp</item>
-        <item name="location_web_site">@drawable/ic_web_grey600_24dp</item>
-        <item name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
-        <item name="navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
-        <item name="navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
-        <item name="navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="storage">@drawable/ic_storage_black</item>
+        <item name="ic_network">@drawable/ic_network_black</item>
+        <item name="statistics">@drawable/ic_statistics_black</item>
+        <item name="action_about">@drawable/ic_info_black</item>
+        <item name="checkbox_multiple">@drawable/ic_check_multiple_black</item>
+        <item name="action_search">@drawable/ic_search_black</item>
+        <item name="action_stream">@drawable/ic_stream_black</item>
+        <item name="av_download">@drawable/ic_download_black</item>
+        <item name="av_pause">@drawable/ic_av_pause_black_48dp</item>
+        <item name="av_play">@drawable/ic_av_play_black_48dp</item>
+        <item name="av_rewind">@drawable/ic_av_fast_rewind_black_48dp</item>
+        <item name="av_fast_forward">@drawable/ic_av_fast_forward_black_48dp</item>
+        <item name="av_skip">@drawable/ic_av_skip_black_48dp</item>
+        <item name="ic_settings_speed">@drawable/ic_playback_speed_black</item>
+        <item name="ic_delete">@drawable/ic_delete_black</item>
+        <item name="content_new">@drawable/ic_add_black</item>
+        <item name="content_remove_from_queue">@drawable/ic_remove_black</item>
+        <item name="feed">@drawable/ic_feed_black</item>
+        <item name="location_web_site">@drawable/ic_web_black</item>
+        <item name="navigation_accept">@drawable/ic_check_black</item>
+        <item name="navigation_cancel">@drawable/ic_cancel_black</item>
+        <item name="ic_load_more">@drawable/ic_load_more_black</item>
+        <item name="navigation_refresh">@drawable/ic_refresh_black</item>
         <item name="navigation_up">@drawable/navigation_up</item>
-        <item name="social_share">@drawable/ic_share_grey600_24dp</item>
-        <item name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
-        <item name="type_video">@drawable/ic_videocam_grey600_24dp</item>
+        <item name="stat_playlist">@drawable/ic_playlist_black</item>
+        <item name="type_video">@drawable/ic_videocam_black_24dp</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item name="drawer_activated_color">@color/highlight_light</item>
-        <item name="ic_history">@drawable/ic_history_grey600_24dp</item>
-        <item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
-        <item name="ic_settings_playback">@drawable/ic_av_play_dark_24dp</item>
-        <item name="ic_fav">@drawable/ic_star_border_grey600_24dp</item>
-        <item name="ic_unfav">@drawable/ic_star_grey600_24dp</item>
-        <item name="ic_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item name="ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
-        <item name="ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
-        <item name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
-        <item name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
-        <item name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
-        <item name="ic_select_all">@drawable/ic_select_all_grey600</item>
-        <item name="ic_select_none">@drawable/ic_select_none_grey600</item>
-        <item name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
-        <item name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
-        <item name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
+        <item name="ic_history">@drawable/ic_history_black</item>
+        <item name="ic_folder">@drawable/ic_folder_black</item>
+        <item name="ic_settings_playback">@drawable/ic_av_play_black_24dp</item>
+        <item name="ic_fav">@drawable/ic_star_border_black</item>
+        <item name="ic_unfav">@drawable/ic_star_black</item>
+        <item name="ic_settings">@drawable/ic_settings_black</item>
+        <item name="ic_lock_open">@drawable/ic_lock_open_black</item>
+        <item name="ic_lock_closed">@drawable/ic_lock_closed_black</item>
+        <item name="ic_filter">@drawable/ic_filter_black_24dp</item>
+        <item name="ic_sleep">@drawable/ic_sleep_black</item>
+        <item name="ic_sleep_off">@drawable/ic_sleep_off_black</item>
+        <item name="ic_select_all">@drawable/ic_select_all_black</item>
+        <item name="ic_select_none">@drawable/ic_select_none_black</item>
+        <item name="ic_sort">@drawable/ic_sort_black</item>
+        <item name="ic_sliders">@drawable/ic_sliders_black</item>
         <item name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
-        <item name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
-        <item name="ic_questionmark">@drawable/ic_questionmark_grey600</item>
-        <item name="ic_chat">@drawable/ic_chat_grey600</item>
-        <item name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
-        <item name="ic_bookmark">@drawable/ic_bookmark_grey600_24dp</item>
+        <item name="ic_appearance">@drawable/ic_appearance_black</item>
+        <item name="ic_questionmark">@drawable/ic_questionmark_black</item>
+        <item name="ic_chat">@drawable/ic_chat_black</item>
+        <item name="ic_bug">@drawable/ic_bug_black</item>
+        <item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
-        <item name="ic_key">@drawable/ic_key_grey600</item>
-        <item name="ic_volume_adaption">@drawable/ic_volume_adaption_grey</item>
+        <item name="ic_key">@drawable/ic_key_black</item>
+        <item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item>
         <item name="master_switch_background">@color/master_switch_background_light</item>
         <item name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-        <item name="action_icon_color">#FF757575</item>
+        <item name="action_icon_color">@color/black</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -87,58 +83,54 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
-        <item name="action_bar_icon_color">@color/white</item>
-        <item name="storage">@drawable/ic_sd_white_24dp</item>
-        <item name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item>
-        <item name="statistics">@drawable/ic_poll_box_white_24dp</item>
-        <item name="action_about">@drawable/ic_info_white_24dp</item>
-        <item name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item>
-        <item name="action_search">@drawable/ic_search_white_24dp</item>
+        <item name="storage">@drawable/ic_storage_white</item>
+        <item name="ic_network">@drawable/ic_network_white</item>
+        <item name="statistics">@drawable/ic_statistics_white</item>
+        <item name="action_about">@drawable/ic_info_white</item>
+        <item name="checkbox_multiple">@drawable/ic_check_multiple_white</item>
+        <item name="action_search">@drawable/ic_search_white</item>
         <item name="action_stream">@drawable/ic_stream_white</item>
-        <item name="av_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="av_download">@drawable/ic_download_white</item>
         <item name="av_rewind">@drawable/ic_av_fast_rewind_white_48dp</item>
         <item name="av_fast_forward">@drawable/ic_av_fast_forward_white_48dp</item>
         <item name="av_pause">@drawable/ic_av_pause_white_48dp</item>
         <item name="av_play">@drawable/ic_av_play_white_48dp</item>
         <item name="av_skip">@drawable/ic_av_skip_white_48dp</item>
-        <item name="av_speed">@drawable/ic_playback_speed_white_48dp</item>
-        <item name="ic_settings_speed">@drawable/ic_playback_speed_white_24dp</item>
-        <item name="content_discard">@drawable/ic_delete_white_24dp</item>
-        <item name="content_new">@drawable/ic_add_white_24dp</item>
+        <item name="ic_settings_speed">@drawable/ic_playback_speed_white</item>
+        <item name="ic_delete">@drawable/ic_delete_white</item>
+        <item name="content_new">@drawable/ic_add_white</item>
         <item name="content_remove_from_queue">@drawable/ic_remove_white</item>
-        <item name="feed">@drawable/ic_feed_white_24dp</item>
-        <item name="location_web_site">@drawable/ic_web_white_24dp</item>
-        <item name="navigation_accept">@drawable/ic_done_white_24dp</item>
-        <item name="navigation_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="navigation_expand">@drawable/ic_expand_more_white_36dp</item>
-        <item name="navigation_refresh">@drawable/ic_refresh_white_24dp</item>
+        <item name="feed">@drawable/ic_feed_white</item>
+        <item name="location_web_site">@drawable/ic_web_white</item>
+        <item name="navigation_accept">@drawable/ic_check_white</item>
+        <item name="navigation_cancel">@drawable/ic_cancel_white</item>
+        <item name="ic_load_more">@drawable/ic_load_more_white</item>
+        <item name="navigation_refresh">@drawable/ic_refresh_white</item>
         <item name="navigation_up">@drawable/navigation_up_dark</item>
-        <item name="social_share">@drawable/ic_share_white_24dp</item>
-        <item name="stat_playlist">@drawable/ic_list_white_24dp</item>
+        <item name="stat_playlist">@drawable/ic_playlist_white</item>
         <item name="type_video">@drawable/ic_videocam_white_24dp</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="drawer_activated_color">@color/highlight_dark</item>
-        <item name="ic_history">@drawable/ic_history_white_24dp</item>
-        <item name="ic_folder">@drawable/ic_folder_white_24dp</item>
+        <item name="ic_history">@drawable/ic_history_white</item>
+        <item name="ic_folder">@drawable/ic_folder_white</item>
         <item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item>
-        <item name="ic_fav">@drawable/ic_star_border_white_24dp</item>
-        <item name="ic_unfav">@drawable/ic_star_white_24dp</item>
-        <item name="ic_settings">@drawable/ic_settings_white_24dp</item>
-        <item name="ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
-        <item name="ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
+        <item name="ic_fav">@drawable/ic_star_border_white</item>
+        <item name="ic_unfav">@drawable/ic_star_white</item>
+        <item name="ic_settings">@drawable/ic_settings_white</item>
+        <item name="ic_lock_open">@drawable/ic_lock_open_white</item>
+        <item name="ic_lock_closed">@drawable/ic_lock_closed_white</item>
         <item name="ic_filter">@drawable/ic_filter_white_24dp</item>
-        <item name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
-        <item name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
+        <item name="ic_sleep">@drawable/ic_sleep_white</item>
+        <item name="ic_sleep_off">@drawable/ic_sleep_off_white</item>
         <item name="ic_select_all">@drawable/ic_select_all_white</item>
         <item name="ic_select_none">@drawable/ic_select_none_white</item>
-        <item name="ic_sort">@drawable/ic_sort_white_24dp</item>
-        <item name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
-        <item name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
+        <item name="ic_sort">@drawable/ic_sort_white</item>
+        <item name="ic_sliders">@drawable/ic_sliders_white</item>
         <item name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
-        <item name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
+        <item name="ic_appearance">@drawable/ic_appearance_white</item>
         <item name="ic_questionmark">@drawable/ic_questionmark_white</item>
         <item name="ic_chat">@drawable/ic_chat_white</item>
-        <item name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item name="ic_bug">@drawable/ic_bug_white</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
         <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
         <item name="ic_key">@drawable/ic_key_white</item>