From 05f923ebe256b71636e2369d48450a52ab87f944 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sun, 25 Mar 2018 16:00:42 +0900
Subject: [Ture Black] True Black Theme for AMOLED

Add true black themese
Modified code that fails to support three themes
---
 core/src/main/res/values-v19/colors.xml |  1 +
 core/src/main/res/values-v21/styles.xml | 13 +++++++++++
 core/src/main/res/values/arrays.xml     |  2 ++
 core/src/main/res/values/colors.xml     |  1 +
 core/src/main/res/values/strings.xml    |  1 +
 core/src/main/res/values/styles.xml     | 40 +++++++++++++++++++++++++++++++++
 6 files changed, 58 insertions(+)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values-v19/colors.xml b/core/src/main/res/values-v19/colors.xml
index 16c065d75..08982735a 100644
--- a/core/src/main/res/values-v19/colors.xml
+++ b/core/src/main/res/values-v19/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="selection_background_color_dark">#484B4D</color>
+    <color name="selection_background_color_trueblack">#000000</color>
     <color name="selection_background_color_light">#E3E3E3</color>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
index 503337c95..c53000c4f 100644
--- a/core/src/main/res/values-v21/styles.xml
+++ b/core/src/main/res/values-v21/styles.xml
@@ -6,6 +6,19 @@
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
         <item name="android:windowContentTransitions">true</item>
     </style>
+    <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:colorAccent">@color/white</item>
+        <item name="android:colorPrimary">@color/black</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+    </style>
+    <style name="Theme.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.TrueBlack.NoTitle">
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:colorAccent">@color/white</item>
+        <item name="android:colorPrimary">@color/black</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+    </style>
 
     <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button">
         <item name="textAllCaps">true</item>
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 45650495c..980e62842 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -137,10 +137,12 @@
     <string-array name="theme_options">
         <item>@string/pref_theme_title_light</item>
         <item>@string/pref_theme_title_dark</item>
+        <item>@string/pref_theme_title_trueblack</item>
     </string-array>
     <string-array name="theme_values">
         <item>0</item>
         <item>1</item>
+        <item>2</item>
     </string-array>
 
     <string-array name="nav_drawer_titles">
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 981d16d03..9d020b0e4 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -29,6 +29,7 @@
 
     <color name="highlight_light">#DDDDDD</color>
     <color name="highlight_dark">#414141</color>
+    <color name="highlight_trueblack">#000000</color>
 
     <color name="antennapod_blue">#147BAF</color>
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f0eed3e38..4f558ae56 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -374,6 +374,7 @@
     <string name="pref_episode_cache_title">Episode Cache</string>
     <string name="pref_theme_title_light">Light</string>
     <string name="pref_theme_title_dark">Dark</string>
+    <string name="pref_theme_title_trueblack">True Black</string>
     <string name="pref_episode_cache_unlimited">Unlimited</string>
     <string name="pref_update_interval_hours_plural">hours</string>
     <string name="pref_update_interval_hours_singular">hour</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index b9a9fb293..441c7addd 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -127,6 +127,26 @@
         <item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
     </style>
 
+    <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
+        <!-- Room for API dependent attributes -->
+    </style>
+
+    <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
+        <item name="attr/non_transparent_background">@color/black</item>
+        <item name="attr/overlay_background">@color/overlay_dark</item>
+        <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="attr/dragview_float_background">@color/black</item>
+        <item name="attr/nav_drawer_background">@color/black</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:color">@color/white</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:actionBarStyle">@color/black</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+    </style>
+
+
     <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle">
         <!-- Room for API dependent attributes -->
     </style>
@@ -255,6 +275,26 @@
         <item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
     </style>
 
