Merge branch 'develop' into add-local-feeds

5 files changed, 51 insertions, 29 deletions

diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index ba6c2f196..13ff092b0 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -233,16 +233,6 @@
         <item>3</item>
     </string-array>
 
-    <string-array name="nav_drawer_feed_filter_values">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <string-array name="nav_drawer_feed_filter_options">
-        <item>@string/no_filter_label</item>
-        <item>@string/hide_subscriptions_where_counter_is_zero</item>
-    </string-array>
-
     <string-array name="media_player_options">
         <item>@string/media_player_builtin</item>
         <item>@string/media_player_sonic</item>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 4a18f6ae6..a78f837bf 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -60,6 +60,7 @@
     <attr name="background_elevated" format="color"/>
     <attr name="filter_dialog_clear" format="reference"/>
     <attr name="filter_dialog_button_background" format="reference"/>
+    <attr name="ic_notifications" format="reference"/>
 
     <declare-styleable name="SquareImageView">
         <attr name="direction" format="enum">
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index ed0b239a5..d09f53d64 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -24,7 +24,8 @@
 
     <color name="accent_light">#0078C2</color>
     <color name="accent_dark">#3D8BFF</color>
-    <color name="ic_launcher_background">#008AB8</color>
+    <color name="icon_background_gradient_start">#0ba2ff</color>
+    <color name="icon_background_gradient_end">#0878ff</color>
 
     <color name="master_switch_background_light">#DDDDDD</color>
     <color name="master_switch_background_dark">#191919</color>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f2f8b5bec..8cb369961 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="episode_cache_full_message">The episode cache limit has been reached. You can increase the cache size in the Settings.</string>
     <string name="playback_statistics_label">Playback</string>
     <string name="download_statistics_label">Downloads</string>
+    <string name="notification_pref_fragment">Notifications</string>
 
     <!-- Statistics fragment -->
     <string name="total_time_listened_to_podcasts">Total time of podcasts played:</string>
@@ -42,7 +43,7 @@
     <string name="statistics_reset_data_msg">This will erase the history of duration played for all episodes. Are you sure you want to proceed?</string>
 
     <!-- Download Statistics fragment -->
-    <string name="total_size_downloaded_podcasts">Total size of downloaded podcasts:</string>
+    <string name="total_size_downloaded_podcasts">Total size of episodes on the device:</string>
 
     <!-- Main activity -->
     <string name="drawer_open">Open menu</string>
@@ -58,6 +59,9 @@
     <string name="drawer_feed_counter_downloaded">Number of downloaded episodes</string>
     <string name="drawer_feed_counter_none">None</string>
 
+    <!-- Bug report activity -->
+    <string name="log_file_share_exception">No compatible apps found</string>
+
     <!-- Webview actions -->
     <string name="open_in_browser_label">Open in Browser</string>
     <string name="copy_url_label">Copy URL</string>
@@ -249,7 +253,10 @@
     </plurals>
     <string name="downloads_processing">Processing downloads</string>
     <string name="download_notification_title">Downloading podcast data</string>
-    <string name="download_report_content">%1$d downloads succeeded, %2$d failed</string>
+    <plurals name="download_report_content">
+        <item quantity="one">%d download succeeded, %d failed</item>
+        <item quantity="other">%d downloads succeeded, %d failed</item>
+    </plurals>
     <string name="download_log_title_unknown">Unknown Title</string>
     <string name="download_type_feed">Feed</string>
     <string name="download_type_media">Media file</string>
@@ -441,7 +448,7 @@
     <string name="pref_gpodnet_full_sync_title">Force full synchronization</string>
     <string name="pref_gpodnet_full_sync_sum">Sync all subscriptions and episode states with gpodder.net.</string>
     <string name="pref_gpodnet_login_status"><![CDATA[Logged in as <i>%1$s</i> with device <i>%2$s</i>]]></string>
-    <string name="pref_gpodnet_notifications_title">Show sync error notifications</string>
+    <string name="pref_gpodnet_notifications_title">Synchronization failed</string>
     <string name="pref_gpodnet_notifications_sum">This setting does not apply to authentication errors.</string>
     <string name="pref_playback_speed_sum">Customize the speeds available for variable speed playback</string>
     <string name="pref_feed_playback_speed_sum">The speed to use when starting audio playback for episodes in this podcast</string>
