feat: 标题添加icon说明

jixiaoyong · Apr 10, 2024 · b843c51 · b843c51
1 parent 7bcb874
commit b843c51
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
     // If you want to use @LyricistStrings to generate code for you
     ksp(libs.lyricist.processor)
 
+    implementation(libs.composeIcons.fontAwesome)
 }
 
 compose.desktop {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ lyricist = "1.6.2-1.8.20"
 gson = "2.10.1"
 ksp = "1.8.20-1.0.10"
 jsystemThemeDetector = "3.6"
+composeIcons = "1.1.0"
 
 [libraries]
 
@@ -21,6 +22,8 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 jsystemThemeDetector = { module = "com.github.Dansoftowner:jSystemThemeDetector", version.ref = "jsystemThemeDetector" }
 
+composeIcons-fontAwesome = { module = "br.com.devsrsouza.compose.icons:font-awesome", version.ref = "composeIcons" }
+
 [plugins]
 
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

diff --git a/src/main/kotlin/io/github/jixiaoyong/pages/settings/Settings.kt b/src/main/kotlin/io/github/jixiaoyong/pages/settings/Settings.kt
@@ -25,6 +25,12 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import cafe.adriel.lyricist.strings
+import compose.icons.FontAwesomeIcons
+import compose.icons.fontawesomeicons.Solid
+import compose.icons.fontawesomeicons.solid.AlignLeft
+import compose.icons.fontawesomeicons.solid.CheckSquare
+import compose.icons.fontawesomeicons.solid.Language
+import compose.icons.fontawesomeicons.solid.UserShield
 import io.github.jixiaoyong.base.viewModel
 import io.github.jixiaoyong.i18n.Locale
 import io.github.jixiaoyong.pages.signapp.DropBoxPanel
@@ -143,6 +149,7 @@ fun PageSettingInfo() {
             InfoItemWidget(i18nString.apksignerDirectory,
                 uiState.apkSign ?: i18nString.notInit,
                 description = i18nString.chooseApksignerTips,
+                icon = FontAwesomeIcons.Solid.UserShield,
                 onClick = {
                     scope.launch {
                         val chooseFileName = FileChooseUtil.chooseSignFile(window, i18nString.plzChooseApksigner)
@@ -159,6 +166,7 @@ fun PageSettingInfo() {
             InfoItemWidget(i18nString.zipDirectory,
                 uiState.zipAlign ?: i18nString.notInit,
                 description = i18nString.chooseZipTips,
+                icon = FontAwesomeIcons.Solid.AlignLeft,
                 onClick = {
                     scope.launch {
                         val chooseFileName = FileChooseUtil.chooseSignFile(window, i18nString.plzChooseZip)
@@ -176,6 +184,12 @@ fun PageSettingInfo() {
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.padding(horizontal = 10.dp, vertical = 10.dp)
             ) {
+                Icon(
+                    FontAwesomeIcons.Solid.CheckSquare,
+                    contentDescription = i18nString.autoMatchSignature, tint = MaterialTheme.colors.primary,
+                    modifier = Modifier.padding(end = 10.dp).size(25.dp)
+                )
+
                 Column(modifier = Modifier.weight(1f, true)) {
                     Text(
                         i18nString.autoMatchSignature,
@@ -219,6 +233,7 @@ fun PageSettingInfo() {
             InfoItemWidget(
                 i18nString.currentLanguageTitle,
                 Locale.getLocale(lyricist.languageTag).languageName,
+                icon = FontAwesomeIcons.Solid.Language,
                 onClick = {
                     viewModel.toggleLanguageDialog()
                 })

diff --git a/src/main/kotlin/io/github/jixiaoyong/pages/signInfos/SignInfos.kt b/src/main/kotlin/io/github/jixiaoyong/pages/signInfos/SignInfos.kt
@@ -24,6 +24,9 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import cafe.adriel.lyricist.strings
+import compose.icons.FontAwesomeIcons
+import compose.icons.fontawesomeicons.Solid
+import compose.icons.fontawesomeicons.solid.Key
 import io.github.jixiaoyong.beans.SignInfoBean
 import io.github.jixiaoyong.utils.FileChooseUtil
 import io.github.jixiaoyong.utils.showToast
@@ -75,6 +78,12 @@ fun PageSignInfo(viewModel: SignInfoViewModel) {
                     },
                 verticalAlignment = Alignment.CenterVertically
             ) {
+                Icon(
+                    FontAwesomeIcons.Solid.Key,
+                    contentDescription = i18nStrings.currentSignInfo, tint = MaterialTheme.colors.primary,
+                    modifier = Modifier.padding(start = 10.dp, end = 10.dp).size(25.dp)
+                )
+
                 Text(
                     i18nStrings.currentSignInfo,
                     style = TextStyle(

diff --git a/src/main/kotlin/io/github/jixiaoyong/pages/signapp/SignApp.kt b/src/main/kotlin/io/github/jixiaoyong/pages/signapp/SignApp.kt
@@ -25,6 +25,14 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Popup
 import cafe.adriel.lyricist.strings
+import compose.icons.FontAwesomeIcons
+import compose.icons.fontawesomeicons.Brands
+import compose.icons.fontawesomeicons.Solid
+import compose.icons.fontawesomeicons.brands.Android
+import compose.icons.fontawesomeicons.solid.AlignLeft
+import compose.icons.fontawesomeicons.solid.Key
+import compose.icons.fontawesomeicons.solid.ListOl
+import compose.icons.fontawesomeicons.solid.SignOutAlt
 import io.github.jixiaoyong.beans.CommandResult
 import io.github.jixiaoyong.beans.SignType
 import io.github.jixiaoyong.pages.Routes
@@ -211,6 +219,7 @@ fun PageSignApp(
                         "\n"
                     ),
                     buttonTitle = i18nStrings.checkSignInfo,
+                    icon = FontAwesomeIcons.Brands.Android,
                     onClick = {
                         scope.launch(Dispatchers.IO) {
                             if (currentApkFilePath.isEmpty()) {
@@ -227,6 +236,7 @@ fun PageSignApp(
                 InfoItemWidget(
                     i18nStrings.currentSignInfo,
                     uiState.currentSignInfo?.toString() ?: i18nStrings.noContent,
+                    icon = FontAwesomeIcons.Solid.Key,
                     onClick = {
                         onChangePage(Routes.SignInfo)
                         viewModel.removeApkSignature(uiState.apkPackageName)
@@ -236,6 +246,7 @@ fun PageSignApp(
                 InfoItemWidget(
                     i18nStrings.signedApkOutputDir,
                     uiState.signedOutputDirectory ?: errorTips,
+                    icon = FontAwesomeIcons.Solid.SignOutAlt,
                     onClick = {
                         scope.launch {
                             val outputDirectory =
@@ -257,6 +268,7 @@ fun PageSignApp(
                 InfoItemWidget(
                     i18nStrings.signType,
                     null,
+                    icon = FontAwesomeIcons.Solid.ListOl,
                     showChangeButton = false
                 ) {
                     Row {
@@ -288,13 +300,19 @@ fun PageSignApp(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = Modifier.fillMaxWidth()
                 ) {
+                    Icon(
+                        FontAwesomeIcons.Solid.AlignLeft,
+                        contentDescription = i18nStrings.isApkAlign, tint = MaterialTheme.colors.primary,
+                        modifier = Modifier.padding(start = 10.dp, end = 10.dp).size(25.dp)
+                    )
+
                     Text(
                         i18nStrings.isApkAlign,
                         style = TextStyle(
                             fontWeight = FontWeight.ExtraBold,
                             fontSize = 16.sp,
                         ),
-                        modifier = Modifier.weight(1f).padding(start = 10.dp)
+                        modifier = Modifier.weight(1f)
                     )
 
                     Switch(checked = uiState.isZipAlign,

diff --git a/src/main/kotlin/io/github/jixiaoyong/widgets/InfoItemWidget.kt b/src/main/kotlin/io/github/jixiaoyong/widgets/InfoItemWidget.kt
@@ -4,11 +4,13 @@ import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -28,6 +30,7 @@ import cafe.adriel.lyricist.strings
 fun InfoItemWidget(
     title: String,
     value: String?,
+    icon: ImageVector? = null,
     description: String? = null,
     buttonTitle: String? = null,
     showChangeButton: Boolean = true,
@@ -41,6 +44,11 @@ fun InfoItemWidget(
                 .padding(vertical = 5.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
+            if (null != icon) Icon(
+                icon, contentDescription = title, tint = MaterialTheme.colors.primary,
+                modifier = Modifier.padding(end = 10.dp).size(25.dp)
+            )
+
             Column(modifier = Modifier.weight(8f)) {
                 Text(
                     title,