Skip to content

Commit

Permalink
refactor: 优化APP的UI样式
Browse files Browse the repository at this point in the history
  • Loading branch information
jixiaoyong committed Mar 31, 2024
1 parent e20cdf1 commit a52e8a6
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 83 deletions.
14 changes: 12 additions & 2 deletions src/main/kotlin/io/github/jixiaoyong/beans/SignType.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package io.github.jixiaoyong.beans

import io.github.jixiaoyong.i18n.Strings

/**
* @author : jixiaoyong
* @description :签名类型
*
* @email : jixiaoyong1995@gmail.com
* @date : 2023/8/25
*/
sealed class SignType(val type: Int, val name: String, val description: String? = null) {
object V1 : SignType(1, "V1", "Android最低API为24+时无法使用V1签名")
sealed class SignType(val type: Int, val name: String) {
object V1 : SignType(1, "V1")
object V2 : SignType(2, "V2")
object V3 : SignType(3, "V3")
object V4 : SignType(4, "V4")
Expand All @@ -18,6 +20,14 @@ sealed class SignType(val type: Int, val name: String, val description: String?
return "$type"
}

fun description(i18nString: Strings):String? {
return if(V1.type ==type){
i18nString.signType1Desc
}else{
null
}
}

companion object {

val DEF_SIGN_TYPES = listOf(V1, V2)
Expand Down
22 changes: 21 additions & 1 deletion src/main/kotlin/io/github/jixiaoyong/i18n/StringEn.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal val EnStrings = Strings(
confirm = "Confirm",
change = "Change",
noContent = "No content",
currentSignInfo = "Current signature: ",
currentSignInfo = "Current signature",
changeSignInfo = "Re-select signature",
deleteSignInfoTips = "Delete this tool stored signature information, it won't delete your APK signature files",
nickName = "Signature nickname",
Expand Down Expand Up @@ -59,6 +59,26 @@ internal val EnStrings = Strings(
"This is a small tool for local visualization of signed APKs. \nIn order to avoid leaking information such as keys, this tool will not be connected to the Internet.\n" +
"Current version:$version,To view the latest version, please click to visit:$webSite"
},
signInfoTitle = "Signature information (scroll your mouse up and down to view more)",
checkSignFailed = { msg -> "Failed to query signature:$msg" },
processing = "Processing...",
plzChooseApkFile = "Please select the apk file to be signed",
chooseApkFileTips = "Please drag and drop the apk file here\n(supports multiple selections, you can also click here to select the apk file)",
currentSelectedFile = "Currently selected file",
plzSelectApkFileFirst = "Please select the apk file first",
checkSignInfo = "View signature",
plzChooseSignedApkOutDir = "Please select the signature file output directory first",
changeDir = "Modify",
signType1Desc = "V 1 signature cannot be used when Android minimum API is 24+",
isApkAlign = "Whether to enable alignment (zipAlign)",
chooseRightSignatureTips = "Please configure the correct signature file first",
setupApksignerAndZipAlignTips = "Please configure apksigner and zipalign paths first",
chooseSignTypeFirst = "Please select at least one signature method",
chooseOpenSignedApkFile = "The signature is successful. Do you want to open the signed file?",
open = "Open",
signedFailed = "Signing failed: ",
copyErrorMsg = "Copy error message",
startSignApk = "Start signing apk"
)

//internal val EnStrings = Strings(
Expand Down
22 changes: 21 additions & 1 deletion src/main/kotlin/io/github/jixiaoyong/i18n/StringZh.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal val ZhStrings = Strings(
confirm = "确定",
change = "修改",
noContent = "暂无内容",
currentSignInfo = "当前签名: ",
currentSignInfo = "当前签名",
changeSignInfo = "重新选择签名",
deleteSignInfoTips = "删除此工具存储的签名信息,不会删除apk签名文件",
nickName = "签名别名",
Expand Down Expand Up @@ -59,4 +59,24 @@ internal val ZhStrings = Strings(
"这是一个本地可视化签名APK的小工具。为了避免泄漏密钥等信息,本工具不会联网。\n" +
"当前版本:$version,查看最新版本请点击访问:$webSite"
},
signInfoTitle = "签名信息(鼠标上下滚动查看更多)",
checkSignFailed = { msg -> "查询签名失败:$msg" },
processing = "正在处理中……",
plzChooseApkFile = "请选择要签名的apk文件",
chooseApkFileTips = "请拖拽apk文件到这里\n(支持多选,也可以点击这里选择apk文件)",
currentSelectedFile = "当前选中文件",
plzSelectApkFileFirst = "请先选择apk文件",
checkSignInfo = "查看签名",
plzChooseSignedApkOutDir = "请先选择签名文件输出目录",
changeDir = "修改目录",
signType1Desc = "Android最低API为24+时无法使用V1签名",
isApkAlign = "是否开启对齐(zipAlign)",
chooseRightSignatureTips = "请先配置正确的签名文件",
setupApksignerAndZipAlignTips = "请先配置apksigner和zipalign路径",
chooseSignTypeFirst = "请至少选择一种签名方式",
chooseOpenSignedApkFile = "签名成功,是否打开签名后的文件?",
open = "打开",
signedFailed = "签名失败,:",
copyErrorMsg = "复制错误信息",
startSignApk = "开始签名apk"
)
94 changes: 57 additions & 37 deletions src/main/kotlin/io/github/jixiaoyong/i18n/Strings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,62 @@ data class Strings(
val signConfig: String,
val signApp: String,
val settingsConfig: String,
val confirm:String,
val change:String,
val noContent:String,
val currentSignInfo:String,
val changeSignInfo:String,
val deleteSignInfoTips:String,
val nickName:String,
val nickNameDescription:String,
val filePath:String,
val plzSelectSignFile:String,
val chooseFile:String,
val absolutePathOfSignFile:String,
val saveNewSignInfo:String,
val saveNewSignInfoTips:String,
val cleanUp:String,
val resetSuccess:String,
val confirmReset:String,
val confirmResetTips:String,
val signToolsConfigResetTips:String,
val signType:String,
val signedApkOutputDir:String,
val chooseBuildTools:String,
val chooseBuildToolsTips:String,
val apksignerDirectory:String,
val chooseApksignerTips:String,
val plzChooseApksigner:String,
val notInit:String,
val changeSuccess:String,
val zipDirectory:String,
val chooseZipTips:String,
val plzChooseZip:String,
val autoMatchSignature:String,
val confirm: String,
val change: String,
val noContent: String,
val currentSignInfo: String,
val changeSignInfo: String,
val deleteSignInfoTips: String,
val nickName: String,
val nickNameDescription: String,
val filePath: String,
val plzSelectSignFile: String,
val chooseFile: String,
val absolutePathOfSignFile: String,
val saveNewSignInfo: String,
val saveNewSignInfoTips: String,
val cleanUp: String,
val resetSuccess: String,
val confirmReset: String,
val confirmResetTips: String,
val signToolsConfigResetTips: String,
val signType: String,
val signedApkOutputDir: String,
val chooseBuildTools: String,
val chooseBuildToolsTips: String,
val apksignerDirectory: String,
val chooseApksignerTips: String,
val plzChooseApksigner: String,
val notInit: String,
val changeSuccess: String,
val zipDirectory: String,
val chooseZipTips: String,
val plzChooseZip: String,
val autoMatchSignature: String,
val autoMatchSignatureTips: String,
val aaptDirectory:String,
val chooseAaptDirectory:String,
val aaptDirectory: String,
val chooseAaptDirectory: String,
val aaptDirectoryTips: String,
val reset:String,
val appIntro:(version:String,webSite:String)->String,
)
val reset: String,
val appIntro: (version: String, webSite: String) -> String,
val signInfoTitle: String,
val checkSignFailed: (msg: String) -> String,
val processing: String,
val plzChooseApkFile: String,
val chooseApkFileTips: String,
val currentSelectedFile: String,
val plzSelectApkFileFirst: String,
val checkSignInfo: String,
val plzChooseSignedApkOutDir: String,
val changeDir: String,
val signType1Desc :String,
val isApkAlign:String,
val chooseRightSignatureTips:String,
val setupApksignerAndZipAlignTips:String,
val chooseSignTypeFirst:String,
val chooseOpenSignedApkFile:String,
val open:String,
val signedFailed:String,
val copyErrorMsg:String,
val startSignApk:String
)
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fun PageSignInfo(viewModel: SignInfoViewModel) {
verticalAlignment = Alignment.CenterVertically
) {
Text(
"",
i18nString.currentSignInfo,
style = TextStyle(
fontWeight = FontWeight.Bold,
color = MaterialTheme.colors.primary,
Expand Down

0 comments on commit a52e8a6

Please sign in to comment.