@@ -463,15 +470,15 @@
     <string name="pref_expandNotify_sum">This usually expands the notification to show playback buttons.</string>
     <string name="pref_persistNotify_title">Persistent Playback Controls</string>
     <string name="pref_persistNotify_sum">Keep notification and lockscreen controls when playback is paused.</string>
-    <string name="pref_compact_notification_buttons_title">Set Lockscreen Buttons</string>
-    <string name="pref_compact_notification_buttons_sum">Change the playback buttons on the lockscreen. The play/pause button is always included.</string>
+    <string name="pref_compact_notification_buttons_title">Set Compact Notification Buttons</string>
+    <string name="pref_compact_notification_buttons_sum">Change the playback buttons when the notification is collapsed. The play/pause button is always included.</string>
     <string name="pref_compact_notification_buttons_dialog_title">Select a maximum of %1$d items</string>
     <string name="pref_compact_notification_buttons_dialog_error">You can only select a maximum of %1$d items.</string>
     <string name="pref_lockscreen_background_title">Set Lockscreen Background</string>
     <string name="pref_lockscreen_background_sum">Set the lockscreen background to the current episode\'s image. As a side effect, this will also show the image in third party apps.</string>
-    <string name="pref_showDownloadReport_title">Show Download Report</string>
+    <string name="pref_showDownloadReport_title">Download failed</string>
     <string name="pref_showDownloadReport_sum">If downloads fail, generate a report that shows the details of the failure.</string>
-    <string name="pref_showAutoDownloadReport_title">Show Auto Download Report</string>
+    <string name="pref_showAutoDownloadReport_title">Automatic download completed</string>
     <string name="pref_showAutoDownloadReport_sum">Show a notification for automatically downloaded episodes.</string>
     <string name="pref_expand_notify_unsupport_toast">Android versions before 4.1 do not support expanded notifications.</string>
     <string name="pref_enqueue_location_title">Enqueue Location</string>
@@ -525,17 +532,22 @@
     <string name="pref_delete_removes_from_queue_sum">Automatically remove an episode from the queue when it is deleted.</string>
     <string name="pref_filter_feed_title">Subscription Filter</string>
     <string name="pref_filter_feed_sum">Filter your subscriptions in navigation drawer and subscriptions screen.</string>
-    <string name="hide_subscriptions_where_counter_is_zero">Hide if counter is zero</string>
     <string name="no_filter_label">None</string>
     <string name="subscriptions_are_filtered">Subscriptions are filtered.</string>
+    <string name="subscriptions_counter_greater_zero">Counter greater zero</string>
+    <string name="auto_downloaded">Auto downloaded</string>
+    <string name="not_auto_downloaded">Not auto downloaded</string>
+    <string name="kept_updated">Kept updated</string>
+    <string name="not_kept_updated">Not kept updated</string>
 
     <!-- About screen -->
     <string name="about_pref">About</string>
     <string name="antennapod_version">AntennaPod version</string>
+    <string name="contributors">Contributors</string>
+    <string name="contributors_summary">Everyone can help to make AntennaPod better - with code, translations or by helping users in our forum</string>
     <string name="developers">Developers</string>
-    <string name="developers_summary">Everyone can help to make AntennaPod better</string>
     <string name="translators">Translators</string>
-    <string name="translators_summary">Translations are created by users of AntennaPod using Transifex</string>
+    <string name="special_thanks">Special thanks</string>
     <string name="privacy_policy">Privacy policy</string>
     <string name="licenses">Licenses</string>
     <string name="licenses_summary">AntennaPod uses other great software</string>
@@ -565,6 +577,7 @@
     <string name="database_export_summary">Transfer subscriptions, listened episodes and queue to AntennaPod on another device</string>
     <string name="database_import_summary">Import AntennaPod database from another device</string>
     <string name="opml_import_label">OPML Import</string>
+    <string name="opml_add_podcast_label">Import podcast list (OPML)</string>
     <string name="opml_reader_error">An error has occurred while reading the OPML document:</string>
     <string name="opml_import_error_no_file">No file selected!</string>
     <string name="select_all_label">Select all</string>
@@ -580,7 +593,8 @@
     <string name="export_success_sum">The exported file was written to:\n\n%1$s</string>
     <string name="opml_import_ask_read_permission">Access to external storage is required to read the OPML file</string>
     <string name="import_select_file">Select file to import</string>
