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

manager: Update theme color display in MoreSettings screen and adjust title style

Browse Source
This commit is contained in:
ShirkNeko
2025-06-01 21:56:56 +08:00
parent 2817583e3c
commit a5b85bfdad
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,14 +561,42 @@ fun MoreSettingsScreen() {
},
onClick = { showThemeColorDialog = true },
trailingContent = {
Row {
themeColorOptions.take(4).forEach { (_, theme) ->
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(start = 8.dp)
) {
// 显示当前主题的三种主题色调
val theme = ThemeConfig.currentTheme
val isDark = isSystemInDarkTheme()
// Primary color
ColorCircle(
color = if (isDarkTheme) theme.primaryDark else theme.primaryLight,
isSelected = ThemeConfig.currentTheme::class == theme::class,
color = if (isDark) theme.primaryDark else theme.primaryLight,
isSelected = false,
modifier = Modifier.padding(horizontal = 2.dp)
)
}
// Secondary color
ColorCircle(
color = if (isDark) theme.secondaryDark else theme.secondaryLight,
isSelected = false,
modifier = Modifier.padding(horizontal = 2.dp)
)
// Tertiary color
ColorCircle(
color = if (isDark) theme.tertiaryDark else theme.tertiaryLight,
isSelected = false,
modifier = Modifier.padding(horizontal = 2.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Icon(
Icons.AutoMirrored.Filled.NavigateNext,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
)
@@ -1188,7 +1216,7 @@ fun SettingsCard(
}
Text(
text = title,
style = MaterialTheme.typography.titleLarge,
style = MaterialTheme.typography.titleMedium,
)
}
content()