android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[skip ci]: Move the language selection into the card

Browse Source
This commit is contained in:
ShirkNeko
2025-05-15 16:40:27 +08:00
parent 4d59ce435e
commit 52514ba35b
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
manager/app/src/main/java/com/sukisu/ultra/ui/screen/MoreSettings.kt
View File

@@ -541,35 +541,6 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
onToggle = { isAppearanceExpanded = !isAppearanceExpanded }
)
AnimatedVisibility(
visible = isAppearanceExpanded,
enter = fadeIn() + expandVertically(),
exit = fadeOut() + shrinkVertically()
) {
ListItem(
headlineContent = { Text(stringResource(R.string.language_setting)) },
supportingContent = {
Text(supportedLanguages.find { it.first == currentLanguage }?.second
?: stringResource(R.string.language_follow_system))
},
leadingContent = {
Icon(
Icons.Default.Language,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary
)
},
trailingContent = {
Icon(
Icons.AutoMirrored.Filled.NavigateNext,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
},
modifier = Modifier.clickable { showLanguageDialog = true }
)
}
AnimatedVisibility(
visible = isAppearanceExpanded,
enter = fadeIn() + expandVertically(),
@@ -581,6 +552,38 @@ fun MoreSettingsScreen(navigator: DestinationsNavigator) {
modifier = Modifier.padding(bottom = 16.dp)
) {
Column {
// 语言设置
ListItem(
headlineContent = { Text(stringResource(R.string.language_setting)) },
supportingContent = {
Text(supportedLanguages.find { it.first == currentLanguage }?.second
?: stringResource(R.string.language_follow_system))
},
leadingContent = {
Icon(
Icons.Default.Language,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary
)
},
trailingContent = {
Icon(
Icons.AutoMirrored.Filled.NavigateNext,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
},
colors = ListItemDefaults.colors(
containerColor = Color.Transparent
),
modifier = Modifier.clickable { showLanguageDialog = true }
)
HorizontalDivider(
modifier = Modifier.padding(horizontal = 16.dp),
color = MaterialTheme.colorScheme.outlineVariant
)
// 主题模式
ListItem(
headlineContent = { Text(stringResource(R.string.theme_mode)) },