Skip to content

Commit 158cbb8

Browse files
committed
refactor: 更新页面文本和按钮样式
1 parent bc3b705 commit 158cbb8

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

src/main/kotlin/io/github/jixiaoyong/pages/signInfos/SignInfos.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ fun PageSignInfo(window: ComposeWindow, settings: SettingsTool, newSignInfo: Mut
7777
) {
7878
Text(
7979
"当前签名: ", style = TextStyle(
80-
fontWeight = FontWeight.Bold, color = MaterialTheme.colors.onSurface
80+
fontWeight = FontWeight.Bold, color = MaterialTheme.colors.onPrimary
8181
)
8282
)
8383
Text(
8484
selectedSignInfo?.toString() ?: "暂无",
8585
style = TextStyle(lineBreak = LineBreak.Paragraph),
8686
maxLines = 1,
8787
overflow = TextOverflow.Ellipsis,
88-
modifier = Modifier.weight(1f)
88+
modifier = Modifier.weight(1f).padding(start = 10.dp)
8989
)
9090
ButtonWidget(onClick = {
9191
dropdownMenu.status = DropdownMenuState.Status.Open(selectedSignInfoLayoutOffset.copy(x = 0f))
@@ -210,7 +210,7 @@ fun PageSignInfo(window: ComposeWindow, settings: SettingsTool, newSignInfo: Mut
210210
}
211211
}
212212
},
213-
title = "保存新签名文件",
213+
title = "保存新签名信息",
214214
modifier = Modifier.size(250.dp, 50.dp)
215215
)
216216
}
@@ -255,7 +255,7 @@ private fun SignInfoItem(
255255
) {
256256

257257
Row(modifier = Modifier.weight(0.25f)) {
258-
Text(name)
258+
Text(name,color = MaterialTheme.colors.onPrimary)
259259
HoverableTooltip(description = description) { modifier ->
260260
Icon(
261261
Icons.Default.Info,

src/main/kotlin/io/github/jixiaoyong/pages/signapp/SignApp.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,11 @@ fun PageSignApp(
252252

253253
Text(
254254
"签名方案:",
255-
style = TextStyle(fontWeight = FontWeight.Bold, fontSize = 16.sp),
255+
style = TextStyle(
256+
fontWeight = FontWeight.Bold,
257+
fontSize = 16.sp,
258+
color = MaterialTheme.colors.onPrimary
259+
),
256260
modifier = Modifier.fillMaxWidth().padding(horizontal = 15.dp)
257261
)
258262
Row(
@@ -293,7 +297,11 @@ fun PageSignApp(
293297
) {
294298
Text(
295299
"是否开启对齐:",
296-
style = TextStyle(fontWeight = FontWeight.Bold, fontSize = 16.sp),
300+
style = TextStyle(
301+
fontWeight = FontWeight.Bold,
302+
fontSize = 16.sp,
303+
color = MaterialTheme.colors.onPrimary
304+
),
297305
modifier = Modifier.weight(1f).padding(horizontal = 15.dp)
298306
)
299307

@@ -400,7 +408,7 @@ fun PageSignApp(
400408
private const val TITLE_CONTENT_DIVIDER = "-------------------------------------------------------"
401409

402410
/**
403-
* 根据给定的 [pathList] 将给定的 [CommandResult] 列表合并为单个 [CommandResult]。
411+
* 根据给定的 [pathList] 将给定的 [CommandResult] 列表合并为单个 [CommandResult]。
404412
*
405413
* 如果给定的[resultList]至少包含一个[CommandResult.Success],则返回一个[CommandResult.Success],
406414
* 其中结果是所有成功结果的串联字符串,以换行符分隔。

src/main/kotlin/io/github/jixiaoyong/widgets/InfoItemWidget.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ fun InfoItemWidget(
5151
verticalAlignment = Alignment.CenterVertically
5252
) {
5353
Text(
54-
title, style = TextStyle(fontWeight = FontWeight.ExtraBold, fontSize = 18.sp)
54+
title,
55+
style = TextStyle(
56+
fontWeight = FontWeight.ExtraBold,
57+
fontSize = 16.sp,
58+
color = MaterialTheme.colors.onPrimary
59+
)
5560
)
5661
HoverableTooltip(
5762
description = description
@@ -74,7 +79,7 @@ fun InfoItemWidget(
7479
MaterialTheme.colors.background,
7580
RoundedCornerShape(bottomEnd = rounderRadius, bottomStart = rounderRadius)
7681
)
77-
.padding(vertical = 10.dp, horizontal = 5.dp)
82+
.padding(vertical = 10.dp, horizontal = 10.dp)
7883
) {
7984
Text(
8085
value ?: "暂无内容",

0 commit comments

Comments
 (0)