From cb116286ed52c2455705c84103324d400e4f88a3 Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Mon, 31 Mar 2025 14:33:23 +0800
Subject: [PATCH] Manager: Fix the problem that the contrast of key color is
 too light

---
 .../main/java/shirkneko/zako/sukisu/ui/screen/Module.kt    | 6 +++++-
 .../main/java/shirkneko/zako/sukisu/ui/screen/Template.kt  | 7 ++++++-
 2 files changed, 11 insertions(+), 2 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 f0e58baa..3286925b 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
@@ -346,7 +346,11 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
         floatingActionButton = {
             if (!hideInstallButton) {
                 val moduleInstall = stringResource(id = R.string.module_install)
-                val cardColor = MaterialTheme.colorScheme.secondaryContainer
+                val cardColor = if (!ThemeConfig.useDynamicColor) {
+                    ThemeConfig.currentTheme.ButtonContrast
+                } else {
+                    MaterialTheme.colorScheme.secondaryContainer
+                }
                 ExtendedFloatingActionButton(
                     onClick = {
                         selectZipLauncher.launch(
diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Template.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Template.kt
index f0af0ea3..3ba1dd79 100644
--- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Template.kt
+++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Template.kt
@@ -60,6 +60,7 @@ import com.ramcosta.composedestinations.result.getOr
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import shirkneko.zako.sukisu.R
+import shirkneko.zako.sukisu.ui.theme.ThemeConfig
 import shirkneko.zako.sukisu.ui.viewmodel.TemplateViewModel
 
 /**
@@ -77,7 +78,11 @@ fun AppProfileTemplateScreen(
     val viewModel = viewModel<TemplateViewModel>()
     val scope = rememberCoroutineScope()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    val cardColor = MaterialTheme.colorScheme.secondaryContainer
+    val cardColor = if (!ThemeConfig.useDynamicColor) {
+        ThemeConfig.currentTheme.ButtonContrast
+    } else {
+        MaterialTheme.colorScheme.secondaryContainer
+    }
 
     LaunchedEffect(Unit) {
         if (viewModel.templateList.isEmpty()) {