diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt index 456c315..a940d9e 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt @@ -971,7 +971,8 @@ fun ChatDetailScreen( verified = user.verified, size = - 16 + 16, + isDarkTheme = isDarkTheme ) } } @@ -1195,10 +1196,10 @@ fun ChatDetailScreen( modifier = Modifier.fillMaxWidth() .padding( - horizontal = - 12.dp, - vertical = - 8.dp + start = 12.dp, + end = 12.dp, + top = 8.dp, + bottom = 16.dp ) .navigationBarsPadding() .graphicsLayer { diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/SearchResultsList.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/SearchResultsList.kt index 5adb666..167985c 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/SearchResultsList.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/SearchResultsList.kt @@ -236,7 +236,7 @@ private fun SearchResultItem( ) if (!isOwnAccount && user.verified > 0) { - VerifiedBadge(verified = user.verified, size = 16) + VerifiedBadge(verified = user.verified, size = 16, isDarkTheme = isDarkTheme) } } diff --git a/app/src/main/java/com/rosetta/messenger/ui/components/VerifiedBadge.kt b/app/src/main/java/com/rosetta/messenger/ui/components/VerifiedBadge.kt index 48fbc75..6278dc2 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/components/VerifiedBadge.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/components/VerifiedBadge.kt @@ -1,6 +1,7 @@ package com.rosetta.messenger.ui.components import androidx.compose.foundation.clickable +import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -20,12 +21,14 @@ import androidx.compose.ui.window.Dialog * * @param verified Уровень верификации (0 = нет, 1 = стандартная, 2+ = особая) * @param size Размер значка в dp + * @param isDarkTheme Тема приложения (если не передано - используется системная) */ @Composable fun VerifiedBadge( verified: Int, size: Int = 16, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, + isDarkTheme: Boolean = isSystemInDarkTheme() ) { if (verified <= 0) return @@ -59,7 +62,7 @@ fun VerifiedBadge( Dialog(onDismissRequest = { showDialog = false }) { Surface( shape = RoundedCornerShape(12.dp), - color = Color(0xFF2A2A2A), // Темный фон + color = if (isDarkTheme) Color(0xFF2A2A2A) else Color.White, tonalElevation = 8.dp ) { Column( @@ -76,13 +79,13 @@ fun VerifiedBadge( Text( text = annotationText, fontSize = 14.sp, - color = Color.White.copy(alpha = 0.85f), // Белый текст для темного фона + color = if (isDarkTheme) Color.White.copy(alpha = 0.85f) else Color.Black.copy(alpha = 0.85f), lineHeight = 20.sp, textAlign = androidx.compose.ui.text.style.TextAlign.Center ) Spacer(modifier = Modifier.height(16.dp)) TextButton(onClick = { showDialog = false }) { - Text("OK", color = Color.White) + Text("OK", color = if (isDarkTheme) Color.White else Color(0xFF1DA1F2)) } } } diff --git a/app/src/main/java/com/rosetta/messenger/ui/settings/OtherProfileScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/settings/OtherProfileScreen.kt index 9baedd1..9e3a154 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/settings/OtherProfileScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/settings/OtherProfileScreen.kt @@ -575,7 +575,7 @@ private fun CollapsingOtherProfileHeader( Icon( imageVector = Icons.Filled.ArrowBack, contentDescription = "Back", - tint = Color.White, + tint = if (isDarkTheme) Color.White else Color.Black, modifier = Modifier.size(24.dp) ) } @@ -596,7 +596,7 @@ private fun CollapsingOtherProfileHeader( Icon( imageVector = Icons.Default.MoreVert, contentDescription = "Profile menu", - tint = Color.White, + tint = if (isDarkTheme) Color.White else Color.Black, modifier = Modifier.size(24.dp) ) } @@ -654,7 +654,7 @@ private fun CollapsingOtherProfileHeader( if (verified > 0) { Spacer(modifier = Modifier.width(4.dp)) - VerifiedBadge(verified = verified, size = (nameFontSize.value * 0.8f).toInt()) + VerifiedBadge(verified = verified, size = (nameFontSize.value * 0.8f).toInt(), isDarkTheme = isDarkTheme) } } diff --git a/app/src/main/java/com/rosetta/messenger/ui/settings/ProfileScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/settings/ProfileScreen.kt index 71a9d85..b1a8a92 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/settings/ProfileScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/settings/ProfileScreen.kt @@ -839,7 +839,7 @@ private fun CollapsingProfileHeader( Icon( imageVector = TablerIcons.ArrowLeft, contentDescription = "Back", - tint = Color.White, + tint = if (isDarkTheme) Color.White else Color.Black, modifier = Modifier.size(24.dp) ) } @@ -873,7 +873,7 @@ private fun CollapsingProfileHeader( Icon( imageVector = TablerIcons.DotsVertical, contentDescription = "Profile menu", - tint = Color.White, + tint = if (isDarkTheme) Color.White else Color.Black, modifier = Modifier.size(24.dp) ) } @@ -1034,7 +1034,7 @@ fun ProfileCard( Icon( imageVector = TablerIcons.ArrowLeft, contentDescription = "Back", - tint = Color.White + tint = if (isDarkTheme) Color.White else Color.Black ) } }