Skip to content
This repository was archived by the owner on Mar 22, 2026. It is now read-only.

Commit 66186bc

Browse files
committed
[TouchController] 更新状态页的样式
1 parent c75f41f commit 66186bc

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

touchcontroller/common/ui/config/tab/status/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ kt_merge_library(
1616
"//combine/core/data",
1717
"//combine/core/layout",
1818
"//combine/core/modifier",
19+
"//combine/core/modifier/drawing",
1920
"//combine/core/modifier/placement",
2021
"//combine/core/modifier/scroll",
2122
"//combine/core/paint",
2223
"//combine/core/widget/layout",
24+
"//combine/style",
2325
"//combine/widget",
2426
"@maven//:cafe_adriel_voyager_voyager_core_desktop",
2527
"@maven//:cafe_adriel_voyager_voyager_screenmodel_desktop",

touchcontroller/common/ui/config/tab/status/StatusTab.kt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import androidx.compose.runtime.collectAsState
55
import androidx.compose.runtime.getValue
66
import androidx.compose.runtime.remember
77
import top.fifthlight.combine.data.Text
8+
import top.fifthlight.combine.data.TextColor
89
import top.fifthlight.combine.layout.Arrangement
910
import top.fifthlight.combine.modifier.Modifier
11+
import top.fifthlight.combine.modifier.drawing.border
1012
import top.fifthlight.combine.modifier.placement.fillMaxSize
1113
import top.fifthlight.combine.modifier.placement.fillMaxWidth
1214
import top.fifthlight.combine.modifier.placement.padding
@@ -44,23 +46,27 @@ object StatusTab : Tab() {
4446
Text.format(
4547
Texts.SCREEN_CONFIG_STATUS_PLATFORM,
4648
Text.translatable(Texts.SCREEN_CONFIG_STATUS_PLATFORM_UNAVAILABLE)
47-
)
49+
).color(TextColor.RED)
4850
)
4951
}
5052

51-
uiState.systemInfo?.let { systemInfo ->
53+
uiState.warningMessage?.let { systemInfo ->
5254
Column(
53-
modifier = Modifier.fillMaxWidth(),
55+
modifier = Modifier
56+
.fillMaxWidth()
57+
.border(LocalTouchControllerTheme.current.listButtonDrawablesUnchecked.normal),
5458
verticalArrangement = Arrangement.spacedBy(8),
5559
) {
56-
Text(Text.translatable(Texts.SCREEN_CONFIG_STATUS_DEBUG_INFO_TITLE))
57-
58-
Text(Text.format(Texts.SCREEN_CONFIG_STATUS_DEBUG_INFO_SYSTEM, systemInfo.system))
59-
Text(Text.format(Texts.SCREEN_CONFIG_STATUS_DEBUG_INFO_ARCHITECTURE, systemInfo.arch))
60-
6160
uiState.warningMessage?.let { Text(it) }
6261
}
6362
}
63+
64+
uiState.systemInfo?.let { systemInfo ->
65+
Text(Text.translatable(Texts.SCREEN_CONFIG_STATUS_DEBUG_INFO_TITLE))
66+
67+
Text(Text.format(Texts.SCREEN_CONFIG_STATUS_DEBUG_INFO_SYSTEM, systemInfo.system))
68+
Text(Text.format(Texts.SCREEN_CONFIG_STATUS_DEBUG_INFO_ARCHITECTURE, systemInfo.arch))
69+
}
6470
}
6571
}
6672
}

0 commit comments

Comments
 (0)