refactor: 统一按钮样式

jixiaoyong · Jan 30, 2024 · 72d05a6 · 72d05a6
1 parent b5807d7
commit 72d05a6
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 46 deletions.
diff --git a/src/main/kotlin/io/github/jixiaoyong/pages/settings/Settings.kt b/src/main/kotlin/io/github/jixiaoyong/pages/settings/Settings.kt
@@ -131,7 +131,7 @@ fun PageSettingInfo(window: ComposeWindow, settings: SettingsTool) {
                                     oldDirectory
                                 )
                             if (chooseFileName.isNullOrBlank()) {
-                                showToast("请选择build-tools目录",ToastConfig.DURATION.Long)
+                                showToast("请选择build-tools目录", ToastConfig.DURATION.Long)
                             } else {
                                 val result = ApkSigner.init(chooseFileName)
                                 saveApkSigner(settings, ApkSigner.apkSignerPath)
@@ -164,7 +164,7 @@ fun PageSettingInfo(window: ComposeWindow, settings: SettingsTool) {
                         val chooseFileName =
                             FileChooseUtil.chooseSignFile(window, "请选择apksigner文件")
                         if (chooseFileName.isNullOrBlank()) {
-                            showToast("请选择apksigner文件",ToastConfig.DURATION.Long)
+                            showToast("请选择apksigner文件", ToastConfig.DURATION.Long)
                         } else {
                             val result = ApkSigner.setupApkSigner(chooseFileName)
                             saveApkSigner(settings, ApkSigner.apkSignerPath)
@@ -179,7 +179,7 @@ fun PageSettingInfo(window: ComposeWindow, settings: SettingsTool) {
                     scope.launch {
                         val chooseFileName = FileChooseUtil.chooseSignFile(window, "请选择zipAlign文件")
                         if (chooseFileName.isNullOrBlank()) {
-                            showToast("请选择zipAlign文件",ToastConfig.DURATION.Long)
+                            showToast("请选择zipAlign文件", ToastConfig.DURATION.Long)
                         } else {
                             val result = ApkSigner.setupZipAlign(chooseFileName)
                             saveZipAlign(settings, ApkSigner.zipAlignPath)
@@ -189,16 +189,11 @@ fun PageSettingInfo(window: ComposeWindow, settings: SettingsTool) {
                 })
 
             Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
-
-                val modifier = Modifier.size(250.dp, 50.dp)
-                    .background(
-                        MaterialTheme.colors.secondary,
-                        shape = RoundedCornerShape(15.dp)
-                    ).padding(horizontal = 15.dp, vertical = 5.dp)
-
-                ButtonWidget(onClick = {
-                    showResetDialog = true
-                }, title = "重置", modifier = modifier)
+                ButtonWidget(
+                    onClick = { showResetDialog = true },
+                    title = "重置",
+                    modifier = Modifier.size(250.dp, 50.dp)
+                )
             }
 
             Column(

diff --git a/src/main/kotlin/io/github/jixiaoyong/pages/signInfos/SignInfos.kt b/src/main/kotlin/io/github/jixiaoyong/pages/signInfos/SignInfos.kt
@@ -185,31 +185,34 @@ fun PageSignInfo(window: ComposeWindow, settings: SettingsTool, newSignInfo: Mut
                     horizontalArrangement = Arrangement.Center,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    Button(enabled = newSignInfo.value.isValid(), onClick = {
-                        // save sign info to local storage
-                        val newSignInfos = mutableListOf<SignInfoBean>()
-                        newSignInfos.addAll(signInfoList)
-                        val indexOfSignInfo =
-                            newSignInfos.indexOfFirst { it.isSameOne(newSignInfo.value) }
-                        if (-1 != indexOfSignInfo) {
-                            newSignInfos[indexOfSignInfo] = newSignInfo.value
-                        } else {
-                            newSignInfos.add(newSignInfo.value)
-                        }
-                        settings.save(StorageKeys.SIGN_INFO_LIST, gson.toJson(newSignInfos))
-                        scope.launch {
-                            val isNeedClean = scaffoldState.snackbarHostState.showSnackbar(
-                                "🎉保存成功！\n请点击【重新选择签名】按钮查看，是否清除已填写内容？",
-                                actionLabel = "清空",
-                                duration = SnackbarDuration.Short
-                            )
-                            if (SnackbarResult.ActionPerformed == isNeedClean) {
-                                newSignInfo.value = SignInfoBean()
+                    ButtonWidget(
+                        enabled = newSignInfo.value.isValid(),
+                        onClick = {
+                            // save sign info to local storage
+                            val newSignInfos = mutableListOf<SignInfoBean>()
+                            newSignInfos.addAll(signInfoList)
+                            val indexOfSignInfo =
+                                newSignInfos.indexOfFirst { it.isSameOne(newSignInfo.value) }
+                            if (-1 != indexOfSignInfo) {
+                                newSignInfos[indexOfSignInfo] = newSignInfo.value
+                            } else {
+                                newSignInfos.add(newSignInfo.value)
                             }
-                        }
-                    }) {
-                        Text("保存新签名文件")
-                    }
+                            settings.save(StorageKeys.SIGN_INFO_LIST, gson.toJson(newSignInfos))
+                            scope.launch {
+                                val isNeedClean = scaffoldState.snackbarHostState.showSnackbar(
+                                    "🎉保存成功！\n请点击【重新选择签名】按钮查看，是否清除已填写内容？",
+                                    actionLabel = "清空",
+                                    duration = SnackbarDuration.Short
+                                )
+                                if (SnackbarResult.ActionPerformed == isNeedClean) {
+                                    newSignInfo.value = SignInfoBean()
+                                }
+                            }
+                        },
+                        title = "保存新签名文件",
+                        modifier = Modifier.size(250.dp, 50.dp)
+                    )
                 }
 
             }
@@ -253,7 +256,7 @@ private fun SignInfoItem(
 
         Row(modifier = Modifier.weight(0.25f)) {
             Text(name)
-           HoverableTooltip(description = description) { modifier ->
+            HoverableTooltip(description = description) { modifier ->
                 Icon(
                     Icons.Default.Info,
                     contentDescription = "description information",

diff --git a/src/main/kotlin/io/github/jixiaoyong/widgets/Buttons.kt b/src/main/kotlin/io/github/jixiaoyong/widgets/Buttons.kt
@@ -4,6 +4,7 @@ import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
@@ -31,15 +32,10 @@ fun ButtonWidget(
 ) {
     Button(
         onClick = onClick,
-        colors = ButtonDefaults.buttonColors(
-            backgroundColor = MaterialTheme.colors.secondary,
-            disabledBackgroundColor = MaterialTheme.colors.surface,
-            contentColor = MaterialTheme.colors.onSecondary,
-        ),
+        colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.secondary),
         shape = RoundedCornerShape(10.dp),
         contentPadding = PaddingValues(horizontal = 15.dp, vertical = 10.dp),
-        modifier = modifier ?: Modifier
-            .padding(horizontal = 5.dp),
+        modifier = (modifier ?: Modifier).padding(horizontal = 5.dp).widthIn(100.dp),
         enabled = enabled,
         elevation = ButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp, 0.dp),
     ) {
@@ -57,7 +53,7 @@ private fun ButtonWidgetPreview() {
     Column {
         ButtonWidget(onClick = {
 
-        }) {
+        }, modifier = Modifier.widthIn(300.dp)) {
             Text("123")
         }