+    <style name="Theme.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.TrueBlack.NoTitle">
+        <!-- Room for API dependent attributes -->
+    </style>
+
+    <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
+        <item name="attr/non_transparent_background">@color/black</item>
+        <item name="attr/overlay_background">@color/black</item>
+        <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="attr/dragview_float_background">@color/black</item>
+        <item name="attr/nav_drawer_background">@color/black</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:color">@color/white</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:actionBarStyle">@color/black</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+    </style>
+
+
     <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/bg_splash</item>
     </style>
-- 
cgit v1.2.3


From deb2cea72f0f50d5ad2e3248bc8adc65ac896275 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sat, 14 Apr 2018 14:09:19 +0900
Subject: [True Black] Cleaning up Code

Remove unused imports and redundant values
Coding style adjustment
---
 .../res/drawable/progress_bar_horizontal_trueblack.xml    | 15 +++++++++++++++
 core/src/main/res/values-v19/colors.xml                   |  1 -
 core/src/main/res/values/colors.xml                       |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml b/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
new file mode 100644
index 000000000..73ad5b37c
--- /dev/null
+++ b/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#33FFFFFF"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="@color/holo_blue_dark"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/values-v19/colors.xml b/core/src/main/res/values-v19/colors.xml
index 08982735a..16c065d75 100644
--- a/core/src/main/res/values-v19/colors.xml
+++ b/core/src/main/res/values-v19/colors.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="selection_background_color_dark">#484B4D</color>
-    <color name="selection_background_color_trueblack">#000000</color>
     <color name="selection_background_color_light">#E3E3E3</color>
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 9d020b0e4..84ae5cbc0 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -21,6 +21,7 @@
     <color name="new_indicator_green">#669900</color>
     <color name="image_readability_tint">#80000000</color>
 
+    <color name="selection_background_color_trueblack">#286E8A</color>
     <color name="selection_background_color_dark">#286E8A</color>
     <color name="selection_background_color_light">#81CFEA</color>
 
-- 
cgit v1.2.3


From 12ee8d89b2fd7eeebcf3ec0432ffb343e07f81d2 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sat, 14 Apr 2018 14:29:47 +0900
Subject: [True Black] Fix UI Elements

Add true black style for progress bar
Add true black style for item description
Add true black style for web description
---
 core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml | 2 +-
 core/src/main/res/values/styles.xml                              | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml b/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
index 73ad5b37c..604bb2655 100644
--- a/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
+++ b/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <solid android:color="#33FFFFFF"/>
+            <solid android:color="#000000"/>
         </shape>
     </item>
     <item android:id="@android:id/progress">
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 441c7addd..7587585cc 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -132,6 +132,7 @@
     </style>
 
     <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
+        <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
         <item name="attr/non_transparent_background">@color/black</item>
         <item name="attr/overlay_background">@color/overlay_dark</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
@@ -280,6 +281,7 @@
     </style>
 
     <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
+        <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
         <item name="attr/non_transparent_background">@color/black</item>
         <item name="attr/overlay_background">@color/black</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
@@ -382,4 +384,9 @@
         <item name="android:progressDrawable">@drawable/progress_bar_horizontal_dark</item>
     </style>
 
+    <style name="ProgressBarTrueBlack">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@drawable/progress_bar_horizontal_trueblack</item>
+    </style>
+
 </resources>
-- 
cgit v1.2.3


From 7ad176ce299bb2abfa3698ce64ffc69b16cfdc8b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 10 Jan 2018 21:50:29 +0100
Subject: Added notification categories

Android treats IMPORTANCE_DEFAULT as IMPORTANCE_HIGH
https://issuetracker.google.com/issues/65108694
---
 core/src/main/res/values/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 46bac68c9..2e7cc7149 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -709,4 +709,14 @@
     <string name="cast_failed_seek">Failed to seek to the new position on the cast device</string>
     <string name="cast_failed_receiver_player_error">Receiver player has encountered a severe error</string>
     <string name="cast_failed_media_error_skipping">Error playing media. Skipping&#8230;</string>
