android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update button colors to support dynamic themes

Browse Source
This commit is contained in:
ShirkNeko
2025-03-27 12:44:26 +08:00
parent f021cd7a91
commit 11ba242acc
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Module.kt
View File

@@ -783,9 +783,13 @@ fun ModuleItem(
viewModel.markNeedRefresh() viewModel.markNeedRefresh()
}, },
contentPadding = ButtonDefaults.TextButtonContentPadding, contentPadding = ButtonDefaults.TextButtonContentPadding,
colors = ButtonDefaults.filledTonalButtonColors( colors = if (!ThemeConfig.useDynamicColor) {
containerColor = ThemeConfig.currentTheme.ButtonContrast ButtonDefaults.filledTonalButtonColors(
) containerColor = ThemeConfig.currentTheme.ButtonContrast
)
} else {
ButtonDefaults.filledTonalButtonColors()
}
) { ) {
Icon( Icon(
modifier = Modifier.size(20.dp), modifier = Modifier.size(20.dp),
@@ -812,9 +816,13 @@ fun ModuleItem(
onClick = { onClick(module) }, onClick = { onClick(module) },
interactionSource = interactionSource, interactionSource = interactionSource,
contentPadding = ButtonDefaults.TextButtonContentPadding, contentPadding = ButtonDefaults.TextButtonContentPadding,
colors = ButtonDefaults.filledTonalButtonColors( colors = if (!ThemeConfig.useDynamicColor) {
containerColor = ThemeConfig.currentTheme.ButtonContrast ButtonDefaults.filledTonalButtonColors(
) containerColor = ThemeConfig.currentTheme.ButtonContrast
)
} else {
ButtonDefaults.filledTonalButtonColors()
}
) { ) {
Icon( Icon(
modifier = Modifier.size(20.dp), modifier = Modifier.size(20.dp),
@@ -841,9 +849,6 @@ fun ModuleItem(
onClick = { onUpdate(module) }, onClick = { onUpdate(module) },
shape = ButtonDefaults.textShape, shape = ButtonDefaults.textShape,
contentPadding = ButtonDefaults.TextButtonContentPadding, contentPadding = ButtonDefaults.TextButtonContentPadding,
colors = ButtonDefaults.filledTonalButtonColors(
containerColor = ThemeConfig.currentTheme.ButtonContrast
)
) { ) {
Icon( Icon(
modifier = Modifier.size(20.dp), modifier = Modifier.size(20.dp),
@@ -867,9 +872,13 @@ fun ModuleItem(
modifier = Modifier.defaultMinSize(52.dp, 32.dp), modifier = Modifier.defaultMinSize(52.dp, 32.dp),
onClick = { onUninstallClicked(module) }, onClick = { onUninstallClicked(module) },
contentPadding = ButtonDefaults.TextButtonContentPadding, contentPadding = ButtonDefaults.TextButtonContentPadding,
colors = ButtonDefaults.filledTonalButtonColors( colors = if (!ThemeConfig.useDynamicColor) {
containerColor = ThemeConfig.currentTheme.ButtonContrast ButtonDefaults.filledTonalButtonColors(
) containerColor = ThemeConfig.currentTheme.ButtonContrast
)
} else {
ButtonDefaults.filledTonalButtonColors()
}
) { ) {
if (!module.remove) { if (!module.remove) {
Icon( Icon(

2
manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/Color.kt
View File

@@ -34,7 +34,7 @@ sealed class ThemeColors {
override val OnPrimaryContainer = Color(0xFF000000) override val OnPrimaryContainer = Color(0xFF000000)
override val OnSecondaryContainer = Color(0xFF000000) override val OnSecondaryContainer = Color(0xFF000000)
override val OnTertiaryContainer = Color(0xFF000000) override val OnTertiaryContainer = Color(0xFF000000)
override val ButtonContrast = Color(0xFFFFFFFF) override val ButtonContrast = Color(0xFF00BFFF)
} }
// Blue Theme // Blue Theme