Merge branch 'develop' into work-manager

2 files changed, 155 insertions, 149 deletions

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index add2dfe14..b11f47129 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -302,6 +302,8 @@
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
     <string name="clear_queue_confirmation_msg">Please confirm that you want to clear the queue of ALL of the episodes in it</string>
+    <string name="sort_old_to_new">Old to new</string>
+    <string name="sort_new_to_old">New to old</string>
 
     <!-- Flattr -->
     <string name="flattr_auth_label">Flattr sign-in</string>
@@ -375,7 +377,7 @@
     <string name="appearance">Appearance</string>
     <string name="external_elements">External elements</string>
     <string name="interruptions">Interruptions</string>
-    <string name="buttons">Playback control buttons</string>
+    <string name="playback_control">Playback control</string>
     <string name="media_player">Media player</string>
     <string name="pref_episode_cleanup_title">Episode Cleanup</string>
     <string name="pref_episode_cleanup_summary">Episodes that aren\'t in the queue and aren\'t favorites should be eligible for removal if Auto Download needs space for new episodes</string>
@@ -472,6 +474,8 @@
     <string name="pref_gpodnet_notifications_sum">This setting does not apply to authentication errors.</string>
     <string name="pref_playback_speed_title">Playback Speeds</string>
     <string name="pref_playback_speed_sum">Customize the speeds available for variable speed audio playback</string>
+    <string name="pref_playback_time_respects_speed_title">Adjust media info to playback speed</string>
+    <string name="pref_playback_time_respects_speed_sum">Displayed position and duration are adapted to playback speed</string>
     <string name="pref_fast_forward">Fast Forward Skip Time</string>
     <string name="pref_fast_forward_sum">Customize the number of seconds to jump forward when the fast forward button is clicked</string>
     <string name="pref_rewind">Rewind Skip Time</string>
@@ -644,6 +648,7 @@
     <string name="choose_data_directory">Choose Data Folder</string>
     <string name="choose_data_directory_message">Please choose the base of your data folder. AntennaPod will create the appropriate sub-directories.</string>
     <string name="choose_data_directory_permission_rationale">Access to external storage is required to change the data folder</string>
+    <string name="choose_data_directory_available_space">%1$s free</string>
     <string name="create_folder_msg">Create new folder with name "%1$s"?</string>
     <string name="create_folder_success">Created new folder</string>
     <string name="create_folder_error_no_write_access">Cannot write to this folder</string>
@@ -796,4 +801,5 @@
     <string name="notification_channel_playing_description">Allows to control playback. This is the main notification you see while playing a podcast.</string>
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong, for example if download or gpodder sync fails.</string>
+    <string name="import_bad_file">Invalid/corrupt file</string>
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index b4fb2b3a3..d80137ea3 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -11,76 +11,76 @@
         <item name="progressBarTheme">@style/ProgressBarLight</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
