diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt index 41875f1..20e86a1 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt @@ -764,7 +764,7 @@ fun ProfilePhotoMenu( icon = Icons.Default.AddAPhoto, text = "Set Profile Photo", onClick = onSetPhotoClick, - tintColor = PrimaryBlue, + tintColor = if (isDarkTheme) Color.White else Color.Black, textColor = if (isDarkTheme) Color.White else Color.Black ) } @@ -796,8 +796,8 @@ fun OtherProfileMenu( icon = if (isBlocked) Icons.Default.CheckCircle else Icons.Default.Block, text = if (isBlocked) "Unblock User" else "Block User", onClick = onBlockClick, - tintColor = if (isBlocked) Color(0xFF4CAF50) else Color(0xFFFF3B30), - textColor = if (isBlocked) Color(0xFF4CAF50) else Color(0xFFFF3B30) + tintColor = if (isDarkTheme) Color.White else Color.Black, + textColor = if (isDarkTheme) Color.White else Color.Black ) Box( @@ -812,8 +812,8 @@ fun OtherProfileMenu( icon = Icons.Default.Delete, text = "Clear Chat History", onClick = onClearChatClick, - tintColor = Color(0xFFFF3B30), - textColor = Color(0xFFFF3B30) + tintColor = if (isDarkTheme) Color.White else Color.Black, + textColor = if (isDarkTheme) Color.White else Color.Black ) } } 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 c19f974..da9e08d 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 @@ -339,7 +339,7 @@ private fun CollapsingOtherProfileHeader( Text( text = "online", fontSize = onlineFontSize, - color = Color(0xFF4CAF50) + color = if (isDarkTheme) Color.White.copy(alpha = 0.6f) else Color.Black.copy(alpha = 0.5f) ) } } @@ -355,11 +355,7 @@ private fun TelegramBlockItem( isDarkTheme: Boolean ) { val textColor = if (isDarkTheme) Color.White else Color.Black - val iconColor = if (isBlocked) { - if (isDarkTheme) Color(0xFF66BB6A) else Color(0xFF4CAF50) - } else { - if (isDarkTheme) Color(0xFFFF8787) else Color(0xFFEF4444) - } + val iconColor = if (isDarkTheme) Color.White else Color.Black Row( modifier = Modifier