diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt index be3c4dd08..d3fe516e0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt @@ -130,10 +130,11 @@ fun MaterialButton.accentOutlineColor() { fun MaterialButton.elevatedAccentColor() { if (materialYou) return - val color = ThemeStore.accentColor(context) - val colorStateList = ColorStateList.valueOf(color) - iconTint = colorStateList - rippleColor = colorStateList + val color = context.darkAccentColorVariant() + rippleColor = ColorStateList.valueOf(color) + setBackgroundColor(color) + setTextColor(MaterialValueHelper.getPrimaryTextColor(context, color.isColorLight)) + iconTint = ColorStateList.valueOf(context.accentColor()) } fun SeekBar.applyColor(@ColorInt color: Int) { @@ -250,5 +251,14 @@ fun Context.darkAccentColor(): Int { ) } +@ColorInt +fun Context.darkAccentColorVariant(): Int { + return ColorUtils.blendARGB( + accentColor(), + surfaceColor(), + if (surfaceColor().isColorLight) 0.9f else 0.95f + ) +} + inline val @receiver:ColorInt Int.isColorLight get() = ColorUtil.isColorLight(this)