From a33094f45f19f994f0601d8ff818f44830932c5c Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Mon, 24 Mar 2025 14:31:11 +0800
Subject: [PATCH] Opt Flash and Install interface button elements, adjust
 colors and dialog box styles

---
 .../shirkneko/zako/sukisu/ui/screen/Flash.kt  |  3 ++
 .../zako/sukisu/ui/screen/Install.kt          | 39 +++++++++++++------
 .../shirkneko/zako/sukisu/ui/screen/Module.kt |  2 -
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Flash.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Flash.kt
index cdf98cb1..d3663517 100644
--- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Flash.kt
+++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Flash.kt
@@ -122,6 +122,7 @@ fun FlashScreen(navigator: DestinationsNavigator, flashIt: FlashIt) {
         },
         floatingActionButton = {
             if (showFloatAction) {
+                val cardColor = MaterialTheme.colorScheme.secondaryContainer
                 val reboot = stringResource(id = R.string.reboot)
                 ExtendedFloatingActionButton(
                     onClick = {
@@ -133,6 +134,8 @@ fun FlashScreen(navigator: DestinationsNavigator, flashIt: FlashIt) {
                     },
                     icon = { Icon(Icons.Filled.Refresh, reboot) },
                     text = { Text(text = reboot) },
+                    containerColor = cardColor.copy(alpha = 1f),
+                    contentColor = MaterialTheme.colorScheme.onSecondaryContainer
                 )
             }
         },
diff --git a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt
index d6cbf449..a8494736 100644
--- a/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt
+++ b/manager/app/src/main/java/shirkneko/zako/sukisu/ui/screen/Install.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
 import androidx.documentfile.provider.DocumentFile
 import com.maxkeppeker.sheets.core.models.base.Header
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
@@ -515,18 +516,32 @@ fun rememberSelectKmiDialog(onSelected: (String?) -> Unit): DialogHandle {
         }
 
         var selection by remember { mutableStateOf<String?>(null) }
-        ListDialog(state = rememberUseCaseState(visible = true, onFinishedRequest = {
-            onSelected(selection)
-        }, onCloseRequest = {
-            dismiss()
-        }), header = Header.Default(
-            title = stringResource(R.string.select_kmi),
-        ), selection = ListSelection.Single(
-            showRadioButtons = true,
-            options = options,
-        ) { _, option ->
-            selection = option.titleText
-        })
+        Surface(
+            color = MaterialTheme.colorScheme.secondaryContainer,
+            contentColor = MaterialTheme.colorScheme.onSecondaryContainer,
+            shape = MaterialTheme.shapes.medium
+        ) {
+            ListDialog(
+                state = rememberUseCaseState(
+                    visible = true,
+                    onFinishedRequest = {
+                        onSelected(selection)
+                    },
+                    onCloseRequest = {
+                        dismiss()
+                    }
+                ),
+                header = Header.Default(
+                    title = stringResource(R.string.select_kmi),
+                ),
+                selection = ListSelection.Single(
+                    showRadioButtons = true,
+                    options = options,
+                ) { _, option ->
+                    selection = option.titleText
+                }
+            )
+        }
     }
 }
 
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 1f7a4eaa..ef769402 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
@@ -111,9 +111,7 @@ import shirkneko.zako.sukisu.ui.viewmodel.ModuleViewModel
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.util.zip.ZipInputStream
-import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.ui.graphics.Color
-import shirkneko.zako.sukisu.ui.theme.CardConfig
 
 
 @OptIn(ExperimentalMaterial3Api::class)