From 7fd4226685da15b07489eae2b857c84085a7cea2 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Mon, 10 Aug 2015 21:21:03 +0200 Subject: [PATCH] Massive clean up of attrs, colors and styles. Also icon and divider colors matching better the guidelines now. --- .../adapter/PlayingQueueAdapter.java | 2 +- .../gramophone/adapter/PlaylistAdapter.java | 4 +- .../gramophone/adapter/SearchAdapter.java | 8 +-- .../gramophone/appwidget/WidgetMedium.java | 18 +++---- .../helper/PlayingNotificationHelper.java | 22 ++++---- .../ui/activities/SearchActivity.java | 3 +- .../base/AbsSlidingMusicPanelActivity.java | 19 ++++--- .../kabouzeid/gramophone/util/ColorUtil.java | 30 +++++++++-- .../res/drawable-hdpi/ic_check_white_24dp.png | Bin 248 -> 0 bytes .../res/drawable-hdpi/ic_close_black_24dp.png | Bin 244 -> 0 bytes .../res/drawable-hdpi/ic_close_dark_24dp.png | Bin 0 -> 225 bytes .../drawable-hdpi/ic_more_vert_white_24dp.png | Bin 219 -> 0 bytes .../res/drawable-hdpi/ic_pause_black_36dp.png | Bin 144 -> 0 bytes .../res/drawable-hdpi/ic_pause_dark_36dp.png | Bin 0 -> 145 bytes .../ic_play_arrow_black_36dp.png | Bin 276 -> 0 bytes .../drawable-hdpi/ic_play_arrow_dark_36dp.png | Bin 0 -> 277 bytes .../drawable-hdpi/ic_skip_next_black_36dp.png | Bin 287 -> 0 bytes .../drawable-hdpi/ic_skip_next_dark_36dp.png | Bin 0 -> 283 bytes .../ic_skip_previous_black_36dp.png | Bin 320 -> 0 bytes .../ic_skip_previous_dark_36dp.png | Bin 0 -> 315 bytes .../res/drawable-mdpi/ic_check_white_24dp.png | Bin 180 -> 0 bytes .../res/drawable-mdpi/ic_close_black_24dp.png | Bin 195 -> 0 bytes .../res/drawable-mdpi/ic_close_dark_24dp.png | Bin 0 -> 195 bytes .../drawable-mdpi/ic_more_vert_white_24dp.png | Bin 202 -> 0 bytes .../res/drawable-mdpi/ic_pause_black_36dp.png | Bin 117 -> 0 bytes .../res/drawable-mdpi/ic_pause_dark_36dp.png | Bin 0 -> 119 bytes .../ic_play_arrow_black_36dp.png | Bin 220 -> 0 bytes .../drawable-mdpi/ic_play_arrow_dark_36dp.png | Bin 0 -> 207 bytes .../drawable-mdpi/ic_skip_next_black_36dp.png | Bin 204 -> 0 bytes .../drawable-mdpi/ic_skip_next_dark_36dp.png | Bin 0 -> 203 bytes .../ic_skip_previous_black_36dp.png | Bin 222 -> 0 bytes .../ic_skip_previous_dark_36dp.png | Bin 0 -> 221 bytes .../drawable-xhdpi/ic_check_white_24dp.png | Bin 297 -> 0 bytes .../drawable-xhdpi/ic_close_black_24dp.png | Bin 314 -> 0 bytes .../res/drawable-xhdpi/ic_close_dark_24dp.png | Bin 0 -> 306 bytes .../ic_more_vert_white_24dp.png | Bin 269 -> 0 bytes .../drawable-xhdpi/ic_pause_black_36dp.png | Bin 156 -> 0 bytes .../res/drawable-xhdpi/ic_pause_dark_36dp.png | Bin 0 -> 157 bytes .../ic_play_arrow_black_36dp.png | Bin 336 -> 0 bytes .../ic_play_arrow_dark_36dp.png | Bin 0 -> 334 bytes .../ic_skip_next_black_36dp.png | Bin 334 -> 0 bytes .../drawable-xhdpi/ic_skip_next_dark_36dp.png | Bin 0 -> 329 bytes .../ic_skip_previous_black_36dp.png | Bin 343 -> 0 bytes .../ic_skip_previous_dark_36dp.png | Bin 0 -> 341 bytes .../drawable-xxhdpi/ic_check_white_24dp.png | Bin 407 -> 0 bytes .../drawable-xxhdpi/ic_close_black_24dp.png | Bin 383 -> 0 bytes .../drawable-xxhdpi/ic_close_dark_24dp.png | Bin 0 -> 383 bytes .../ic_more_vert_white_24dp.png | Bin 313 -> 0 bytes .../drawable-xxhdpi/ic_pause_black_36dp.png | Bin 249 -> 0 bytes .../drawable-xxhdpi/ic_pause_dark_36dp.png | Bin 0 -> 248 bytes .../ic_play_arrow_black_36dp.png | Bin 425 -> 0 bytes .../ic_play_arrow_dark_36dp.png | Bin 0 -> 416 bytes .../ic_skip_next_black_36dp.png | Bin 495 -> 0 bytes .../ic_skip_next_dark_36dp.png | Bin 0 -> 488 bytes .../ic_skip_previous_black_36dp.png | Bin 518 -> 0 bytes .../ic_skip_previous_dark_36dp.png | Bin 0 -> 514 bytes .../drawable-xxxhdpi/ic_check_white_24dp.png | Bin 516 -> 0 bytes .../drawable-xxxhdpi/ic_close_black_24dp.png | Bin 513 -> 0 bytes .../drawable-xxxhdpi/ic_close_dark_24dp.png | Bin 0 -> 494 bytes .../ic_more_vert_white_24dp.png | Bin 393 -> 0 bytes .../drawable-xxxhdpi/ic_pause_black_36dp.png | Bin 364 -> 0 bytes .../drawable-xxxhdpi/ic_pause_dark_36dp.png | Bin 0 -> 365 bytes .../ic_play_arrow_black_36dp.png | Bin 519 -> 0 bytes .../ic_play_arrow_dark_36dp.png | Bin 0 -> 516 bytes .../ic_skip_next_black_36dp.png | Bin 669 -> 0 bytes .../ic_skip_next_dark_36dp.png | Bin 0 -> 662 bytes .../ic_skip_previous_black_36dp.png | Bin 677 -> 0 bytes .../ic_skip_previous_dark_36dp.png | Bin 0 -> 671 bytes .../res/drawable/notification_selector.xml | 6 +-- app/src/main/res/drawable/rect_selector.xml | 6 +-- .../main/res/drawable/rect_selector_dark.xml | 6 +-- app/src/main/res/drawable/slider_thumb.xml | 7 ++- .../res/drawable/traditional_slider_thumb.xml | 6 +-- .../traditional_slider_thumb_dark.xml | 8 --- .../main/res/layout/activity_album_detail.xml | 1 - .../res/layout/activity_album_tag_editor.xml | 13 ++--- .../res/layout/activity_artist_detail.xml | 1 - .../res/layout/activity_song_tag_editor.xml | 15 +++--- .../main/res/layout/artist_detail_header.xml | 6 +-- .../main/res/layout/dialog_sleep_timer.xml | 2 +- app/src/main/res/layout/item_grid.xml | 13 ++--- .../res/layout/item_grid_card_horizontal.xml | 4 +- app/src/main/res/layout/item_list.xml | 10 ++-- .../main/res/layout/item_list_single_row.xml | 8 ++- app/src/main/res/layout/notification.xml | 17 +++--- app/src/main/res/layout/notification_big.xml | 21 +++----- app/src/main/res/layout/player.xml | 12 ++--- app/src/main/res/layout/widget_medium.xml | 6 +-- app/src/main/res/values-v21/styles.xml | 4 ++ app/src/main/res/values/attrs.xml | 11 ---- app/src/main/res/values/colors.xml | 30 ++--------- app/src/main/res/values/materialcolors.xml | 8 +-- app/src/main/res/values/styles.xml | 16 +----- app/src/main/res/values/styles_parents.xml | 50 ++++++++---------- 94 files changed, 160 insertions(+), 233 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_check_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_close_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_pause_black_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_skip_next_black_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_skip_previous_black_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_check_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_close_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_pause_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_play_arrow_dark_36dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_skip_next_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_skip_next_dark_36dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_skip_previous_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_next_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_previous_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_arrow_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_next_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_previous_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_dark_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_next_dark_36dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_previous_dark_36dp.png delete mode 100644 app/src/main/res/drawable/traditional_slider_thumb_dark.xml diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java index 33e2ee2f..10df1f7b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java @@ -48,7 +48,7 @@ public class PlayingQueueAdapter extends ArrayAdapter { if (MusicPlayerRemote.getPosition() == position) { int iconPadding = activity.getResources().getDimensionPixelSize(R.dimen.list_item_image_icon_padding); playingIndicator.setPadding(iconPadding, iconPadding, iconPadding, iconPadding); - playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_volume_up_white_24dp, DialogUtils.resolveColor(getContext(), R.attr.themed_drawable_color))); + playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_volume_up_white_24dp, DialogUtils.resolveColor(getContext(), android.R.attr.textColorSecondary))); playingIndicator.setVisibility(View.VISIBLE); } else { playingIndicator.setVisibility(View.GONE); diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java index 7fecae82..8393af5b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java @@ -97,7 +97,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter= Build.VERSION_CODES.LOLLIPOP) { itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation)); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java index 2eb8f30f..c9ea2b71 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java @@ -29,8 +29,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import butterknife.ButterKnife; - /** * @author Karim Abou Zeid (kabouzeid) */ @@ -143,14 +141,16 @@ public class SearchAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.LOLLIPOP) { itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation)); } + if (shortSeparator != null) { + shortSeparator.setVisibility(View.GONE); + } } if (menu != null) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java index 9bcd4866..ef49081f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java +++ b/app/src/main/java/com/kabouzeid/gramophone/appwidget/WidgetMedium.java @@ -31,14 +31,6 @@ public class WidgetMedium extends AppWidgetProvider { private static RemoteViews widgetLayout; private static String currentAlbumArtUri; - @Override - public void onUpdate(@NonNull Context context, @NonNull AppWidgetManager appWidgetManager, @NonNull int[] appWidgetIds) { - updateWidgets(context, MusicPlayerRemote.getCurrentSong(), MusicPlayerRemote.isPlaying()); - for (int widgetId : appWidgetIds) { - appWidgetManager.updateAppWidget(widgetId, widgetLayout); - } - } - public static void updateWidgets(@NonNull final Context context, @NonNull final Song song, boolean isPlaying) { if (song.id == -1) return; widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium); @@ -53,7 +45,7 @@ public class WidgetMedium extends AppWidgetProvider { public static void updateWidgetsPlayState(@NonNull final Context context, boolean isPlaying) { if (widgetLayout == null) widgetLayout = new RemoteViews(context.getPackageName(), R.layout.widget_medium); - int playPauseRes = isPlaying ? R.drawable.ic_pause_black_36dp : R.drawable.ic_play_arrow_black_36dp; + int playPauseRes = isPlaying ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_play_arrow_dark_36dp; widgetLayout.setImageViewResource(R.id.button_toggle_play_pause, playPauseRes); updateWidgets(context); } @@ -145,6 +137,14 @@ public class WidgetMedium extends AppWidgetProvider { } return null; } + + @Override + public void onUpdate(@NonNull Context context, @NonNull AppWidgetManager appWidgetManager, @NonNull int[] appWidgetIds) { + updateWidgets(context, MusicPlayerRemote.getCurrentSong(), MusicPlayerRemote.isPlaying()); + for (int widgetId : appWidgetIds) { + appWidgetManager.updateAppWidget(widgetId, widgetLayout); + } + } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java index 1ec418db..44b765e1 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java @@ -272,30 +272,30 @@ public class PlayingNotificationHelper { isDark = setDark; if (notificationLayout != null && notificationLayoutBig != null) { - int darkContentColor = service.getResources().getColor(R.color.notification_dark_text_content_color); - int darkContentSecondaryColor = service.getResources().getColor(R.color.notification_dark_text_secondary_content_color); - int contentColor = service.getResources().getColor(R.color.notification_content_color); - int contentSecondaryColor = service.getResources().getColor(R.color.notification_secondary_content_color); + int darkContentColor = service.getResources().getColor(R.color.primary_text_default_material_light); + int darkContentSecondaryColor = service.getResources().getColor(R.color.secondary_text_default_material_light); + int contentColor = service.getResources().getColor(R.color.primary_text_default_material_dark); + int contentSecondaryColor = service.getResources().getColor(R.color.secondary_text_default_material_dark); notificationLayout.setTextColor(R.id.title, setDark ? darkContentColor : contentColor); notificationLayout.setTextColor(R.id.text, setDark ? darkContentSecondaryColor : contentSecondaryColor); - notificationLayout.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_black_36dp : R.drawable.ic_skip_previous_white_36dp); + notificationLayout.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp); notificationLayout.setImageViewResource(R.id.action_play_pause, getPlayPauseRes()); - notificationLayout.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_black_36dp : R.drawable.ic_skip_next_white_36dp); + notificationLayout.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp); notificationLayoutBig.setTextColor(R.id.title, setDark ? darkContentColor : contentColor); notificationLayoutBig.setTextColor(R.id.text, setDark ? darkContentSecondaryColor : contentSecondaryColor); notificationLayoutBig.setTextColor(R.id.text2, setDark ? darkContentSecondaryColor : contentSecondaryColor); - notificationLayoutBig.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_black_36dp : R.drawable.ic_skip_previous_white_36dp); + notificationLayoutBig.setImageViewResource(R.id.action_prev, setDark ? R.drawable.ic_skip_previous_dark_36dp : R.drawable.ic_skip_previous_white_36dp); notificationLayoutBig.setImageViewResource(R.id.action_play_pause, getPlayPauseRes()); - notificationLayoutBig.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_black_36dp : R.drawable.ic_skip_next_white_36dp); - notificationLayoutBig.setImageViewResource(R.id.action_quit, setDark ? R.drawable.ic_close_black_24dp : R.drawable.ic_close_white_24dp); + notificationLayoutBig.setImageViewResource(R.id.action_next, setDark ? R.drawable.ic_skip_next_dark_36dp : R.drawable.ic_skip_next_white_36dp); + notificationLayoutBig.setImageViewResource(R.id.action_quit, setDark ? R.drawable.ic_close_dark_24dp : R.drawable.ic_close_white_24dp); } } private int getPlayPauseRes() { return isPlaying ? - (isDark ? R.drawable.ic_pause_black_36dp : R.drawable.ic_pause_white_36dp) : - (isDark ? R.drawable.ic_play_arrow_black_36dp : R.drawable.ic_play_arrow_white_36dp); + (isDark ? R.drawable.ic_pause_dark_36dp : R.drawable.ic_pause_white_36dp) : + (isDark ? R.drawable.ic_play_arrow_dark_36dp : R.drawable.ic_play_arrow_white_36dp); } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index 0f9cbb93..2c3ce8eb 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -46,10 +46,9 @@ public class SearchActivity extends AbsMusicServiceActivity { @SuppressLint("NewApi") @Override protected void onCreate(Bundle savedInstanceState) { - setStatusBarTransparent(); - setTitle(null); super.onCreate(savedInstanceState); setContentView(R.layout.activity_search); + setStatusBarTransparent(); ButterKnife.bind(this); recyclerView.setLayoutManager(new LinearLayoutManager(this)); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java index c4118e46..4a5727a4 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -281,10 +281,10 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } }); - setMiniPlayerColor(ColorUtil.resolveColor(this, R.attr.card_color)); + setMiniPlayerColor(ColorUtil.resolveColor(this, R.attr.cardBackgroundColor)); - miniPlayerImage.setImageResource(R.drawable.ic_equalizer_white_24dp); - miniPlayerImage.setColorFilter(ColorUtil.resolveColor(this, R.attr.themed_drawable_color)); + miniPlayerImage.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_equalizer_white_24dp, + ColorUtil.resolveColor(this, android.R.attr.textColorSecondary))); } public void setMiniPlayerColor(int color) { @@ -500,7 +500,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } private void setUpPrevNext() { - int themedDrawableColor = ColorUtil.resolveColor(this, R.attr.themed_drawable_color); + int themedDrawableColor = ColorUtil.resolveColor(this, android.R.attr.textColorSecondary); nextButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_skip_next_white_36dp, themedDrawableColor)); prevButton.setImageDrawable(Util.getTintedDrawable(this, @@ -537,7 +537,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi break; default: shuffleButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_shuffle_white_36dp, - ColorUtil.resolveColor(this, R.attr.themed_drawable_color))); + ColorUtil.resolveColor(this, android.R.attr.textColorSecondary))); break; } } @@ -556,7 +556,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi switch (MusicPlayerRemote.getRepeatMode()) { case MusicService.REPEAT_MODE_NONE: repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_36dp, - DialogUtils.resolveColor(this, R.attr.themed_drawable_color))); + DialogUtils.resolveColor(this, android.R.attr.textColorSecondary))); break; case MusicService.REPEAT_MODE_ALL: repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_36dp, @@ -671,18 +671,17 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi } private void applyPalette(@Nullable Bitmap bitmap) { - final int defaultBarColor = ColorUtil.resolveColor(this, R.attr.default_bar_color); if (bitmap != null) { Palette.from(bitmap) - .resizeBitmapSize(100) + .resizeBitmapSize(ColorUtil.PALETTE_BITMAP_SIZE) .generate(new Palette.PaletteAsyncListener() { @Override public void onGenerated(@NonNull Palette palette) { - setColors(palette.getVibrantColor(defaultBarColor)); + setColors(ColorUtil.getColor(AbsSlidingMusicPanelActivity.this, palette)); } }); } else { - setColors(defaultBarColor); + setColors(ColorUtil.getColor(AbsSlidingMusicPanelActivity.this, null)); } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java index 6fb43217..79bf73da 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ColorUtil.java @@ -7,6 +7,7 @@ import android.graphics.Color; import android.support.annotation.AttrRes; import android.support.annotation.ColorInt; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v7.graphics.Palette; import com.kabouzeid.gramophone.R; @@ -15,12 +16,35 @@ import com.kabouzeid.gramophone.R; * @author Karim Abou Zeid (kabouzeid) */ public class ColorUtil { + public static final int PALETTE_BITMAP_SIZE = 100; public static int generateColor(Context context, Bitmap bitmap) { + return getColor(context, generatePalette(bitmap)); + } + + public static Palette generatePalette(Bitmap bitmap) { return Palette.from(bitmap) - .resizeBitmapSize(100) - .generate() - .getVibrantColor(ColorUtil.resolveColor(context, R.attr.default_bar_color)); + .resizeBitmapSize(PALETTE_BITMAP_SIZE) + .generate(); + } + + public static int getColor(Context context, @Nullable Palette palette) { + if (palette != null) { + if (palette.getVibrantSwatch() != null) { + return palette.getVibrantSwatch().getRgb(); + } else if (palette.getMutedSwatch() != null) { + return palette.getMutedSwatch().getRgb(); + } else if (palette.getDarkVibrantSwatch() != null) { + return palette.getDarkVibrantSwatch().getRgb(); + } else if (palette.getDarkMutedSwatch() != null) { + return palette.getDarkMutedSwatch().getRgb(); + } else if (palette.getLightVibrantSwatch() != null) { + return palette.getLightVibrantSwatch().getRgb(); + } else if (palette.getLightMutedSwatch() != null) { + return palette.getLightMutedSwatch().getRgb(); + } + } + return ColorUtil.resolveColor(context, R.attr.default_bar_color); } public static int resolveColor(@NonNull Context context, @AttrRes int colorAttr) { diff --git a/app/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_check_white_24dp.png deleted file mode 100644 index c26640d363a42d96247a59c0ded4617f2bfe2070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@??DuqW45_&F_PQZoi-G`a zz^<*Iy<{Bn9|Y=HTrAsFt(~ns=j=PRG$(6N*mFTP((+ zww=Flip8=ehE^)ewgg*?JUeqa@$2=43apwQ8q#)A9fc=&zMNrTU|{fc^>bP0l+XkK D@0nq3 diff --git a/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png deleted file mode 100644 index 0fcb0efb591bda540a11a52b1a9700103c6f1041..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@??DlkV45_&FcG_#M1_hqh zwcl5@zx)(bR(ZuIvB^Vn*G;9e1bZ%<-!o3k3{sltQL^%0ShL0bCic#>=yu&$j;9G_ zA0#x@9{2Es=uK(=_?-XEl9AnXKTO%=}f#hhwWN zulbMvR%e7oxP4w_-AI_XAR@tz{mV-2-POLcn6&xOb)12Lfx*+&&t;ucLK6U4GGXWd diff --git a/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_dark_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..27bf91d022186da372c1840aef9b7182e9ce3631 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?tnhSk45_&Fc3L1;g94Ak z>j2rMyC&XJ{Hi0F(UOui+b@Ox+shiCXJ)=UhYi;29QbVP)HnNX+crf8qxRDq6GNVP zrNng1H~P2d*or9?DmoLnQh64fN?5tdNKP_FK{K^z>8w)~Aq5K;P5C)VX>w<1vyYmp ztJ3AU0pb2)uhkqCr)Irf7PRxfkMPP%{`%!-OeU_>VwGjzXz09cL2Hl(x70JP-F!Qr e81op5sQdagwWe|yCNMBCFnGH9xvXJ4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^` S(u{$Dfx*+&&t;ucLK6TzyF#4+ diff --git a/app/src/main/res/drawable-hdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_pause_black_36dp.png deleted file mode 100644 index fb4967bcb75cce5a243643bce18886c7e45a2369..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^8r;hrvzAr-gY-rUH^puppL zuxD1F%-OS7PF-^oc`EnEte{j$#dA{0N}1K&PY+t()=JLZSoDEU0z0@7y`jhdzQ-gL c&snAG9Zl{3g$n#)U|?YIboFyt=akR{0Opb{Hvj+t diff --git a/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_pause_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d64691ef2a1d8f4b23de40c5b5ee92878da34976 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^8r5uPrNAr-gY-rUH^pupqm zSY9%r=V{ovB&}%az$w)qZXdX+={iZpbNZ^C+ahc$(xWH7?ml|ZIspgBKe(?}*>jRg crWr%lh1VCXw??jGU|?YIboFyt=akR{037Wz{r~^~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png deleted file mode 100644 index 6fd6057057e72991eeed16b41ff95f3e9048426b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^8rw>@1PLn>~)owvkXEV!~iAZmd8Yr@28lIQ;pQC&&xCKwoZxoZr`gBg zsL2T)Xa8mki6W^ZCkrksoNJrO7I{G6vI6(7%b5uqjxDZmvFoU7g zw)B=_?8d!fC(V^&OM?0?rcFKZI f9EvS}G~=gUYY9jy+8)Wkz`)??>gTe~DWM4f*YR(k diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..95b0df12498f2e982a7f44d853646f6fc9cfbc07 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^8rcRXDjLn>~)ow-r)kOL3P z{FV!rq5(`-5~>=M7O>x8zVd)iqhSUI)72)C8piz7%_Vov~)ow1PjP=JW5 zx0Zp1ikK^tTxSF8jRrpk;R~DzOfwodB^YdWiM1b|FhS&cGk*iQ50?Jgy#UD*e37 z<%X+n&-zDUZ$qd2sgSv1_kEIm#?Fad&L5(3Ii77zT~l`P&dOMmol-NZX9^$umAiCX o-Rjw&7x7PyEtCd3OjtMmpF>r6<*Z}Q3=9kmp00i_>zopr0Bh`eW&i*H diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4705f7d3ac69815ec42df5eefd9de55ea2b35fa6 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^8rk33x*Ln>~)ouSCZLTRgY+Hpn^fKag|aU%>u>p=@o~;*%)?EVkY68|x#@BFYlw-Z!s5_u=3M z>(A*k4Ub7A_ZU9Y|7EZ~^X;N1J5CzpRkZDuy7q61&Mdyi%lLN$@Nn~QSS;a|U$9ET z?S27wbXMX+RzA_gFND{L96qG{Myu_j^&HK%*6JH!Jd49Ef_N6Mzb~~jDk7rv{uB=D zm8~B&)?Mve^yGN*@^3q*|8YDWyRw2aPRlNuEsOtb?=9!aiyJ%JEjfGcKg)W&eN}bb lr^HRldC5H>XH9y_9m?jZen;)@8wLgj22WQ%mvv4FO#q6PcI*HE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_black_36dp.png deleted file mode 100644 index 5ab79657093bed4f665d7073993a664197a14cf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^AB?4B-;Ar-gY&M@R-bQEcG z_b{=V8@BYq<=n?Ceg`;r9NfjA{(w#I0OOY}Q@p0SDPG&(>1j4uboZOSnbZG!?<<>> zzxihE=P61p0!|!?Eh$P33lk-;BpgqRkP(s;^Ob(*Rg+QADSi0$>lndA-yLS>zS`w5 zoY#C_B^}nz{lmlZ^6d?JHhVZf8LeSj{^6VAsnr|A?xb;i(#qk`w_G%bKl?!FIfdtk ze|`9pI%RU=$2sQB-{lw0;l5lP7t+A9`KMOfrMROiwiQz(mf3&z?o3Rozwpds>qLoV z?GHM)DBjq!?Tu>N%kF0}w_Jn2WI6mXQa|Z&>z8isy)9B=8rItHR&CnzNDb`pBhm9R YUsdHXRS4@bFfcH9y85}Sb4q9e0A^Z=Z~y=R diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f57637ef8485bb80d2f799a9c1f18939ad8bbd01 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4mJh`h91|fy9^ABOr9=|Ar-gY&e+IzFhHbD zTB!MC$`*+=K4Sb27%Ld!7L>^~h;P^&EqOCXtl9BPa^q0J-vYIw%*}K6HaW(h$;ww}!1 zX89a#vo&nuA0`$pyRm`KW)G*3v{~zR{=h|tW);j<^a!~j5Le_1F2&h|STvv!Ae<6}{C#TJmOlPZ~(ulKYQ UuWVCdU|?YIboFyt=akR{0Gr5$ng9R* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_check_white_24dp.png deleted file mode 100644 index ba9cf063460b0fea0d8cec10968e9b007a59fb36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJosy$sCLn>}1|M>sko>|xM z@Cw$$=a^!nq6B!4)Hm#C6canZ^WUGFyFkj1m-~a1-%3^%-sMM_7V#WUW8@alXMI$V zCDC`bDPV=$1V+IrQhnMTQWJDKmmDdmDQw8`6xrD(+?A5zeZpwYj1ZR1EjougeV6e* hk+O@D?-Af;uxNgsb(^Vr8v_FagQu&X%Q~loCIEouJTU+O diff --git a/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png deleted file mode 100644 index 4342c7650734abdcd8c15c3a007192be2820039c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJox;$MRLn>}1CrGd=i@jj_ z7^fhn>aWuUjQ(hayp0Re5ond_J1>-SSYPmEG>`W>2i_e` zX$(i(9&d8#nboGeTkNLLDycqQj}>_qXLTL;Kc99{OWedGu4=?NIoHC_b4JqPkE)52 wy1TqxL_`g|zfDYPg5W3=9kmp00i_>zopr0FZG&tpET3 diff --git a/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_dark_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ed5e2d92889b2b231d55ae9ae5b0e04e4c30becb GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJox;$MRLn>}1CrGd=i>+Y( zD5M~!mdKI;Vst0H@|YzyJUM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png deleted file mode 100644 index 1d8ad18a0c5d891d971e991e143c3df0a9e15644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65 z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*O)8PM$7~Ar_~T|D1P_N|4c#YLZAZ`jhUFdc$K)+jSl#hfku-78|AF3_F-k yPUjIilJy~d25Z@+XBPvcc$YpD_quY0fkDo|jFBTLyqST4fx*+&&t;ucLK6TO+&EJ4mJh`hKCF@W-u@?*m$})hE&{odu<~pg8_%D zqx<=1X^jyaVvg?)zSmi2;xuXA+@#>|Z#UhzVk-ax7s@V_`|n#~8hh*9Z$aN<$=M7H O3=E#GelF{r5}E*&nkJwC diff --git a/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_pause_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..847a48037421820099a888bdc005ed51aff12376 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?*m=4*hE&{odu<~pg8_%D zqxrdG=O(cxDMqmDWZ%De$0ZKWsR>J7J^j7El_d&B6 Q7#J8lUHx3vIVCg!0P?mdzyJUM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png deleted file mode 100644 index 2e70b0398e11e67ffe09c675083419725758ea41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?EcSG945_&FcG^MC1_K^f z?t3=78ootYKfHH6B9kJ4mJh`hKCF@W-u@?O!IVc45_%4oFKuvI6uB}QA2wm5_?5E@9H9lFw)1F0EdYFH5Kd2$W>MX^;P`qiH3M1>v-3$y244$rj JF6*2UngHu|MkN3M literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_black_36dp.png deleted file mode 100644 index 9354ad3135c9371932954cf7b65647b23879866d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?O!jnf45_%4oFKuvI6bRuM8RhtnG)k_{|5TJ|#)K1(PP z;K^r9+6Yoo$9d#l^GQbo8{Q5}_Q}l-Kdc0#`OVlRdBxa$Wpx70RtSB4c5u>LN7m$H z39GEGuzNqfWf!4!oxOSGPs0~d84&9Yk{B3_F0K&TEvP()fq{X+)78&qol`;+0Mr*n AJ4mJh`hKCF@W-u@?O!9Pb45_%4oFKuvI6?HfS_g}1IU|?YIboFyt=akR{ E0Hu;gg8%>k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_black_36dp.png deleted file mode 100644 index ea3c3a40d18ea1bce76fb8807c0252c165bc00f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?EcJA845_%4oFKuvI6q2i)_DqJ4ktVgw&lcz?{A)XE zSW-SgLLmR(LxEk^C)hjUg$j6LWsa~Ox!hU65i66zbHv=Efak1i3d@n}?30@l0?l#_ zEIHWruzN3(+j3J*GKFtiQ{ja$*%MQ$YA+v6Q`GskH+lt)}YDlmyZs1{H Zs7YL*xGq^Oo`HdZ!PC{xWt~$(695Z;PfY*- diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..28076e6edbf744c1ebc474b2d20d126bb8efa030 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?Eb(-445_%4oFKuvI6Xzy5R?3>q2i)c1^~QY9_VJ&lX51>}xw} zSW-U0K;ZnrhXT8-PjGhl3l{Li${b-la@NJ7MUU?i<0D%Yi?(Ncm)IWNZ9eI^K_gqr zhp&n8_`yjl*mJkJvt4Xnnjo_!l)dO_lvRXQcuIm*#4Pz2yj%WVEPJN`cGCn#24CJu WzEArutYlzdVDNPHb6Mw<&;$T_tWTK$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_check_white_24dp.png deleted file mode 100644 index 1f4846cbea8e43242ff2a943aae5135e93e2d8d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F~)z2VJwNI|4E zF^w;_?|iT2?%PG|dhWMb6`hdkQ^nft;D+WW*0sG9F%cL=nR3Xth%S#e}BL)J%*hW`0m z9z`=>d7R8xZC-BPe(zB-gWbQ6wKt4~19j`TH$)%#e@$C3(A4f3ug8Oj8#{{M{D{sG$deqW&-je;F;;iG(c@qEt diff --git a/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png deleted file mode 100644 index 6201097f015697e18c1c383882acfc5578756a2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FekWCYlWR}uU*@{ zwoUk7YWAko4po^yFK+KE_Oz*C7v9)1?_mAwRWs~1Do*1#xZA8h=5R+)QgMY>ryj%q zdrb437FqnU7fO0itn!QXhx5y$x~@(-HC-(gKTJCX{=~hC(^LuM{WHr&^n)SeM6SSsC5la!Ix1P>5#OqTh-0#MLjRuGx^JQuN@cN5GrhF3&G5zki-p z)p*$L!Q-R8a>9|B&Ie-6Y-i^2KNB)PcYEit@&ko!xqoNpi!>>4G$~Ad!kkmhvn8JY S*eV7F1_n=8KbLh*2~7a!DuM9; diff --git a/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_dark_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5d4758fc82995b6902c0ebeaa4473e313b8d12b3 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FLn>~)o#DuLNI}4r zbDm#p!}m>Ly~`&rOBWRK+2zpnmWSu$|C4KG9jKmiLDNf-qe+3|l0V-*xA^q7jlJs+ zPJh-?|8rKYWl|@D{n3r@V}$xG4*KXMihsB-C30E2?1+%&4})i&+0ubtA??ejcpTiH zeIVGwr2W3KB3oVe5m%`{_CiSyy;Y7JUhlc&L4Q#7(kU+HAF_pF4?JgysZo=wJC&n& zQE0zi&^mU`*_OFIC7jU(Azf278pX9YE;STZ-ne{qj-KPi+a{A25Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q zL70(Y)*J~228LEo7srr@!*8b;ay1wTu!MUb%=b9)+|^Ul&QoM-T(V+DdEd_4u6;amEiA5+(!`}G_jM@{;Md!cEeb28#?H=32R|JnWI z=VsrZ-entasdMlCqk6xiv3kzEe|Ae#RyyfT>VBfM(}Q8Bhu);_C0vYN>@okO7rXwt TQ*Oe*z`)??>gTe~DWM4fuzOqu diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png deleted file mode 100644 index ec6617a7987db8ce708a07dbe37443d5d8809161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4dl097~)y|9s!fq{eh z;G6wh{1Ot?i}*8xW0X86sd!FWvM}o1Eqeur1_nkZ77hX887g4yU)HfTOn+l{>AAQJ Q0|Nttr>mdKI;Vst0Hy^eMF0Q* diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9b5198fedb48ff8bee274e7e4ed3cb75274e8dfb GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4dQaoK8Ln>~)y<_Dj2^0s^x97WBnG RWME)m@O1TaS?83{1OR^jCT#!! literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png deleted file mode 100644 index 91defe846d4db356d0c1e420acbedbab07efcc78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d#XVgdLn>~)owZT$kbwY; zuagI32!m+=Yp8>G0BgxZwHJ+iCpBTMK+%d8nJEGC!T-yBjt=54j>ng5lV3XMF8uEXxV%mdKI;Vst04K|S$p8QV diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6fc333ab5c3b43c02739f016afa9de54ef32aa07 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4dMLk^{Ln>~)owZT$kbwZp z+zEog3{xEVzc9Eu@CUG%USQ&#AT;U2)(?DhA`Oft>HK|vE{EAX`TohU>x>K#;Ghy- z>dKSoQoD+M5eK_TMX)=d$#cz4PlcH##+)jP)zlhAHoWvyXw4}T@<^OL zo5iTv*OzJLMKv`>#?W6Kb1RQjc)DNzGjSF_|4~!t!aplEK3{P#aq4;5cdKUmubawp zC8u;c$BLJ)&Ph(_e05G#VE;U8J$)C}lx@3$S&p!-a&XXFRh{LKx60Z~q5P^Wv-nAv chh9Bo4zP(hyYx@&JCF}OUHx3vIVCg!08dqW?EnA( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_black_36dp.png deleted file mode 100644 index 94c2a3ca9522ded69ebc54c495c49e060a6b104c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4dMLk^{Ln>~)y|vNPIZ&ki zV|&8HQ|B&SyK-xHgS17X-va3wtR>9q7Z^(zvZHn1=H#$k6!!S}u5zbiM?sx@O{t!| zivIuEJj@Ibkkh=oAfJ2v@5>+VZ?w4*U7-|Ecj0}3;5)7<@?R|Ha8Hr{V!TH{!~Vsk z_Ja5YcfNlJS&*53c&5Wn{f8SJcE&#p-Ju-tF1SJ=;GKJg+J!B%-|P%(G`m^+lQMQr^aR9<~V4-XU*Dw^xWQ~x8yIi+buaR|M|My=g0egEy~D}SY0pq z;$o@$??Z1cwMPCv_4UNm*E`Icy{qkie__jdyW&&hva%46Q7a}jR+WY9bl7XXDnz0F dAk-HDbK*sW78F+cuiXyvm8Ywp%Q~loCICs0nN|P* diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..88ff0c1ba7d9f11f1711309388903723879f45b5 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d1w36GLn>~)y=Cvmlqlfv z(bRC`rbU}Cheh)rV6|zGanNhn8+U*?WBt~(OXrI6vT{Du;ptSpuj8$#_PP4x>Ytw` z{WU&ZCd&W;GR@OJ{NdQYJMYK)8*;C#_lRoPztF1T@n=27|4TBCbBcV4pdZUA{#{>n zWjLq&7Vcwx_1)4&SmV3)9zl(ANx#FwjYal{xEqU}Kb-6ESI+4CRIZW}HsN{~E>x~d zS)lki=B2~$GsRDtzn(2-`uj^O;J483^3JXKm!{`k+AaUtxW7`r%Z>N&D|wcx?e8-5 z&&cVVxutzQTl@N5yV7aj{(X~_T4CxwmH&#l`&7Oy=Vd~TE=;go6{8>@p!$P_AL0Rr YLbI?mPtUe1HcLPPp00i_>zopr0AC`5!2kdN literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_black_36dp.png deleted file mode 100644 index 924fe054f4e0a593a5d8ee483de579246158b664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d~)y=lnD7%1ZQ zu+wGnMa|5sUvwHoH!y`A;EG_>PGB`lV9bhI>bG>li5*;>O+W7&%&h!)Zu*^BGHJ(Z z7jZB^K$k%Mj6I>b*I267XBX?dX#Qvwa5F8hSo_25*SQOpojup=efzXS^6YN)?{@2% zuI89=u9qxXu*FE{TChHJ+n*F`hQCHSFSzG z@47uS*;OI;z@}AKE#DPb8_X_9Shh9i8;jRBi!Jd29hyjA{qeBt6HwS5jr^OYyu nc+R2n&626JmJi|~hN3d|pEDNpO_Z+<0f~6J`njxgN@xNAYB-FQ diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1ec1757275b2b790866e0e2fde213ab5c2a9ab61 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4dWjtLRLn>~)y=lnD7%1ZQ zaH58Z*4!X(@AFI%4BQEfIt{EF7`OwnUzTW1by3a~JaOYW lN6MRG7Nc*L5brRYxXB#R@0q+lY~5Xuh^MQc%Q~loCIAMfh$jF5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png deleted file mode 100644 index a263412aa4d819399491d6f851373916274a8e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d<2+p)Ln>~)y>;97h=D-s zL)}KEhzE^q+nZnZIPLHf5fbX0T5-Tj=6pr1+Ww`V^J;@~&IkHkHks>TsldP@;K0BL zA_N;4m^c&~7??cF${D79HhG@i#~5;Krylc)p5WdRmpNKX7C(}aI>D>1JVD#fY=L|J z93KbnbIZ;B#1g!dj|MWo>RZgRR{y z_!dSr%zM7)%+B*Yo5eE@{``0MLAJmp0gLK}e~)||Jq|y(!t}SjI5ywU!};MArr0pE zdtF})q|VLrKhrd!?a0k)k9fIx2BQl!Ff~)y>*(e$w0v2 z;=2!*YihJl9lE}JFfNF+gY&L!g9iy$4gwa*wk5r3N50QM7xERY{le0 z7=CUz`uK=KX!B?Opi+zMiK~u8ets3wE!-W#dTzf*=)*OxtAyAU;tcDS{G5Hg!GkmppxNQm7k{P|}A3dVqoGPy2Fz61}3F`VhCuu^ET-i+bQ-wkqVw%ql zGtaa)JSse+=qa~hw!^Cy^XdB)VpSTCbx*pr{y}H_GaHM&(=D#vDY3O$$EbhIwMYpH c{_bU9Ss&GL=J>R43=9kmp00i_>zopr0B!A}B>(^b diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_dark_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..214fe35961c733fe79dae8aae3990ca588b189f2 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d-8@|!Ln>~)z2(T)WFX)W z7$)QWags)7*Y=|0kvg0zu^k*s=lVVWza;yVcf*z~t2&?{V_~=STIsD1WR7K*=glcP zQn}l3N1?cr)cT*Zo_#pSdGfeq%Y>Ra2c4~+cTARgDc#q9#e*qUT+OWCJ!MI}#pevw z##fwQ>E16-;w#+!u4!^F}i+SDqk%OCw3j|Yz&b(H__whqaWrs z*566kU(kH?af`ytgEyN~_|ml}dCt-8?~9xhpdxHhJ<;c3j;m28vp~Ouex}`L%SSy7 zLDhG(3Z5-((_CVkt!?a~$bJ6N#J-5B%YO(i5L+IxMB=yQQH7&--URheNm38c4LX&3 zX@WfC(Z?&CC*4U1Z@j{(ulL_^mnTy%yK1q0lX~5Z&oNJ{JB(*fUgvw%@WE9J4?hmdKI;Vst0D|10P5=M^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png deleted file mode 100644 index 2955c02ecd66deb2349ba92839bb00afbfb3791d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BC?tCX`7$t6sWC7#v@kII zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?HAeC~IS$;1V}4pdIkD_qccsibhh zQjS@V9I6GUuYdU5T5YMu;a6#AG=FM((zg>zI*2XOMcXvJRqGo)l?z>f7wPTZx zTld8zlM7(#%Pnr96vL<~)y?c<8L4k+m zptkMYY;HRxk2$Ts*_Sn_Oj7Ygpe5CzmzUl99J4wz_&p;VkAy+Ofd)oqx-tGSudZ-c hMRJddr&S)a$Dhjw`4_Fc#K6G7;OXk;vd$@?2>{c4M*RQ) diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..906446df71d74ce73170d204db234c40d4e8fa60 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0y~yV8{Vs4mJh`hW@nhvkVLj`#oJ8Ln>~)y?c<8!GMFs z(c16$%A-q>P4BQqP1gh9dqx-mA?Cfo}| fc8=#HIWKvc^+w_MIv+DIFfe$!`njxgN@xNAt3O55 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png deleted file mode 100644 index 6f4ef0edfef81aa4ece3f1e54d86190ee98c5f70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmeAS@N?(olHy`uVBq!ia0y~yV8{Vs4mJh`hW@nhvkVN31)eUBAr-gY-Z|*$94Nv1 z(4lPIWe2Yda&MHvCWb7GouQ?3NN5Y=^> zUwg)BKYYy@Umd!~nSE#a{3CuPd%F7kuGydZb*#Wn>YSag;J4%Q_55ED)$!8uM-Sb$_c7nbw0GD%4J3fKj-9E zf)L5}7SFF81}o)IbqX%2;`#5yj0hnH28JEQtai47S=EzM%s}Fvu6{1-oD!M7Fi*Ar-gY-Z_|iC_#iJ z@knR(yAXk>1sx(2m7D}Mo5WTyyo<4PEz7R0u)}hWf z=1k_iAY?X^!8TFNA!G)pfM^;MOY2OAz(h5N08}nWRwRwdrFABQBUCYzi$!t3jYsMS zM9x1_V@PbVRZZ_d;`j1Lpq16uf5B_b=Wu?`I(0gJ&qjm!;Yx?ZqOWEj5{tj;eJJE> zhe4>Vice@iNAOi=C|AiRl%F&Bs`8~)y<@275-8IC zQM}V>X>iucm$?V{)-;H2U^WBMtQ#1%mQAthbyJ!X?(;wG*}dQI9)4Giw^xr>dTgJc zCc%IXPVVF{pS<_ke9nK7#~$B1Bz&+)_P^}CmfKBFt^TRni0EAZIR9a5!q2{Xp6@KD zOaD|?Xhp1h?Ee0c?7>eg(zU$(tfz%@zG&~^+Rk!XFz03Q4*iIE35(?)&P=Fm(#_rL z&J}iGTJ@5I)|{>GTwynERWC^pU9;1jE9|0F^^%0Cx_jNZuAK;~UXsA8yV0HN+6~|D z9tYEk?%D=zkc>_57g@s`ep8wC^^uj;OA=%)Q~O2MY)-h|^ps=U2lb1y`3~+``+xtz zd4C?yNuRaL#P_LWeSgn>%ci@0c5$A9XV_?T)NnknId)y=#)ezTdF;mf z(++aIZD=YL%6Y}75y5`2MpDVsAl}?dBNQ3(V^ntu0^j T?F(0u1Ic;1`njxgN@xNAKsCsD diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5fecc468cdc1efc129f60c5268d1148a9067d628 GIT binary patch literal 488 zcmeAS@N?(olHy`uVBq!ia0y~yV8{Vs4mJh`hW@nhvkVN3>pfi@Ln>~)y`$*I94Nwi zK~d3hVS&Ylgh&SI1jY>vHyA2zFmN;QOLZSvm?fanvh{=8760Y`|NrctGdbq|^w|@N ztlt_iAi#t>$tm_Xv;WPVP@iq{PPu5=hM433UEV3}<~m*aC;CZ5;?BPRT``(E_dlMW z$lUtW>Ys7Zx(zYM`zt%%XzKVUCf`$D&UHHY#*FtTd{f*LExDqfn-;CuVAI+g>8d9( zZTW`MsP_}Ov?olfUUG#nuNDeK)tuGKT7s+SznTK+|DwsUodE8H@uH{hQrcf<(;hT8ei* z$PT-);bwB4JNN#yR?%CGqSrhV<*xdL%+PmM(L8g#S4h;XoINDs@u6*Z8AY#c*dS!R z;Eq)fE5$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_36dp.png deleted file mode 100644 index 401c515cafc4f76907a24dd654d7019081ecd89d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmeAS@N?(olHy`uVBq!ia0y~yV8{Vs4mJh`hW@nhvkVN3XFXjULn>~)y<@M(k|=Tf zW3S8Ni<+5NzsNKQ7clu9;Iv>=f54*mfFUbtso&BGC#sguNay;+h00S=y(j#0V&QjWFzp~cd ziV^dz7bGyVzpiE%$yt!#{I;QqSK^J^hKl@7_j^Lgb|p3(V(&NpJCj_yCw@-(-$ydV zvvwKz9+j@=zqFT2Og&=hug|CECKNVZ^-KHLAgL8`)Sab?b#?5S8V>c44PE^^S-H)g z$Z6g<@avv3tF+_%>Lm%vuaf&ka#CWydmJ=+vB{ll+C{DEB?&XP-c@GRcDZaDw4v$8 zbyvsuKlRm15?VjK|IW1UM{4zw1V){A6Ps8A-%mt@JHwH$+&+OXEn6jsH>y85}S Ib4q9e0Fm~)y<@M(k|=Tf z<5Ue3t+_$o-sc%D7}y^$$TTn)Ft7(?zbw(3>Y`LF_FiOi&PFq1>-u}&Xa233v|K$t z@^SjivkVBpk$3Nb(oNs*DiJ*DFYTD>Cg#R$cw18bvaWfbR!+!<=92XXk7njmSn!VWg?pY z$JXb&TEv`$sjseUe{VX<8D>5ACu`b@1krp!4zV?5mY>z;1RT`5_e@OZ#)Rr63Cypn z`$ckCYTr$4>Rr)q8?<5K&*psz2Y0=j*p#~EoSbGvTJCp`gIpI&`bE|#{3{K-;9qxD zPBUWRpWk~M=KtAb8?=Ez?7PRorWM~k5P{C{=ojbY~o`2}==`vB-?9a@V7#J9s85r0Y z7MBp4VBz=j`SU}#{3NI0yxo3oq!fd0R1>-{VY`+xW{H?Bzj*e=LnEmzOcxWnqB zzMH~^xEhAAZvKYi8iqNKnLpIJpZ>vMah&~tr5(e$kBkL<@v;YO>rxv8KCWhJ>5Lat z2>Fx6@bFPM6Nlt}E{7XGL>a#Q&<}i^&dwokZ+t-L<7Oru;dto>dABofi++5|`0Yo& zeEzG0oQXSsL@~raHdk*^eVonkN94X#;>{n68TKFD?i6A5kK@2w`$zTr(u zY2!Z`wOr3j&FV{Q-@Z=_y2QLh$l?L}^|Mm5|Ax(KtUcXq!mN03S`ZTh3Yc-uciwUv z{>E#2PHsM39NPS+-)6bZeMcpcpU3mguCH9T_|*QhpKsxN54rqSMz; zQ8}?Wg8PrVU;64#A zS-(gqG3{sYKXrk`w4W{l6Z}~if4a<2s9)Kx=`tho-<0DWE(KG-f&vr#Tlh||R`%Yj zaXW{F_2*f)fJygbSX_UebqSajU)#d*X?5R+IZ3kIn_O}4+wC+wR11flGv($1~rD4^x z*jdiA+NGYYQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?vo$ZdYU~o4`=s>FB1y>; z%fIh#l(}#uMm_y^Ap;W7;J=`iae1Nh>OE4?4N;5tscWs+#I)k;wVOVc9F`1=*By&y z*s^P0#sBRE_6i!N&OaM;IU`Q7%Xl8(Q?O3(WqS6B(T?-QDRz^t&fG7V4;6Ob^Qe|q zFI@Vv_D; z46z-0F5-*0FShQu0G4FfB>)wg7|L(~sxGzzsuiN-Kl2ZUJ!i}mQZH$if4A0#j?O3H45_&F_R>a91_ln6 zjkoJF=N@u8(fGGn({qvvc2qy>@n(621{MJaIR*iTZ_F$c7?@5lGccW~YhYmFP{2+I zIWSZ*I56Dg7jR(WP~d0aQ25QrNxI8~8gq!L7Mx}LUe4a8eFfe$!`njxg HN@xNAP#sb0 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..73339397ed21e0addd33981292c64a8e126db308 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0y~yV3+{H9Bd2>4A0#j?Oa91_ln6 zjkoJP(hIq`71_V>FH`ZHgdP3O>^ooAz#!znP|4uHaFbuafr&$bpMgW+HzN~=LIVR< z!h?bF2_pkzioF8^r$U1bgF?d_b`Awb76Ata?8F3i29^nb85mU>7(OvHFl>@nXkZa= zkYm89LBQb~Gs^@9rW4EzOeav?hr4A0#j?Ou&--b( zfa%6RS+CTn?Qig@`)98(Io?6dz8IwJ#1rugG3lSUL9`4iJ>leeCdQe6n2dh1rhM8Q z-~iSP5{P=^QwO5K63Sr1_BXJoEKs#O6j$5AdBXl8la$rt`DZH_m&U8y`&rDb@l*40 z;pgDC1~dC*TqjJ#CuE+R#5nUAlhIk$lv&&-Owyk=_!L6~EFBz{?S$}T6cjGUKzMut z6EgJ_F3;HrQ6wpilk37b^Vt!`na@Bp2*cQL+NT&T0vHmU>a|avoVmkhnF~nD)78&q Iol`;+0KM$j82|tP diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_dark_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bbae7d47c57ec83171da50f5fbd76e387b04a73e GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0y~yV3+{H9Bd2>4A0#j?OvwnS$EdW?&qxJ@$?* z&zOwPN=ic%ZN$m-6Pb|dCo>@vOe3>lVrNX)(L-PD3wytP@`d?tCmjGudAj& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_36dp.png deleted file mode 100644 index d25fcc04da5c48e9c162727e197ac4ddc3bb4259..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmeAS@N?(olHy`uVBq!ia0y~yV3+{H9Bd2>4A0#j?OBkr*st+j|^MB6C4lj*8YAs*V26# zYsDAO8-KDhco{H3!~UPQ-j^&|U;cmoaeJE=-|NJggaV#8)_?zf<$Y@di%8{#-*xL* zRTi9R{`cm)qXScy-HY7)#*BiM7mnAxXL0%Bxc^JFrh*dxuM6+jHgwp$SYIdqdoD+Z zD*vzN`@UAIDtv4Feer#e15;PrQd?gKPUclxmUC)kI)r{RVN~T?acG{}0w%`PdzV>4 zR2HnMp4HIBIwjX%IN)G|(c4TWEt!BeTVIEx%(trig)cBL=I&h1nX#Z@+l|XCCJ_$D z?_Fjw$#6J+>oSW;fx~f-V1+~W`%I=;DhsxLGhy@(AL+1iR*19lTbj0zwm?x7L^5u@6NS9#Iohf>=)YiUAQw|_J7R(BcZ=Q_500u z6|NIg6c;SM=WD!-YlZG_i{rn0_s4ayefiV4=`%~b{!yl?e;%((KTix})ZG#Ld0`c! zuFd{y$_o1kp4Px3a%&@t%7P1hstZmscfE^Xnq{K!|H#~ipf?drvosc%mgzA1 z3SEe@p4Py|pYc}K+ku&VOZLCbqKsQXy4ko-)LXc(1PR-`m}Wh#q09coHS1{&T=p4l zvfd7?@+O!2R2L-i&&oY66flwf?54A0#j?OJPcQWHf?mPF(?z5;YcoBN*GRqW$1zy#&8YZ!Yr1}d7JZjK-lgXqd5b(^_*TI$P z)UM^6D9F!D-W*azat z1(f&;PiSzep4Gr2a_cgS%7P2?)D##wJsf`TmjA~geBsW1m-rvvTN<9#N&i2({Ug(? z;`@J{7d7}uGDUrTrC$!fy;VY!z84A0#j?OdxzHurqV9T3c9se%>(EmbKkuMwWY(Eme ziB;sot~>9aoUdV;^)POy{=AF*GHSL^$> zJM#BUI5JkTKizlkM>&^=!`;(G`uC*Tau+UvD5(n@%XApu8Z1bD7r}HZ&>{Ox1k)`~ zhwQfzOt&f=vfoEA-70Wcz9E@2V=?30Q+=undfC1>IWTqAIlTWZq_#ke|6;z43%ABE z#@di~yBkO^)!l|)l-=$ycK6|ZhXqs0N zw@N%9;P2LX{!BsvS605s%rRN;O5~e~nM}aeZ}W~FV}7-E>++408&;WqGbs}Zct4|B z%9>}zCwDW}D@QI>OIh=;_|$%kRb<S?b@OKjylZ-d>+8X$zHZNCPARW7Xx#EIAzPFhi8Cw?G@-q6C nRr)(SZ2nR$g_#l<824A0#j?Ok@^4T1rz<)`=Re>Z=)e+LtnmG*btkIQoy zS@-CDSN~}|zd@`b;9YmR9i#5YJ$LluO*k^vRX??>dM129sQ>ie4`B!=l(Z`Nhsj^raSK)Y?!>HE^J7S4Y8QST2gvkXhMUU^zDr-DhoXM-bOG9 zU09oU3&d+)_6EdTvC?{4153%-JF?ymOuM$EfYdu#PivUOE^>Dx%M^@$AqphMvgKKy>Vjj;QPszV0v0pMW*-*{Xl9fJDRgGc-I&a|Vq(L# zTN_!nd~VowZzIc=#|?go$AvEVF(o4ebL&$@+5dhgWn^?U%l-ajIRHkDo@=fL&lLhnSbHxH~T&tF{=Fix0b)K6t~AJ4CMOr#@-q6GZCkFm;O4q_nH(7t6aASn e(*VN*`~M8n#8r - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml index 8ac20313..75e988c0 100644 --- a/app/src/main/res/drawable/rect_selector.xml +++ b/app/src/main/res/drawable/rect_selector.xml @@ -1,9 +1,9 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/rect_selector_dark.xml b/app/src/main/res/drawable/rect_selector_dark.xml index 4cbc5ae3..d7867f86 100644 --- a/app/src/main/res/drawable/rect_selector_dark.xml +++ b/app/src/main/res/drawable/rect_selector_dark.xml @@ -1,9 +1,9 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/slider_thumb.xml b/app/src/main/res/drawable/slider_thumb.xml index 4c099c65..086a8041 100644 --- a/app/src/main/res/drawable/slider_thumb.xml +++ b/app/src/main/res/drawable/slider_thumb.xml @@ -2,8 +2,7 @@ - + android:width="3dp" + android:height="20dp" /> + \ No newline at end of file diff --git a/app/src/main/res/drawable/traditional_slider_thumb.xml b/app/src/main/res/drawable/traditional_slider_thumb.xml index 489457a9..594829ac 100644 --- a/app/src/main/res/drawable/traditional_slider_thumb.xml +++ b/app/src/main/res/drawable/traditional_slider_thumb.xml @@ -2,7 +2,7 @@ - + android:width="16dp" + android:height="16dp" /> + \ No newline at end of file diff --git a/app/src/main/res/drawable/traditional_slider_thumb_dark.xml b/app/src/main/res/drawable/traditional_slider_thumb_dark.xml deleted file mode 100644 index 943b1d3b..00000000 --- a/app/src/main/res/drawable/traditional_slider_thumb_dark.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml index 19aee269..963b5504 100644 --- a/app/src/main/res/layout/activity_album_detail.xml +++ b/app/src/main/res/layout/activity_album_detail.xml @@ -60,7 +60,6 @@ android:paddingRight="72dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?attr/title_text_color" tools:ignore="UnusedAttribute" /> + android:textColor="@color/primary_text_default_material_dark" /> @@ -81,8 +81,7 @@ android:hint="@string/album_artist" android:inputType="text|textCapWords" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> @@ -100,8 +99,7 @@ android:hint="@string/genre" android:inputType="text|textCapWords" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> @@ -119,8 +117,7 @@ android:hint="@string/year" android:inputType="text|number" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml index f00bd4a4..6699c8ab 100644 --- a/app/src/main/res/layout/activity_artist_detail.xml +++ b/app/src/main/res/layout/activity_artist_detail.xml @@ -60,7 +60,6 @@ android:paddingRight="72dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?attr/title_text_color" tools:ignore="UnusedAttribute" /> + android:textColor="@color/primary_text_default_material_dark" /> @@ -68,7 +68,7 @@ android:inputType="text|textCapWords" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="@color/white" /> + android:textColor="@color/primary_text_default_material_dark" /> @@ -97,11 +97,10 @@ android:hint="@string/artist" android:inputType="text|textCapWords" android:singleLine="true" - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> - @@ -115,8 +114,7 @@ android:gravity="center_vertical" android:hint="@string/genre" android:singleLine="true" - - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> @@ -135,8 +133,7 @@ android:hint="@string/year" android:inputType="text|number" android:singleLine="true" - - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> @@ -155,7 +152,7 @@ android:hint="@string/track_hint" android:inputType="text|number" android:singleLine="true" - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> diff --git a/app/src/main/res/layout/artist_detail_header.xml b/app/src/main/res/layout/artist_detail_header.xml index ce188247..0578c0dd 100644 --- a/app/src/main/res/layout/artist_detail_header.xml +++ b/app/src/main/res/layout/artist_detail_header.xml @@ -11,9 +11,9 @@ android:scrollbars="none" /> + android:layout_height="wrap_content" + android:layout_marginTop="-8dp" + android:background="?dividerHorizontal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml index 75fe00c8..576c46e7 100644 --- a/app/src/main/res/layout/dialog_sleep_timer.xml +++ b/app/src/main/res/layout/dialog_sleep_timer.xml @@ -16,7 +16,7 @@ seekarc:rotation="180" seekarc:startAngle="30" seekarc:sweepAngle="300" - seekarc:thumb="?seek_arc_thumb_drawable" /> + seekarc:thumb="@drawable/traditional_slider_thumb" /> - + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> + android:textAppearance="@style/TextAppearance.AppCompat.Caption" /> @@ -58,7 +54,8 @@ android:layout_gravity="center" android:paddingBottom="68dp" android:src="@drawable/ic_check_white_96dp" - android:tint="?check_mark_color" - android:visibility="gone" /> + android:tint="?android:textColorPrimary" + android:visibility="gone" + tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/item_grid_card_horizontal.xml b/app/src/main/res/layout/item_grid_card_horizontal.xml index 1aa49cee..0f8dae89 100644 --- a/app/src/main/res/layout/item_grid_card_horizontal.xml +++ b/app/src/main/res/layout/item_grid_card_horizontal.xml @@ -6,7 +6,7 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:foreground="?rect_selector" - app:cardBackgroundColor="?card_color" + app:cardBackgroundColor="?cardBackgroundColor" app:elevation="@dimen/card_elevation"> diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 210fa6ef..a3f28269 100644 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -36,7 +36,6 @@ android:gravity="center" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:textColor="?title_text_color" android:visibility="gone" /> @@ -58,8 +57,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:textColor="?title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> + android:textColor="?android:textColorSecondary" /> + android:background="?dividerHorizontal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml index 2f66a659..dd0085c3 100644 --- a/app/src/main/res/layout/item_list_single_row.xml +++ b/app/src/main/res/layout/item_list_single_row.xml @@ -37,7 +37,6 @@ android:gravity="center" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:textColor="?title_text_color" android:visibility="gone" /> @@ -54,8 +53,7 @@ android:layout_weight="1" android:fontFamily="sans-serif" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:textColor="?title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> + android:background="?dividerHorizontal" /> \ No newline at end of file diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml index c338ece1..d9728dae 100644 --- a/app/src/main/res/layout/notification.xml +++ b/app/src/main/res/layout/notification.xml @@ -24,10 +24,10 @@ internal:layout_minHeight="64dp"> @@ -73,7 +73,6 @@ android:gravity="bottom" android:singleLine="true" android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" - android:textColor="@color/notification_content_color" tools:ignore="NestedWeights" /> + android:textAppearance="@style/Theme.MaterialMusic.Notification" /> - - - - + android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" /> + android:textAppearance="@style/Theme.MaterialMusic.Notification" /> + android:textAppearance="@style/Theme.MaterialMusic.Notification" /> - - - @@ -47,7 +47,7 @@ android:paddingRight="8dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?themed_drawable_color" + android:textColor="?android:textColorSecondary" android:textSize="10sp" tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" /> @@ -80,8 +80,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif-medium" android:singleLine="true" - android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:textColor="?attr/title_text_color" /> + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> + android:textAppearance="@style/TextAppearance.AppCompat.Caption" /> @@ -188,7 +186,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@id/player_footer_frame" - android:background="@color/black"> + android:background="@android:color/black"> + android:src="@drawable/ic_skip_previous_dark_36dp" /> + android:src="@drawable/ic_play_arrow_dark_36dp" /> + android:src="@drawable/ic_skip_next_dark_36dp" /> diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index c4cd95d8..5ca1088b 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -33,4 +33,8 @@ @android:color/transparent + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7658465b..61b22709 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,24 +1,13 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index aeed71cd..767f3e34 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,34 +1,12 @@ - - #4dffffff - #1f000000 - - #9affffff - #3e000000 - @color/grey_300 - #fff - #0C000000 - @color/grey_400 - #8A000000 + @android:color/white + @color/grey_700 - @color/grey_800 - @color/grey_900 - #0CFFFFFF - @color/grey_900 - @color/white - - #FFFFFF - #99FFFFFF - - - #deFFFFFF - #aaFFFFFF - - #de000000 - #aa000000 + @color/grey_800 + @color/grey_900 \ No newline at end of file diff --git a/app/src/main/res/values/materialcolors.xml b/app/src/main/res/values/materialcolors.xml index f6fa5d16..8607a11e 100644 --- a/app/src/main/res/values/materialcolors.xml +++ b/app/src/main/res/values/materialcolors.xml @@ -2,15 +2,9 @@ #ff4081 - #3f51b5 - #000 - #fff - - #e0e0e0 - #bdbdbd - #9e9e9e + #616161 #424242 #212121 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index beb53eec..841aafba 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,18 +8,7 @@ + + + \ No newline at end of file