dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-26 19:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

icon colors

Browse Source
This commit is contained in:
Diogo
2024-08-31 13:47:20 +01:00
parent 95062075f0
commit d098f1c5cc
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+6 -9
View File
@@ -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()
}
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt
+1 -1
View File
@@ -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)
}
}