cilly/Awoocord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Zinnia): use correct default colour for unchanged mode

Browse source
This commit is contained in:
Cilly Leang 2026-02-18 17:31:44 +11:00
parent 5fb72078f6
commit e415b22dbd
Signed by: cilly
GPG key ID: 6500251E087653C9
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/Zinnia/src/main/kotlin/moe/lava/awoocord/zinnia/APCAUtil.kt
View file

@ -32,17 +32,21 @@ internal object APCAUtil {
val bcol = GradientDrawable() val bcol = GradientDrawable()
bcol.cornerRadius = 4.dp.toFloat() bcol.cornerRadius = 4.dp.toFloat()
view.background = bcol view.background = bcol
view.setPadding(4.dp, 0, 4.dp, 0)
if (colour == Color.BLACK) { if (colour == Color.BLACK) {
if (settings.blockAlsoDefault) { if (settings.blockAlsoDefault) {
colour = if (isLight && !settings.blockInverted) Color.WHITE else Color.BLACK colour = if (isLight && (settings.blockInverted || settings.blockMode == BlockMode.Unchanged)) {
Color.BLACK
} else {
Color.WHITE
}
} else { } else {
view.background = null view.background = null
view.setPadding(0, 0, 0, 0) view.setPadding(0, 0, 0, 0)
return return
} }
} }
view.setPadding(4.dp, 0, 4.dp, 0)
var (preferred, other) = if (isLight) { var (preferred, other) = if (isLight) {
Color.WHITE to Color.BLACK Color.WHITE to Color.BLACK
@ -53,7 +57,7 @@ internal object APCAUtil {
BlockMode.InvertedThemeOnly -> preferred = other BlockMode.InvertedThemeOnly -> preferred = other
BlockMode.WhiteOnly -> preferred = Color.WHITE BlockMode.WhiteOnly -> preferred = Color.WHITE
BlockMode.BlackOnly -> preferred = Color.BLACK BlockMode.BlackOnly -> preferred = Color.BLACK
BlockMode.Unchanged -> preferred = colourP BlockMode.Unchanged -> preferred = colour
else -> {} else -> {}
} }
@ -88,11 +92,9 @@ internal object APCAUtil {
if (usePreferred) { if (usePreferred) {
view.setTextColor(colours.fgP) view.setTextColor(colours.fgP)
bcol.setColor(ColorUtils.setAlphaComponent(colours.bgP, settings.alpha)) bcol.setColor(ColorUtils.setAlphaComponent(colours.bgP, settings.alpha))
bcol.alpha = settings.alpha
} else { } else {
view.setTextColor(colours.fgO) view.setTextColor(colours.fgO)
bcol.setColor(ColorUtils.setAlphaComponent(colours.bgO, settings.alpha)) bcol.setColor(ColorUtils.setAlphaComponent(colours.bgO, settings.alpha))
bcol.alpha = settings.alpha
} }
} }