diff --git a/app/src/main/java/me/ash/reader/ui/component/SelectableSettingGroupItem.kt b/app/src/main/java/me/ash/reader/ui/component/SelectableSettingGroupItem.kt index ac440c5..8285091 100644 --- a/app/src/main/java/me/ash/reader/ui/component/SelectableSettingGroupItem.kt +++ b/app/src/main/java/me/ash/reader/ui/component/SelectableSettingGroupItem.kt @@ -39,15 +39,14 @@ fun SelectableSettingGroupItem( Surface( modifier = modifier.clickable { onClick() }, color = Color.Unspecified, - contentColor = if (selected) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.onSurface ) { Row( modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp) .background( - if (selected) MaterialTheme.colorScheme.onSurface else Color.Unspecified, - RoundedCornerShape(24.dp) + color = if (selected) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.surface, + shape = RoundedCornerShape(24.dp) ) .padding(8.dp, 16.dp), verticalAlignment = Alignment.CenterVertically, @@ -55,9 +54,9 @@ fun SelectableSettingGroupItem( icon?.let { Icon( imageVector = it, - contentDescription = null, + contentDescription = title, modifier = Modifier.padding(start = 8.dp, end = 16.dp), - tint = if (selected) MaterialTheme.colorScheme.surface.copy(alpha = 0.8f) else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.8f), + tint = if (selected) MaterialTheme.colorScheme.surfaceVariant else MaterialTheme.colorScheme.onSurfaceVariant ) } Column(modifier = Modifier.weight(1f)) { @@ -65,6 +64,7 @@ fun SelectableSettingGroupItem( text = title, maxLines = if (desc == null) 2 else 1, style = MaterialTheme.typography.titleLarge.copy(fontSize = 20.sp), + color = if (selected) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.onSurface, ) desc?.let { Text( diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt index 06209db..0316c6a 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt @@ -72,6 +72,7 @@ fun SettingsPage( } item { SelectableSettingGroupItem( + selected = true, title = stringResource(R.string.color_and_style), desc = stringResource(R.string.color_and_style_desc), icon = Icons.Outlined.Palette, diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 69625d9..2fa7c3d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -71,7 +71,7 @@ 获取新的更新 版本 0.6.1 现已发布 账户 - 本地、Fresh + 本地、FreshRSS 颜色和样式 主题、色彩系统、字体大小 交互 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4977564..22030e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,7 +71,7 @@ Get New updates Version 0.6.1 has been released Accounts - Local, Fresh + Local, FreshRSS Color & style Theme, color system, font size Interaction