+
+    <!-- Notification channels -->
+    <string name="notification_channel_user_action">Action required</string>
+    <string name="notification_channel_user_action_description">Shown if your action is required</string>
+    <string name="notification_channel_downloading">Downloading</string>
+    <string name="notification_channel_downloading_description">Shown while currently downloading</string>
+    <string name="notification_channel_playing">Currently playing</string>
+    <string name="notification_channel_playing_description">Allows to control playback</string>
+    <string name="notification_channel_error">Errors</string>
+    <string name="notification_channel_error_description">Shown if something went wrong</string>
 </resources>
-- 
cgit v1.2.3


From 3e98ab61ea50b320989c26f6548303fd91447073 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 22:21:46 +0200
Subject: Start PlaybackService lazily to allow using ForegroundService

---
 core/src/main/res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2e7cc7149..5759912d1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="free_space_label">%1$s free</string>
     <string name="episode_cache_full_title">Episode cache full</string>
     <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="synchronizing">Synchronizing…</string>
 
     <!-- Statistics fragment -->
     <string name="total_time_listened_to_podcasts">Total time of podcasts played:</string>
@@ -719,4 +720,6 @@
     <string name="notification_channel_playing_description">Allows to control playback</string>
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong</string>
+    <string name="notification_channel_gpodnet">gpodder.net</string>
+    <string name="notification_channel_gpodnet_description">Shown while currently synchronizing</string>
 </resources>
-- 
cgit v1.2.3


From 686801fea2fbe162fae9f1c64ab204587e19fc95 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 4 May 2018 17:51:12 +0200
Subject: Switched to PreferenceCompat

---
 core/src/main/res/values/styles.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 77758a223..3a215588e 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -67,6 +67,7 @@
         <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="master_switch_background">@color/master_switch_background_light</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -135,6 +136,7 @@
         <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="master_switch_background">@color/master_switch_background_dark</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle">
@@ -204,6 +206,7 @@
         <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="master_switch_background">@color/master_switch_background_light</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
@@ -273,6 +276,7 @@
         <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="master_switch_background">@color/master_switch_background_dark</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
-- 
cgit v1.2.3


From 7107819a6aa61c6f171e43fe582133302d5f260b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 5 May 2018 14:04:12 +0200
Subject: Moved widget from app to core

---
 core/src/main/res/layout/player_widget.xml | 52 ++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 core/src/main/res/layout/player_widget.xml

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/layout/player_widget.xml b/core/src/main/res/layout/player_widget.xml
new file mode 100644
index 000000000..4c98895a0
--- /dev/null
+++ b/core/src/main/res/layout/player_widget.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/widget_margin" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#262C31" >
+
+        <ImageButton
+            android:id="@+id/butPlay"
+            android:contentDescription="@string/play_label"
+            android:layout_width="56dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_margin="12dp"
+            android:background="@drawable/borderless_button_dark"
+            android:src="@drawable/ic_play_arrow_white_24dp" />
+
+        <LinearLayout
+            android:id="@+id/layout_left"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@id/butPlay"
+            android:background="@drawable/borderless_button_dark"
+            android:gravity="center_vertical"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/txtvTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:maxLines="1"
+                android:text="@string/no_media_playing_label"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_medium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/txtvProgress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:textColor="@color/white" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From da85e00bd95d8cb252fde42fef93dbd9abb45546 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Tue, 15 May 2018 15:20:56 -0700
Subject: Give FeedUpdateReceiver a human-friendly label per review feedback.

---
 core/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 46bac68c9..5c06d34bd 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <!-- Activitiy and fragment titles -->
     <string name="app_name" translate="false">AntennaPod</string>
     <string name="provider_authority" translate="false">de.danoeh.antennapod.provider</string>
+    <string name="feed_update_receiver_name">Update Subscriptions</string>
     <string name="feeds_label">Feeds</string>
     <string name="statistics_label">Statistics</string>
     <string name="add_feed_label">Add Podcast</string>
-- 
cgit v1.2.3


