Merge pull request #5942 from TacoTheDank/newPlaylistIcons

Use new material playlist drawables

8 files changed, 44 insertions, 17 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index f87131e1f..77d71bfb8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -435,7 +435,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
             throws InterruptedException {
         List<MediaBrowserCompat.MediaItem> mediaItems = new ArrayList<>();
         if (parentId.equals(getResources().getString(R.string.app_name))) {
-            mediaItems.add(createBrowsableMediaItem(R.string.queue_label, R.drawable.ic_playlist_black,
+            mediaItems.add(createBrowsableMediaItem(R.string.queue_label, R.drawable.ic_playlist_play_black,
                     DBReader.getQueue().size()));
             mediaItems.add(createBrowsableMediaItem(R.string.downloads_label, R.drawable.ic_download_black,
                     DBReader.getDownloadedItems().size()));
diff --git a/core/src/main/res/drawable-anydpi-v26/ic_playlist_shortcut.xml b/core/src/main/res/drawable-anydpi-v26/ic_playlist_shortcut.xml
index 60f95db32..5d3ce4954 100644
--- a/core/src/main/res/drawable-anydpi-v26/ic_playlist_shortcut.xml
+++ b/core/src/main/res/drawable-anydpi-v26/ic_playlist_shortcut.xml
@@ -3,7 +3,7 @@
     <background android:drawable="@color/grey100" />
     <foreground>
         <inset
-            android:drawable="@drawable/ic_playlist_black"
+            android:drawable="@drawable/ic_playlist_play_black"
             android:inset="33.3%" />
     </foreground>
 </adaptive-icon>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_playlist.xml b/core/src/main/res/drawable/ic_playlist.xml
deleted file mode 100644
index c609f9fb3..000000000
--- a/core/src/main/res/drawable/ic_playlist.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/action_icon_color" android:pathData="M19,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z"/>
-</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_black.xml b/core/src/main/res/drawable/ic_playlist_black.xml
deleted file mode 100644
index c7b0a356c..000000000
--- a/core/src/main/res/drawable/ic_playlist_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M19,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z"/>
-</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_play.xml b/core/src/main/res/drawable/ic_playlist_play.xml
new file mode 100644
index 000000000..24635798b
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playlist_play.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/action_icon_color"
+        android:pathData="M3,10h11v2h-11z" />
+    <path
+        android:fillColor="?attr/action_icon_color"
+        android:pathData="M3,6h11v2h-11z" />
+    <path
+        android:fillColor="?attr/action_icon_color"
+        android:pathData="M3,14h7v2h-7z" />
+    <path
+        android:fillColor="?attr/action_icon_color"
+        android:pathData="M16,13l0,8l6,-4z" />
+</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_play_black.xml b/core/src/main/res/drawable/ic_playlist_play_black.xml
new file mode 100644
index 000000000..adca5f7ee
--- /dev/null
+++ b/core/src/main/res/drawable/ic_playlist_play_black.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,10h11v2h-11z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,6h11v2h-11z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M3,14h7v2h-7z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16,13l0,8l6,-4z" />
+</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_remove.xml b/core/src/main/res/drawable/ic_playlist_remove.xml
index 940744924..3d62ab6cc 100644
--- a/core/src/main/res/drawable/ic_playlist_remove.xml
+++ b/core/src/main/res/drawable/ic_playlist_remove.xml
@@ -1,8 +1,9 @@
-<!-- drawable/playlist_remove.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="?attr/action_icon_color" android:pathData="M2,6V8H14V6H2M2,10V12H11V10H2M14.17,10.76L12.76,12.17L15.59,15L12.76,17.83L14.17,19.24L17,16.41L19.83,19.24L21.24,17.83L18.41,15L21.24,12.17L19.83,10.76L17,13.59L14.17,10.76M2,14V16H11V14H2Z" />
-</vector>
\ No newline at end of file
+    <path
+        android:fillColor="?attr/action_icon_color"
+        android:pathData="M14,10H3v2h11V10zM14,6H3v2h11V6zM3,16h7v-2H3V16zM14.41,22L17,19.41L19.59,22L21,20.59L18.41,18L21,15.41L19.59,14L17,16.59L14.41,14L13,15.41L15.59,18L13,20.59L14.41,22z" />
+</vector>
diff --git a/core/src/main/res/drawable/ic_playlist_shortcut.xml b/core/src/main/res/drawable/ic_playlist_shortcut.xml
index d2b5815d9..8d01f24a3 100644
--- a/core/src/main/res/drawable/ic_playlist_shortcut.xml
+++ b/core/src/main/res/drawable/ic_playlist_shortcut.xml
@@ -2,6 +2,6 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/ic_shortcut_background" />
     <item
-        android:drawable="@drawable/ic_playlist_black"
+        android:drawable="@drawable/ic_playlist_play_black"
         android:gravity="center" />
 </layer-list>