-    <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string>
+    <string name="successful_import_label">Import successful</string>
+    <string name="import_ok">Please press OK to restart AntennaPod</string>
     <string name="import_no_downgrade">This database was exported with a newer version of AntennaPod. Your current installation does not yet know how to handle this file.</string>
     <string name="favorites_export_label">Favorites export</string>
     <string name="favorites_export_summary">Export saved favorites to file</string>
@@ -682,7 +696,6 @@
     <string name="decrease_speed">Decrease speed</string>
     <string name="media_type_audio_label">Audio</string>
     <string name="media_type_video_label">Video</string>
-    <string name="navigate_upwards_label">Navigate upwards</string>
     <string name="status_downloading_label">Episode is being downloaded</string>
     <string name="in_queue_label">Episode is in the queue</string>
     <string name="is_favorite_label">Episode is marked as favorite</string>
@@ -714,12 +727,15 @@
     <!-- Add podcast fragment -->
     <string name="search_podcast_hint">Search podcast…</string>
     <string name="search_itunes_label">Search iTunes</string>
+    <string name="search_podcastindex_label">Search Podcastindex.org</string>
     <string name="search_fyyd_label">Search fyyd</string>
     <string name="advanced">Advanced</string>
     <string name="add_podcast_by_url">Add Podcast by RSS address</string>
     <string name="add_podcast_by_url_hint" translatable="false">www.example.com/feed</string>
     <string name="browse_gpoddernet_label">Browse gpodder.net</string>
     <string name="discover">Discover</string>
+    <string name="discover_hide">Hide</string>
+    <string name="discover_is_hidden">You selected to hide suggestions.</string>
     <string name="discover_more">more »</string>
     <string name="discover_powered_by_itunes">Suggestions by iTunes</string>
     <string name="search_powered_by">Results by %1$s</string>
@@ -728,7 +744,7 @@
     <string name="local_feed_description">This virtual podcast was created by adding a folder to AntennaPod.</string>
 
     <string name="filter">Filter</string>
-    
+
     <!-- Episodes apply actions -->
     <string name="all_label">All</string>
     <string name="selected_all_label">Selected all Episodes</string>
@@ -837,7 +853,9 @@
     <string name="notification_channel_playing">Currently playing</string>
     <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="notification_channel_error_description">Shown if something went wrong, for example if download or feed update fails.</string>
+    <string name="notification_channel_sync_error">Synchronization Errors</string>
+    <string name="notification_channel_sync_error_description">Shown when gpodder synchronization fails.</string>
     <string name="notification_channel_auto_download">Auto Downloads</string>
     <string name="notification_channel_episode_auto_download">Shown when episodes have been automatically downloaded.</string>
 
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 972174da5..9ec82215a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -74,7 +74,8 @@
         <item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item>
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item>
         <item name="filter_dialog_clear">@color/filter_dialog_clear_light</item>
-        <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item>
+        <item name="filter_dialog_button_background">@drawable/filter_dialog_background_light</item>
+        <item name="ic_notifications">@drawable/ic_notifications_black</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -151,7 +152,8 @@
         <item name="ic_volume_adaption">@drawable/ic_volume_adaption_white</item>
         <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item>
         <item name="filter_dialog_clear">@color/filter_dialog_clear_dark</item>
-        <item name="filter_dialog_button_background">@color/filter_dialog_background_dark</item>
+        <item name="filter_dialog_button_background">@drawable/filter_dialog_background_dark</item>
+        <item name="ic_notifications">@drawable/ic_notifications_white</item>
     </style>
 
     <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
@@ -228,8 +230,8 @@
 
     <style name="Theme.AntennaPod.Splash" parent="Theme.MaterialComponents.NoActionBar">
         <item name="android:windowBackground">@drawable/bg_splash</item>
-        <item name="colorPrimary">@color/ic_launcher_background</item>
-        <item name="colorPrimaryDark">@color/ic_launcher_background</item>
+        <item name="colorPrimary">@color/icon_background_gradient_start</item>
+        <item name="colorPrimaryDark">@color/icon_background_gradient_start</item>
     </style>
 
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
@@ -306,4 +308,14 @@
     <style name="Widget.AntennaPod.ActionBar.Black" parent="Widget.MaterialComponents.Light.ActionBar.Solid">
         <item name="background">@color/black</item>
     </style>
+
+    <style name="AddPodcastTextView">
+        <item name="android:drawablePadding">8dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:clickable">true</item>
+    </style>
+
 </resources>