From a7cb077cee25f148423ef3f039275cb4f9d38e00 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 13 Jun 2021 14:39:16 +0900 Subject: [PATCH] replace all text color helper methods --- .../details/AlbumDetailActivity.java | 6 +-- .../details/ArtistDetailActivity.java | 4 +- .../adapter/album/AlbumAdapter.java | 6 +-- .../adapter/album/HorizontalAlbumAdapter.java | 6 +-- .../adapter/artist/ArtistAdapter.java | 6 +-- .../gramophone/adapter/song/SongAdapter.java | 6 +-- .../fragments/main/LibraryFragment.java | 6 +-- .../CardPlayerPlaybackControlsFragment.java | 16 +++--- .../FlatPlayerPlaybackControlsFragment.java | 14 +++--- .../palette/BitmapPaletteTranscoder.java | 6 +-- .../PlayingNotificationMarshmallow.java | 5 +- .../dkanada/gramophone/util/ThemeUtil.java | 50 +++++++++---------- .../com/dkanada/gramophone/util/ViewUtil.java | 3 +- .../gramophone/views/ColorCircleDrawable.java | 4 +- .../views/widgets/AppWidgetAlbum.java | 14 +++--- .../views/widgets/AppWidgetCard.java | 20 ++++---- .../views/widgets/AppWidgetClassic.java | 14 +++--- app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/colors.xml | 5 ++ 19 files changed, 96 insertions(+), 96 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java index 6eff0df3..a4851e86 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java @@ -15,9 +15,9 @@ import com.afollestad.materialdialogs.util.DialogUtils; import com.dkanada.gramophone.BuildConfig; import com.dkanada.gramophone.activities.base.AbsMusicContentActivity; import com.dkanada.gramophone.databinding.ActivityAlbumDetailBinding; +import com.dkanada.gramophone.util.ThemeUtil; import com.google.android.material.appbar.AppBarLayout; import com.kabouzeid.appthemehelper.util.ColorUtil; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; import com.dkanada.gramophone.adapter.song.AlbumSongAdapter; import com.dkanada.gramophone.dialogs.AddToPlaylistDialog; @@ -124,13 +124,13 @@ public class AlbumDetailActivity extends AbsMusicContentActivity implements Pale // needed to auto readjust the toolbar content color setSupportActionBar(binding.toolbar); - int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); + int secondaryTextColor = ThemeUtil.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); binding.artistIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); binding.durationIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); binding.songCountIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); binding.albumYearIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); - binding.artistText.setTextColor(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(color))); + binding.artistText.setTextColor(ThemeUtil.getPrimaryTextColor(this, ColorUtil.isColorLight(color))); binding.durationText.setTextColor(secondaryTextColor); binding.songCountText.setTextColor(secondaryTextColor); binding.albumYearText.setTextColor(secondaryTextColor); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java index 8046343d..4dbd58de 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java @@ -18,9 +18,9 @@ import com.dkanada.gramophone.activities.base.AbsMusicContentActivity; import com.dkanada.gramophone.adapter.song.SongAdapter; import com.dkanada.gramophone.databinding.ActivityArtistDetailBinding; import com.dkanada.gramophone.util.NavigationUtil; +import com.dkanada.gramophone.util.ThemeUtil; import com.google.android.material.appbar.AppBarLayout; import com.kabouzeid.appthemehelper.util.ColorUtil; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; import com.dkanada.gramophone.adapter.album.HorizontalAlbumAdapter; import com.dkanada.gramophone.dialogs.AddToPlaylistDialog; @@ -174,7 +174,7 @@ public class ArtistDetailActivity extends AbsMusicContentActivity implements Pal // needed to auto readjust the toolbar content color setSupportActionBar(binding.toolbar); - int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); + int secondaryTextColor = ThemeUtil.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); binding.durationIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); binding.songCountIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); binding.albumCountIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java index a60d9afe..b4c33e2c 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java @@ -13,8 +13,8 @@ import androidx.core.util.Pair; import androidx.appcompat.app.AppCompatActivity; import com.dkanada.gramophone.util.QueryUtil; +import com.dkanada.gramophone.util.ThemeUtil; import com.kabouzeid.appthemehelper.util.ColorUtil; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; import com.dkanada.gramophone.adapter.base.AbsMultiSelectAdapter; import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder; @@ -116,11 +116,11 @@ public class AlbumAdapter extends AbsMultiSelectAdapter { binding.playerPlayPauseFab.setPivotX(binding.playerPlayPauseFab.getWidth() / 2f); @@ -154,7 +154,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void updateProgressTextColor() { - int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); + int color = ThemeUtil.getPrimaryTextColor(requireContext(), false); binding.playerSongTotalTime.setTextColor(color); binding.playerSongCurrentProgress.setTextColor(color); } @@ -217,7 +217,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void setUpProgressSlider() { - int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); + int color = ThemeUtil.getPrimaryTextColor(requireContext(), false); binding.playerProgressSlider.getThumb().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN); binding.playerProgressSlider.getProgressDrawable().mutate().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN); diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java index 997d77b7..b826d526 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java @@ -17,7 +17,7 @@ import androidx.annotation.NonNull; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import com.dkanada.gramophone.databinding.FragmentFlatPlayerPlaybackControlsBinding; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; +import com.dkanada.gramophone.util.ThemeUtil; import com.dkanada.gramophone.R; import com.dkanada.gramophone.helper.MusicPlayerRemote; import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper; @@ -106,11 +106,11 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment public void setDark(boolean dark) { if (dark) { - lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireActivity(), true); - lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireActivity(), true); + lastPlaybackControlsColor = ThemeUtil.getSecondaryTextColor(requireActivity(), true); + lastDisabledPlaybackControlsColor = ThemeUtil.getDisabledTextColor(ThemeUtil.getSecondaryTextColor(requireActivity(), true)); } else { - lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireActivity(), false); - lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireActivity(), false); + lastPlaybackControlsColor = ThemeUtil.getPrimaryTextColor(requireActivity(), false); + lastDisabledPlaybackControlsColor = ThemeUtil.getDisabledTextColor(ThemeUtil.getPrimaryTextColor(requireActivity(), false)); } updateRepeatState(); @@ -159,7 +159,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void updateProgressTextColor() { - int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); + int color = ThemeUtil.getPrimaryTextColor(requireContext(), false); binding.playerSongTotalTime.setTextColor(color); binding.playerSongCurrentProgress.setTextColor(color); } @@ -272,7 +272,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment } private void setUpProgressSlider() { - int color = MaterialValueHelper.getPrimaryTextColor(requireContext(), false); + int color = ThemeUtil.getPrimaryTextColor(requireContext(), false); binding.playerProgressSlider.getThumb().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN); binding.playerProgressSlider.getProgressDrawable().mutate().setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN); diff --git a/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java b/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java index 592a41f7..0212bd22 100644 --- a/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java +++ b/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java @@ -3,12 +3,12 @@ package com.dkanada.gramophone.glide.palette; import android.graphics.Bitmap; import androidx.annotation.NonNull; +import androidx.palette.graphics.Palette; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.engine.Resource; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.transcode.ResourceTranscoder; -import com.dkanada.gramophone.util.ThemeUtil; public class BitmapPaletteTranscoder implements ResourceTranscoder { private final BitmapPool bitmapPool; @@ -19,7 +19,7 @@ public class BitmapPaletteTranscoder implements ResourceTranscoder transcode(@NonNull Resource resource, @NonNull Options options) { - BitmapPaletteWrapper bitmapPaletteWrapper = new BitmapPaletteWrapper(resource.get(), ThemeUtil.generatePalette(resource.get())); + BitmapPaletteWrapper bitmapPaletteWrapper = new BitmapPaletteWrapper(resource.get(), Palette.from(resource.get()).generate()); return new BitmapPaletteResource(bitmapPaletteWrapper, bitmapPool); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/dkanada/gramophone/service/notifications/PlayingNotificationMarshmallow.java b/app/src/main/java/com/dkanada/gramophone/service/notifications/PlayingNotificationMarshmallow.java index c5283de8..5e8751f4 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/notifications/PlayingNotificationMarshmallow.java +++ b/app/src/main/java/com/dkanada/gramophone/service/notifications/PlayingNotificationMarshmallow.java @@ -21,7 +21,6 @@ import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import com.kabouzeid.appthemehelper.util.ColorUtil; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper; @@ -139,8 +138,8 @@ public class PlayingNotificationMarshmallow extends PlayingNotification { } private void setNotificationContent(boolean dark) { - int primary = MaterialValueHelper.getPrimaryTextColor(service, dark); - int secondary = MaterialValueHelper.getSecondaryTextColor(service, dark); + int primary = ThemeUtil.getPrimaryTextColor(service, dark); + int secondary = ThemeUtil.getSecondaryTextColor(service, dark); Bitmap prev = ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, primary), 1.5f); Bitmap next = ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, primary), 1.5f); diff --git a/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java b/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java index 1e7da591..780351eb 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java @@ -1,25 +1,20 @@ package com.dkanada.gramophone.util; import android.content.res.ColorStateList; -import android.graphics.Bitmap; +import android.content.Context; import androidx.annotation.ColorInt; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.palette.graphics.Palette; -import com.kabouzeid.appthemehelper.util.ColorUtil; +import com.dkanada.gramophone.R; +import com.google.android.material.color.MaterialColors; import java.util.Collections; import java.util.Comparator; public class ThemeUtil { - @Nullable - public static Palette generatePalette(Bitmap bitmap) { - if (bitmap == null) return null; - - return Palette.from(bitmap).generate(); - } - public static ColorStateList getColorStateList(int normal, int active) { int[][] states = new int[][]{ new int[]{-android.R.attr.state_checked}, @@ -57,6 +52,25 @@ public class ThemeUtil { return fallback; } + @ColorInt + public static int getPrimaryTextColor(Context context, boolean light) { + return light + ? ContextCompat.getColor(context, R.color.color_text_primary_light) + : ContextCompat.getColor(context, R.color.color_text_primary_dark); + } + + @ColorInt + public static int getSecondaryTextColor(Context context, boolean light) { + return light + ? ContextCompat.getColor(context, R.color.color_text_secondary_light) + : ContextCompat.getColor(context, R.color.color_text_secondary_dark); + } + + @ColorInt + public static int getDisabledTextColor(int color) { + return MaterialColors.compositeARGBWithAlpha(color, 140); + } + private static class SwatchComparator implements Comparator { private static SwatchComparator sInstance; @@ -73,22 +87,4 @@ public class ThemeUtil { return lhs.getPopulation() - rhs.getPopulation(); } } - - @ColorInt - public static int shiftBackgroundColorForLightText(@ColorInt int backgroundColor) { - while (ColorUtil.isColorLight(backgroundColor)) { - backgroundColor = ColorUtil.darkenColor(backgroundColor); - } - - return backgroundColor; - } - - @ColorInt - public static int shiftBackgroundColorForDarkText(@ColorInt int backgroundColor) { - while (!ColorUtil.isColorLight(backgroundColor)) { - backgroundColor = ColorUtil.lightenColor(backgroundColor); - } - - return backgroundColor; - } } diff --git a/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java b/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java index 16b47cc1..390829a1 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java @@ -21,7 +21,6 @@ import androidx.annotation.ColorInt; import com.kabouzeid.appthemehelper.util.ATHUtil; import com.kabouzeid.appthemehelper.util.ColorUtil; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; @@ -79,7 +78,7 @@ public class ViewUtil { public static void setUpFastScrollRecyclerViewColor(Context context, FastScrollRecyclerView recyclerView, int accentColor) { recyclerView.setPopupBgColor(accentColor); - recyclerView.setPopupTextColor(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(accentColor))); + recyclerView.setPopupTextColor(ThemeUtil.getPrimaryTextColor(context, ColorUtil.isColorLight(accentColor))); recyclerView.setThumbColor(accentColor); recyclerView.setTrackColor(ColorUtil.withAlpha(ATHUtil.resolveColor(context, R.attr.colorControlNormal), 0.12f)); } diff --git a/app/src/main/java/com/dkanada/gramophone/views/ColorCircleDrawable.java b/app/src/main/java/com/dkanada/gramophone/views/ColorCircleDrawable.java index 00705c21..bf1c487a 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/ColorCircleDrawable.java +++ b/app/src/main/java/com/dkanada/gramophone/views/ColorCircleDrawable.java @@ -18,8 +18,8 @@ public class ColorCircleDrawable extends View { super(context, attrs); TypedArray attributes = getContext().obtainStyledAttributes(new int[]{android.R.attr.divider}); - int colorCircle = getContext().getResources().getColor(android.R.color.black); - int colorBorder = getContext().getResources().getColor(android.R.color.darker_gray); + int colorCircle = getContext().getResources().getColor(android.R.color.white); + int colorBorder = getContext().getResources().getColor(android.R.color.black); circle.setAntiAlias(true); circle.setColor(colorCircle); diff --git a/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java index eef9a1da..8f91b26d 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java +++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetAlbum.java @@ -17,7 +17,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; +import com.dkanada.gramophone.util.ThemeUtil; import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.model.Song; @@ -55,9 +55,9 @@ public class AppWidgetAlbum extends BaseAppWidget { appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE); appWidgetView.setImageViewBitmap(R.id.image, createRoundedBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.default_album_art), imageSize, imageSize, cardRadius, cardRadius, cardRadius, cardRadius)); - appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false)))); - appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false)))); - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false)))); + appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, ThemeUtil.getPrimaryTextColor(context, false)))); + appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, ThemeUtil.getPrimaryTextColor(context, false)))); + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, ThemeUtil.getPrimaryTextColor(context, false)))); linkButtons(context, appWidgetView, R.id.clickable_area); pushUpdate(context, appWidgetIds, appWidgetView); @@ -79,10 +79,10 @@ public class AppWidgetAlbum extends BaseAppWidget { } int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp; - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getPrimaryTextColor(service, false)))); + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, playPauseRes, ThemeUtil.getPrimaryTextColor(service, false)))); - appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, false)))); - appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, false)))); + appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, ThemeUtil.getPrimaryTextColor(service, false)))); + appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, ThemeUtil.getPrimaryTextColor(service, false)))); linkButtons(service, appWidgetView, R.id.clickable_area); diff --git a/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java index 4fdd188d..66a57393 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java +++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetCard.java @@ -17,7 +17,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; +import com.dkanada.gramophone.util.ThemeUtil; import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper; @@ -53,9 +53,9 @@ public class AppWidgetCard extends BaseAppWidget { appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE); appWidgetView.setImageViewBitmap(R.id.image, createRoundedBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.default_album_art), imageSize, imageSize, cardRadius, 0, cardRadius, 0)); - appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true)))); - appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true)))); - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true)))); + appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, ThemeUtil.getSecondaryTextColor(context, true)))); + appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, ThemeUtil.getSecondaryTextColor(context, true)))); + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, ThemeUtil.getSecondaryTextColor(context, true)))); linkButtons(context, appWidgetView, R.id.image, R.id.media_titles); pushUpdate(context, appWidgetIds, appWidgetView); @@ -77,10 +77,10 @@ public class AppWidgetCard extends BaseAppWidget { } int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp; - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, playPauseRes, MaterialValueHelper.getSecondaryTextColor(service, true)))); + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, playPauseRes, ThemeUtil.getSecondaryTextColor(service, true)))); - appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(service, true)))); - appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(service, true)))); + appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, ThemeUtil.getSecondaryTextColor(service, true)))); + appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, ThemeUtil.getSecondaryTextColor(service, true)))); linkButtons(service, appWidgetView, R.id.image, R.id.media_titles); @@ -101,19 +101,19 @@ public class AppWidgetCard extends BaseAppWidget { @Override public void onResourceReady(@NonNull BitmapPaletteWrapper resource, Transition glideAnimation) { Palette palette = resource.getPalette(); - update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(MaterialValueHelper.getSecondaryTextColor(service, true)))); + update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(ThemeUtil.getSecondaryTextColor(service, true)))); } @Override public void onLoadFailed(Drawable drawable) { super.onLoadFailed(drawable); - update(null, MaterialValueHelper.getSecondaryTextColor(service, true)); + update(null, ThemeUtil.getSecondaryTextColor(service, true)); } @Override public void onLoadCleared(Drawable drawable) { super.onLoadFailed(drawable); - update(null, MaterialValueHelper.getSecondaryTextColor(service, true)); + update(null, ThemeUtil.getSecondaryTextColor(service, true)); } private void update(@Nullable Bitmap bitmap, int color) { diff --git a/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java index ec872ebd..95b6fa62 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java +++ b/app/src/main/java/com/dkanada/gramophone/views/widgets/AppWidgetClassic.java @@ -17,7 +17,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; -import com.kabouzeid.appthemehelper.util.MaterialValueHelper; +import com.dkanada.gramophone.util.ThemeUtil; import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper; @@ -53,9 +53,9 @@ public class AppWidgetClassic extends BaseAppWidget { appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE); appWidgetView.setImageViewBitmap(R.id.image, createRoundedBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.default_album_art), imageSize, imageSize, cardRadius, 0, cardRadius, 0)); - appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true)))); - appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true)))); - appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true)))); + appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, ThemeUtil.getSecondaryTextColor(context, true)))); + appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, ThemeUtil.getSecondaryTextColor(context, true)))); + appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, ThemeUtil.getSecondaryTextColor(context, true)))); linkButtons(context, appWidgetView, R.id.image, R.id.media_titles); pushUpdate(context, appWidgetIds, appWidgetView); @@ -95,19 +95,19 @@ public class AppWidgetClassic extends BaseAppWidget { @Override public void onResourceReady(@NonNull BitmapPaletteWrapper resource, Transition glideAnimation) { Palette palette = resource.getPalette(); - update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(MaterialValueHelper.getSecondaryTextColor(service, true)))); + update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(ThemeUtil.getSecondaryTextColor(service, true)))); } @Override public void onLoadFailed(Drawable drawable) { super.onLoadFailed(drawable); - update(null, MaterialValueHelper.getSecondaryTextColor(service, true)); + update(null, ThemeUtil.getSecondaryTextColor(service, true)); } @Override public void onLoadCleared(Drawable drawable) { super.onLoadFailed(drawable); - update(null, MaterialValueHelper.getSecondaryTextColor(service, true)); + update(null, ThemeUtil.getSecondaryTextColor(service, true)); } private void update(@Nullable Bitmap bitmap, int color) { diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index efd506aa..246168f1 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -5,6 +5,7 @@ + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 333fcf57..08973230 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,6 +11,11 @@ #607D8B #F5F5F5 + #DE000000 + #8A000000 + #FFFFFFFF + #B3FFFFFF + #FFFFFFFF #80000000 #40000000