From d098f1c5ccaf517b5471377fa4cea50321b09751 Mon Sep 17 00:00:00 2001 From: Diogo Date: Sat, 31 Aug 2024 13:47:20 +0100 Subject: [PATCH] icon colors --- .../simplex/common/views/chatlist/UserPicker.kt | 15 ++++++--------- .../common/views/usersettings/Appearance.kt | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt index b8e3a51405..0e1e758599 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt @@ -43,9 +43,9 @@ import kotlinx.coroutines.flow.* @Composable private fun UserPickerOptionRow(icon: Painter, text: String, click: (() -> Unit)? = null, disabled: Boolean = false) { SectionItemView(click, disabled = disabled) { - Icon(icon, text, tint = if (disabled) MaterialTheme.colors.secondary else MenuTextColor) + Icon(icon, text, tint = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.secondary) TextIconSpaced() - Text(text = text, color = if (disabled) MaterialTheme.colors.secondary else MenuTextColor) + Text(text = text, color = if (disabled) MaterialTheme.colors.secondary else Color.Unspecified) } } @@ -146,7 +146,7 @@ private fun UsersLayout( } if (currentUser != null) { - val mainColor = if (stopped) MaterialTheme.colors.secondary else MenuTextColor + val mainColor = if (stopped) MaterialTheme.colors.secondary else Color.Unspecified SectionView(contentPadding = PaddingValues(bottom = DEFAULT_PADDING, end = DEFAULT_PADDING_HALF, top = if (appPlatform.isAndroid) DEFAULT_PADDING_HALF else 0.dp)) { Row { @@ -190,16 +190,13 @@ private fun UsersLayout( ) { Box( modifier = Modifier - .border( - BorderStroke(1.dp, mainColor), shape = CircleShape - ) .size(38.dp * fontSizeSqrtMultiplier), contentAlignment = Alignment.Center ) { Icon( painterResource(MR.images.ic_add_group), stringResource(MR.strings.your_chat_profiles), - tint = mainColor, + tint = MaterialTheme.colors.secondary, ) } } @@ -469,9 +466,9 @@ fun UserPicker( val text = generalGetString(MR.strings.settings_section_title_settings).lowercase().capitalize(Locale.current) SectionItemView(settingsClicked, padding = PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING_HALF)) { - Icon(painterResource(MR.images.ic_settings), text, tint = MenuTextColor) + Icon(painterResource(MR.images.ic_settings), text, tint = MaterialTheme.colors.secondary) TextIconSpaced() - Text(text, color = MenuTextColor) + Text(text, color = Color.Unspecified) Spacer(Modifier.weight(1f)) ColorModeSwitcher() } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt index fdfc2f6743..45e32bfbd8 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt @@ -633,7 +633,7 @@ object AppearanceScope { verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) { - Icon(painterResource(if (themeMode == DefaultThemeMode.LIGHT) MR.images.ic_light_mode else MR.images.ic_dark_mode), stringResource(MR.strings.color_mode_light), tint = MenuTextColor) + Icon(painterResource(if (themeMode == DefaultThemeMode.LIGHT) MR.images.ic_light_mode else MR.images.ic_dark_mode), stringResource(MR.strings.color_mode_light), tint = MaterialTheme.colors.secondary) } }