-        <item type="attr" name="action_bar_icon_color">@color/grey600</item>
-        <item type="attr" name="storage">@drawable/ic_sd_grey600_24dp</item>
-        <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_grey600_24dp</item>
-        <item type="attr" name="statistics">@drawable/ic_poll_box_grey600_24dp</item>
-        <item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item>
-        <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item>
-        <item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item>
-        <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
-        <item type="attr" name="av_download">@drawable/ic_file_download_grey600_24dp</item>
-        <item type="attr" name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
-        <item type="attr" name="av_pause">@drawable/ic_pause_grey600_24dp</item>
-        <item type="attr" name="av_play">@drawable/ic_play_arrow_grey600_24dp</item>
-        <item type="attr" name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
-        <item type="attr" name="content_discard">@drawable/ic_delete_grey600_24dp</item>
-        <item type="attr" name="content_new">@drawable/ic_add_grey600_24dp</item>
-        <item type="attr" name="content_remove_from_queue">@drawable/ic_remove_grey600</item>
-        <item type="attr" name="feed">@drawable/ic_feed_grey600_24dp</item>
-        <item type="attr" name="location_web_site">@drawable/ic_web_grey600_24dp</item>
-        <item type="attr" name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
-        <item type="attr" name="navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
-        <item type="attr" name="navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
-        <item type="attr" name="navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
-        <item type="attr" name="navigation_up">@drawable/navigation_up</item>
-        <item type="attr" name="social_share">@drawable/ic_share_grey600_24dp</item>
-        <item type="attr" name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
-        <item type="attr" name="type_audio">@drawable/ic_hearing_grey600_18dp</item>
-        <item type="attr" name="type_video">@drawable/ic_remove_red_eye_grey600_18dp</item>
-        <item type="attr" name="non_transparent_background">@color/white</item>
-        <item type="attr" name="overlay_background">@color/overlay_light</item>
-        <item type="attr" name="overlay_drawable">@drawable/overlay_drawable</item>
-        <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
-        <item type="attr" name="dragview_float_background">@color/white</item>
-        <item type="attr" name="nav_drawer_background">@color/white</item>
-        <item type="attr" name="drawer_activated_color">@color/highlight_light</item>
-        <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
-        <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
-        <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
-        <item type="attr" name="av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
-        <item type="attr" name="av_pause_big">@drawable/ic_pause_grey600_36dp</item>
-        <item type="attr" name="av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
-        <item type="attr" name="av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
-        <item type="attr" name="av_skip_big">@drawable/ic_skip_grey600_36dp</item>
-        <item type="attr" name="ic_fav">@drawable/ic_star_border_grey600_24dp</item>
-        <item type="attr" name="ic_unfav">@drawable/ic_star_grey600_24dp</item>
-        <item type="attr" name="ic_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item type="attr" name="ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
-        <item type="attr" name="ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
-        <item type="attr" name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
-        <item type="attr" name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
-        <item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
-        <item type="attr" name="ic_select_all">@drawable/ic_select_all_grey600</item>
-        <item type="attr" name="ic_select_none">@drawable/ic_select_none_grey600</item>
-        <item type="attr" name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
-        <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
-        <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
-        <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
-        <item type="attr" name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
-        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
-        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
-        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
-
-        <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
-        <item type="attr" name="currently_playing_background">@color/highlight_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_settings_input_antenna_grey600_24dp</item>
+        <item name="av_download">@drawable/ic_file_download_grey600_24dp</item>
+        <item name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
+        <item name="av_pause">@drawable/ic_pause_grey600_24dp</item>
+        <item name="av_play">@drawable/ic_play_arrow_grey600_24dp</item>
+        <item name="av_rewind">@drawable/ic_fast_rewind_grey600_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="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_audio">@drawable/ic_hearing_grey600_18dp</item>
+        <item name="type_video">@drawable/ic_remove_red_eye_grey600_18dp</item>
+        <item name="non_transparent_background">@color/white</item>
+        <item name="overlay_background">@color/overlay_light</item>
+        <item name="overlay_drawable">@drawable/overlay_drawable</item>
+        <item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
+        <item name="dragview_float_background">@color/white</item>
+        <item name="nav_drawer_background">@color/white</item>
+        <item name="drawer_activated_color">@color/highlight_light</item>
+        <item name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
+        <item name="ic_history">@drawable/ic_history_grey600_24dp</item>
+        <item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
+        <item name="av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
+        <item name="av_pause_big">@drawable/ic_pause_grey600_36dp</item>
+        <item name="av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
+        <item name="av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
+        <item name="av_skip_big">@drawable/ic_skip_grey600_36dp</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_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
+        <item name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</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 type="attr" name="about_screen_background">#e5e5e5</item>
-        <item type="attr" name="about_screen_card_background">#ffffff</item>
-        <item type="attr" name="about_screen_card_border">#d2d2d2</item>
-        <item type="attr" name="about_screen_font_color">#000000</item>
+        <item name="about_screen_background">#e5e5e5</item>
+        <item name="about_screen_card_background">#ffffff</item>
+        <item name="about_screen_card_border">#d2d2d2</item>
+        <item name="about_screen_font_color">#000000</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -95,74 +95,74 @@
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
-        <item type="attr" name="action_bar_icon_color">@color/white</item>
-        <item type="attr" name="storage">@drawable/ic_sd_white_24dp</item>
-        <item type="attr" name="ic_swap">@drawable/ic_swap_vertical_white_24dp</item>
-        <item type="attr" name="statistics">@drawable/ic_poll_box_white_24dp</item>
-        <item type="attr" name="action_about">@drawable/ic_info_white_24dp</item>
-        <item type="attr" name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item>
-        <item type="attr" name="action_search">@drawable/ic_search_white_24dp</item>
-        <item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
-        <item type="attr" name="av_download">@drawable/ic_file_download_white_24dp</item>
-        <item type="attr" name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
-        <item type="attr" name="av_pause">@drawable/ic_pause_white_24dp</item>
-        <item type="attr" name="av_play">@drawable/ic_play_arrow_white_24dp</item>
-        <item type="attr" name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
-        <item type="attr" name="content_discard">@drawable/ic_delete_white_24dp</item>
-        <item type="attr" name="content_new">@drawable/ic_add_white_24dp</item>
-        <item type="attr" name="content_remove_from_queue">@drawable/ic_remove_white</item>
-        <item type="attr" name="feed">@drawable/ic_feed_white_24dp</item>
-        <item type="attr" name="location_web_site">@drawable/ic_web_white_24dp</item>
-        <item type="attr" name="navigation_accept">@drawable/ic_done_white_24dp</item>
-        <item type="attr" name="navigation_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item type="attr" name="navigation_expand">@drawable/ic_expand_more_white_36dp</item>
-        <item type="attr" name="navigation_refresh">@drawable/ic_refresh_white_24dp</item>
-        <item type="attr" name="navigation_up">@drawable/navigation_up_dark</item>
-        <item type="attr" name="social_share">@drawable/ic_share_white_24dp</item>
-        <item type="attr" name="stat_playlist">@drawable/ic_list_white_24dp</item>
-        <item type="attr" name="type_audio">@drawable/ic_hearing_white_18dp</item>
-        <item type="attr" name="type_video">@drawable/ic_remove_red_eye_white_18dp</item>
-        <item type="attr" name="non_transparent_background">@color/black</item>
-        <item type="attr" name="overlay_background">@color/overlay_dark</item>
-        <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
-        <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item>
-        <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
-        <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
-        <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
-        <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
-        <item type="attr" name="av_play_big">@drawable/ic_play_arrow_white_36dp</item>
-        <item type="attr" name="av_pause_big">@drawable/ic_pause_white_36dp</item>
-        <item type="attr" name="av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
-        <item type="attr" name="av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
-        <item type="attr" name="av_skip_big">@drawable/ic_skip_white_36dp</item>
-        <item type="attr" name="ic_fav">@drawable/ic_star_border_white_24dp</item>
-        <item type="attr" name="ic_unfav">@drawable/ic_star_white_24dp</item>
-        <item type="attr" name="ic_settings">@drawable/ic_settings_white_24dp</item>
-        <item type="attr" name="ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
-        <item type="attr" name="ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
-        <item type="attr" name="ic_filter">@drawable/ic_filter_white_24dp</item>
-        <item type="attr" name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
-        <item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
-        <item type="attr" name="ic_select_all">@drawable/ic_select_all_white</item>
-        <item type="attr" name="ic_select_none">@drawable/ic_select_none_white</item>
-        <item type="attr" name="ic_sort">@drawable/ic_sort_white_24dp</item>
-        <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
-        <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
-        <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
-        <item type="attr" name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
-        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
-        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
-        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
-        <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
-        <item type="attr" name="currently_playing_background">@color/highlight_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="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
+        <item name="av_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
+        <item name="av_pause">@drawable/ic_pause_white_24dp</item>
+        <item name="av_play">@drawable/ic_play_arrow_white_24dp</item>
+        <item name="av_rewind">@drawable/ic_fast_rewind_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="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="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="type_audio">@drawable/ic_hearing_white_18dp</item>
+        <item name="type_video">@drawable/ic_remove_red_eye_white_18dp</item>
+        <item name="non_transparent_background">@color/black</item>
+        <item name="overlay_background">@color/overlay_dark</item>
+        <item name="overlay_drawable">@drawable/overlay_drawable_dark</item>
+        <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="dragview_float_background">@color/black</item>
+        <item name="nav_drawer_background">@color/nav_drawer_background_dark</item>
+        <item name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
+        <item name="ic_new">@drawable/ic_new_releases_white_24dp</item>
+        <item name="ic_history">@drawable/ic_history_white_24dp</item>
+        <item name="ic_folder">@drawable/ic_folder_white_24dp</item>
+        <item name="av_play_big">@drawable/ic_play_arrow_white_36dp</item>
+        <item name="av_pause_big">@drawable/ic_pause_white_36dp</item>
+        <item name="av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
+        <item name="av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
+        <item name="av_skip_big">@drawable/ic_skip_white_36dp</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_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_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_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
+        <item name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
+        <item name="master_switch_background">@color/master_switch_background_dark</item>
+        <item name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
-        <item type="attr" name="about_screen_background">#303030</item>
-        <item type="attr" name="about_screen_card_background">#424242</item>
-        <item type="attr" name="about_screen_card_border">#262626</item>
-        <item type="attr" name="about_screen_font_color">#ffffff</item>
+        <item name="about_screen_background">#303030</item>
+        <item name="about_screen_card_background">#424242</item>
+        <item name="about_screen_card_border">#262626</item>
+        <item name="about_screen_font_color">#ffffff</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
@@ -171,13 +171,13 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item type="attr" name="non_transparent_background">@color/black</item>
-        <item type="attr" name="overlay_background">@color/black</item>
-        <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
-        <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">@color/black</item>
-        <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item>
+        <item name="non_transparent_background">@color/black</item>
+        <item name="overlay_background">@color/black</item>
+        <item name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
+        <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="dragview_float_background">@color/black</item>
+        <item name="nav_drawer_background">@color/black</item>
+        <item name="drawer_activated_color">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
         <item name="android:colorBackground">@color/black</item>
@@ -214,14 +214,14 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item type="attr" name="non_transparent_background">@color/black</item>
-        <item type="attr" name="overlay_background">@color/black</item>
-        <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
-        <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">@color/black</item>
-        <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item>
-        <item type="attr" name="currently_playing_background">@color/highlight_trueblack</item>
+        <item name="non_transparent_background">@color/black</item>
+        <item name="overlay_background">@color/black</item>
+        <item name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
+        <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="dragview_float_background">@color/black</item>
+        <item name="nav_drawer_background">@color/black</item>
+        <item name="drawer_activated_color">@color/highlight_trueblack</item>
+        <item name="currently_playing_background">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
         <item name="android:colorBackground">@color/black</item>