diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index b2dfdffc..8108ff57 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -262,14 +262,14 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C .dontTransform() .into(object : RetroMusicColoredTarget(image) { override fun onColorReady(colors: MediaNotificationProcessor) { - setColors(colors.primaryTextColor) + setColors(colors) } }) } - private fun setColors(color: Int) { + private fun setColors(color: MediaNotificationProcessor) { val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor) - color.ripAlpha() + color.backgroundColor.ripAlpha() else ATHUtil.resolveColor(this, R.attr.colorSurface) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt index 72fb6cea..5ca8852c 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt @@ -248,14 +248,14 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, ArtistGlideRequest.Builder.from(Glide.with(this), artist).generatePalette(this).build() .dontAnimate().into(object : RetroMusicColoredTarget(image) { override fun onColorReady(colors: MediaNotificationProcessor) { - setColors(colors.backgroundColor) + setColors(colors) } }) } - private fun setColors(color: Int) { + private fun setColors(color: MediaNotificationProcessor) { val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor) - color.ripAlpha() + color.backgroundColor.ripAlpha() else ATHUtil.resolveColor(this, R.attr.colorSurface) diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt index bbfc03d9..6a4d67e3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt @@ -17,6 +17,7 @@ package code.name.monkey.retromusic.glide import android.graphics.drawable.Drawable import android.widget.ImageView import code.name.monkey.appthemehelper.util.ATHUtil +import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper @@ -33,8 +34,11 @@ abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(vi override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) { super.onLoadFailed(e, errorDrawable) - val colors = MediaNotificationProcessor(getView().context, errorDrawable) + val colors = MediaNotificationProcessor(App.getContext(),errorDrawable) onColorReady(colors) + /* MediaNotificationProcessor(App.getContext()).getPaletteAsync({ + onColorReady(it) + }, errorDrawable)*/ } override fun onResourceReady( @@ -42,8 +46,10 @@ abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(vi glideAnimation: GlideAnimation? ) { super.onResourceReady(resource, glideAnimation) - resource?.let { - onColorReady(MediaNotificationProcessor(getView().context, it.bitmap)) + resource?.let { bitmapWrap -> + MediaNotificationProcessor(App.getContext()).getPaletteAsync({ + onColorReady(it) + }, bitmapWrap.bitmap) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java index af212005..99593367 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java @@ -489,6 +489,7 @@ public class MediaNotificationProcessor { return primaryTextColor; } + public interface OnPaletteLoadedListener { void onPaletteLoaded(MediaNotificationProcessor mediaNotificationProcessor); }