From 756e76e19d9614328c9b541ab1e2f2dc1bc7d779 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 12 Jun 2022 16:32:30 -0400 Subject: [PATCH] Use new material playlist drawables --- .../antennapod/adapter/NavListAdapter.java | 2 +- .../antennapod/fragment/QueueFragment.java | 2 +- .../swipeactions/AddToQueueSwipeAction.java | 2 +- app/src/main/res/layout/feeditemlist_item.xml | 2 +- .../menu/episodes_apply_action_speeddial.xml | 2 +- .../core/service/playback/PlaybackService.java | 2 +- .../ic_playlist_shortcut.xml | 2 +- core/src/main/res/drawable/ic_playlist.xml | 5 ----- .../main/res/drawable/ic_playlist_black.xml | 5 ----- .../src/main/res/drawable/ic_playlist_play.xml | 18 ++++++++++++++++++ .../res/drawable/ic_playlist_play_black.xml | 18 ++++++++++++++++++ .../main/res/drawable/ic_playlist_remove.xml | 9 +++++---- .../main/res/drawable/ic_playlist_shortcut.xml | 2 +- 13 files changed, 49 insertions(+), 22 deletions(-) delete mode 100644 core/src/main/res/drawable/ic_playlist.xml delete mode 100644 core/src/main/res/drawable/ic_playlist_black.xml create mode 100644 core/src/main/res/drawable/ic_playlist_play.xml create mode 100644 core/src/main/res/drawable/ic_playlist_play_black.xml diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index 442076d35..bf508cdd8 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -114,7 +114,7 @@ public class NavListAdapter extends RecyclerView.Adapter private @DrawableRes int getDrawable(String tag) { switch (tag) { case QueueFragment.TAG: - return R.drawable.ic_playlist; + return R.drawable.ic_playlist_play; case InboxFragment.TAG: return R.drawable.ic_inbox; case EpisodesFragment.TAG: diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 61f45f0f9..433193f10 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -476,7 +476,7 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi emptyView = new EmptyViewHandler(getContext()); emptyView.attachToRecyclerView(recyclerView); - emptyView.setIcon(R.drawable.ic_playlist); + emptyView.setIcon(R.drawable.ic_playlist_play); emptyView.setTitle(R.string.no_items_header_label); emptyView.setMessage(R.string.no_items_label); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/AddToQueueSwipeAction.java b/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/AddToQueueSwipeAction.java index 3580121df..729f35291 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/AddToQueueSwipeAction.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/AddToQueueSwipeAction.java @@ -18,7 +18,7 @@ public class AddToQueueSwipeAction implements SwipeAction { @Override public int getActionIcon() { - return R.drawable.ic_playlist; + return R.drawable.ic_playlist_play; } @Override diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index 675d3ee58..caca33527 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -140,7 +140,7 @@ android:layout_width="14sp" android:layout_height="14sp" android:contentDescription="@string/in_queue_label" - app:srcCompat="@drawable/ic_playlist" /> + app:srcCompat="@drawable/ic_playlist_play" /> 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 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 @@ \ 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 @@ - - - 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 @@ - - - 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 @@ + + + + + + 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 @@ + + + + + + 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 @@ - - - \ No newline at end of file + + 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 @@