From badc8398049314451a7c2f51a632e323786d6c7b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:14:07 +0200
Subject: Gpodder sync does not need a notification anymore

---
 core/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 5759912d1..3870e2cda 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -720,6 +720,4 @@
     <string name="notification_channel_playing_description">Allows to control playback</string>
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong</string>
-    <string name="notification_channel_gpodnet">gpodder.net</string>
-    <string name="notification_channel_gpodnet_description">Shown while currently synchronizing</string>
 </resources>
-- 
cgit v1.2.3


From aa25ab5ff4a99deff19be05b04eaedbcb7d851ad Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:17:57 +0200
Subject: Added examples to notification descriptions

---
 core/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 3870e2cda..b060d84cd 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -713,11 +713,11 @@
 
     <!-- Notification channels -->
     <string name="notification_channel_user_action">Action required</string>
-    <string name="notification_channel_user_action_description">Shown if your action is required</string>
+    <string name="notification_channel_user_action_description">Shown if your action is required, for example if you need to enter a password.</string>
     <string name="notification_channel_downloading">Downloading</string>
-    <string name="notification_channel_downloading_description">Shown while currently downloading</string>
+    <string name="notification_channel_downloading_description">Shown while currently downloading.</string>
     <string name="notification_channel_playing">Currently playing</string>
-    <string name="notification_channel_playing_description">Allows to control playback</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</string>
+    <string name="notification_channel_error_description">Shown if something went wrong, for example if download or gpodder sync fails.</string>
 </resources>
-- 
cgit v1.2.3


From ca6639892d1c0015390c09971b795ce5b755e690 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 6 Jun 2018 16:16:42 +0200
Subject: Fixed build

---
 core/src/main/res/values/styles.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 62d35eb86..908f411ee 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -145,12 +145,12 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item name="attr/non_transparent_background">@color/black</item>
-        <item name="attr/overlay_background">@color/overlay_dark</item>
-        <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
-        <item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item name="attr/dragview_float_background">@color/black</item>
-        <item name="attr/nav_drawer_background">@color/black</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/black</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
         <item name="android:windowBackground">@color/black</item>
@@ -306,12 +306,12 @@
 
     <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
         <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item name="attr/non_transparent_background">@color/black</item>
-        <item name="attr/overlay_background">@color/black</item>
-        <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
-        <item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item name="attr/dragview_float_background">@color/black</item>
-        <item name="attr/nav_drawer_background">@color/black</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</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 name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
         <item name="android:windowBackground">@color/black</item>
-- 
cgit v1.2.3


From bb716ce9eadb0b63b0b3dfea269898ef928a6ff0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 6 Jun 2018 16:32:41 +0200
Subject: Moved playing background into attr

---
 core/src/main/res/values/attrs.xml  | 1 +
 core/src/main/res/values/styles.xml | 5 +++++
 2 files changed, 6 insertions(+)

(limited to 'core/src/main/res')

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index b005d4dc3..f3c2b9b7e 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -56,6 +56,7 @@
     <attr name="ic_cast_disconnect" format="reference"/>
     <attr name="ic_swap" format="reference"/>
     <attr name="master_switch_background" format="color"/>
+    <attr name="currently_playing_background" format="color"/>
 
     <!-- Used in itemdescription -->
     <attr name="non_transparent_background" format="reference"/>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 908f411ee..0314ca431 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -67,6 +67,7 @@
         <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="master_switch_background">@color/master_switch_background_light</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
@@ -136,6 +137,7 @@
         <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="master_switch_background">@color/master_switch_background_dark</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
@@ -227,6 +229,7 @@
         <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="master_switch_background">@color/master_switch_background_light</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
@@ -297,6 +300,7 @@
         <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="master_switch_background">@color/master_switch_background_dark</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
@@ -312,6 +316,7 @@
         <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="currently_playing_background">@color/highlight_trueblack</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:color">@color/white</item>
         <item name="android:windowBackground">@color/black</item>
-- 
cgit v1.2.3