From 11ba242accf0c77357b7c269247f0194f859af3e Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Thu, 27 Mar 2025 12:44:26 +0800
Subject: [PATCH] Update button colors to support dynamic themes

---
 .../shirkneko/zako/sukisu/ui/screen/Module.kt | 33 ++++++++++++-------
 .../shirkneko/zako/sukisu/ui/theme/Color.kt   |  2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Module.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Module.kt
index fb084022..f0e58baa 100644
--- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Module.kt
+++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Module.kt
@@ -783,9 +783,13 @@ fun ModuleItem(
                             viewModel.markNeedRefresh()
                         },
                         contentPadding = ButtonDefaults.TextButtonContentPadding,
-                        colors = ButtonDefaults.filledTonalButtonColors(
-                            containerColor = ThemeConfig.currentTheme.ButtonContrast
-                        )
+                        colors = if (!ThemeConfig.useDynamicColor) {
+                            ButtonDefaults.filledTonalButtonColors(
+                                containerColor = ThemeConfig.currentTheme.ButtonContrast
+                            )
+                        } else {
+                            ButtonDefaults.filledTonalButtonColors()
+                        }
                     ) {
                         Icon(
                             modifier = Modifier.size(20.dp),
@@ -812,9 +816,13 @@ fun ModuleItem(
                         onClick = { onClick(module) },
                         interactionSource = interactionSource,
                         contentPadding = ButtonDefaults.TextButtonContentPadding,
-                        colors = ButtonDefaults.filledTonalButtonColors(
-                            containerColor = ThemeConfig.currentTheme.ButtonContrast
-                        )
+                        colors = if (!ThemeConfig.useDynamicColor) {
+                            ButtonDefaults.filledTonalButtonColors(
+                                containerColor = ThemeConfig.currentTheme.ButtonContrast
+                            )
+                        } else {
+                            ButtonDefaults.filledTonalButtonColors()
+                        }
                     ) {
                         Icon(
                             modifier = Modifier.size(20.dp),
@@ -841,9 +849,6 @@ fun ModuleItem(
                         onClick = { onUpdate(module) },
                         shape = ButtonDefaults.textShape,
                         contentPadding = ButtonDefaults.TextButtonContentPadding,
-                        colors = ButtonDefaults.filledTonalButtonColors(
-                            containerColor = ThemeConfig.currentTheme.ButtonContrast
-                        )
                     ) {
                         Icon(
                             modifier = Modifier.size(20.dp),
@@ -867,9 +872,13 @@ fun ModuleItem(
                     modifier = Modifier.defaultMinSize(52.dp, 32.dp),
                     onClick = { onUninstallClicked(module) },
                     contentPadding = ButtonDefaults.TextButtonContentPadding,
-                    colors = ButtonDefaults.filledTonalButtonColors(
-                        containerColor = ThemeConfig.currentTheme.ButtonContrast
-                    )
+                    colors = if (!ThemeConfig.useDynamicColor) {
+                        ButtonDefaults.filledTonalButtonColors(
+                            containerColor = ThemeConfig.currentTheme.ButtonContrast
+                        )
+                    } else {
+                        ButtonDefaults.filledTonalButtonColors()
+                    }
                 ) {
                     if (!module.remove) {
                         Icon(
diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/Color.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/Color.kt
index 334fd4ff..55f76d96 100644
--- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/Color.kt
+++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/theme/Color.kt
@@ -34,7 +34,7 @@ sealed class ThemeColors {
         override val OnPrimaryContainer = Color(0xFF000000)
         override val OnSecondaryContainer = Color(0xFF000000)
         override val OnTertiaryContainer = Color(0xFF000000)
-        override val ButtonContrast = Color(0xFFFFFFFF)
+        override val ButtonContrast = Color(0xFF00BFFF)
     }
 
     // Blue Theme