Merge pull request #1826 from TomHennen/subscriptions_view

Subscriptions view

20 files changed, 10 insertions, 0 deletions

diff --git a/core/src/main/res/drawable-hdpi/ic_add_grey_600_48dp.png b/core/src/main/res/drawable-hdpi/ic_add_grey_600_48dp.png
new file mode 100644
index 000000000..fdd230339
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_add_grey_600_48dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
new file mode 100755
index 000000000..e3dccd298
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
new file mode 100755
index 000000000..9f5c75609
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_add_grey_600_48dp.png b/core/src/main/res/drawable-mdpi/ic_add_grey_600_48dp.png
new file mode 100644
index 000000000..22cc91fd0
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_add_grey_600_48dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
new file mode 100755
index 000000000..1028bfaf3
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
new file mode 100755
index 000000000..1c5797c9e
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_add_grey_600_48dp.png b/core/src/main/res/drawable-xhdpi/ic_add_grey_600_48dp.png
new file mode 100644
index 000000000..d45901646
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_add_grey_600_48dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
new file mode 100755
index 000000000..190df8236
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
new file mode 100755
index 000000000..e5f54cef0
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_grey_600_48dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_grey_600_48dp.png
new file mode 100644
index 000000000..6e83122fd
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_add_grey_600_48dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png
new file mode 100755
index 000000000..6fbc40459
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
new file mode 100755
index 000000000..0d1ac4876
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_add_grey_600_48dp.png b/core/src/main/res/drawable-xxxhdpi/ic_add_grey_600_48dp.png
new file mode 100644
index 000000000..014ee87ca
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_add_grey_600_48dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_folder_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_folder_grey600_24dp.png
new file mode 100755
index 000000000..0107ea21c
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_folder_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
new file mode 100755
index 000000000..7a3c198ee
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 0de515292..80da376be 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -146,6 +146,7 @@
     <string-array name="nav_drawer_titles">
         <item>@string/queue_label</item>
         <item>@string/episodes_label</item>
+        <item>@string/subscriptions_label</item>
         <item>@string/downloads_label</item>
         <item>@string/playback_history_label</item>
         <item>@string/add_feed_label</item>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 74eef525a..c3ee4d3e2 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -21,6 +21,7 @@
     <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_audio" format="reference"/>
     <attr name="type_video" format="reference"/>
     <attr name="borderless_button" format="reference"/>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index 9aafd14e3..4f549efd7 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -30,6 +30,7 @@
     <dimen name="listitem_threeline_horizontalpadding">16dp</dimen>
 
     <dimen name="list_vertical_padding">8dp</dimen>
+    <dimen name="minimum_text_margin">8dp</dimen>
     <dimen name="listitem_icon_leftpadding">16dp</dimen>
     <dimen name="listitem_icon_rightpadding">16dp</dimen>
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index ab5d10b5f..5391435b7 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -22,6 +22,7 @@
     <string name="downloads_running_label">Running</string>
     <string name="downloads_completed_label">Completed</string>
     <string name="downloads_log_label">Log</string>
+    <string name="subscriptions_label">Subscriptions</string>
     <string name="cancel_download_label">Cancel\nDownload</string>
     <string name="playback_history_label">Playback History</string>
     <string name="gpodnet_main_label">gpodder.net</string>
@@ -383,6 +384,8 @@
     <string name="pref_expandNotify_sum">Always expand 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_show_subscriptions_in_drawer_title">Show Subscriptions</string>
+    <string name="pref_show_subscriptions_in_drawer_sum">Show subscription list directly in navigation drawer</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>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 27500b3e4..f7775a0bf 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -37,6 +37,7 @@
         <item name="attr/nav_drawer_background">@color/white</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item>
+        <item name="attr/ic_folder">@drawable/ic_folder_grey600_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
         <item name="attr/av_pause_big">@drawable/ic_pause_grey600_36dp</item>
         <item name="attr/av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
@@ -94,6 +95,7 @@
         <item name="attr/nav_drawer_background">#3B3B3B</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_white_24dp</item>
+        <item name="attr/ic_folder">@drawable/ic_folder_white_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item>
         <item name="attr/av_pause_big">@drawable/ic_pause_white_36dp</item>
         <item name="attr/av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
@@ -152,6 +154,7 @@
         <item name="attr/nav_drawer_background">@color/white</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item>
+        <item name="attr/ic_folder">@drawable/ic_folder_grey600_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
         <item name="attr/av_pause_big">@drawable/ic_pause_grey600_36dp</item>
         <item name="attr/av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
@@ -210,6 +213,7 @@
         <item name="attr/nav_drawer_background">#3B3B3B</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_white_24dp</item>
+        <item name="attr/ic_folder">@drawable/ic_folder_white_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item>
         <item name="attr/av_pause_big">@drawable/ic_pause_white_36dp</item>
         <item name="attr/av_ff_big">@drawable/ic_fast_forward_white_36dp</item>