Rosetta/mobile-android
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Pass isDarkTheme parameter to MainScreen and ChatDetailScreen for consistent theming

Browse Source
This commit is contained in:
k1ngsterr1
2026-01-25 18:48:20 +05:00
parent 37acbfeef6
commit ff900846d1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/rosetta/messenger/MainActivity.kt
View File

@@ -716,7 +716,8 @@ fun MainScreen(
onNavigateToChat = { forwardUser -> onNavigateToChat = { forwardUser ->
// 📨 Forward: переход в выбранный чат с полными данными // 📨 Forward: переход в выбранный чат с полными данными
selectedUser = forwardUser selectedUser = forwardUser
} },
isDarkTheme = isDarkTheme
) )
} }
} }

4
app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
View File

@@ -89,7 +89,8 @@ fun ChatDetailScreen(
onUserProfileClick: (SearchUser) -> Unit = {}, onUserProfileClick: (SearchUser) -> Unit = {},
currentUserPublicKey: String, currentUserPublicKey: String,
currentUserPrivateKey: String, currentUserPrivateKey: String,
totalUnreadFromOthers: Int = 0 totalUnreadFromOthers: Int = 0,
isDarkTheme: Boolean
) { ) {
val viewModel: ChatViewModel = viewModel(key = "chat_${user.publicKey}") val viewModel: ChatViewModel = viewModel(key = "chat_${user.publicKey}")
val context = LocalContext.current val context = LocalContext.current
@@ -100,7 +101,6 @@ fun ChatDetailScreen(
val database = RosettaDatabase.getDatabase(context) val database = RosettaDatabase.getDatabase(context)
// UI Theme // UI Theme
val isDarkTheme = androidx.compose.foundation.isSystemInDarkTheme()
val backgroundColor = if (isDarkTheme) Color(0xFF1A1A1A) else Color(0xFFF2F2F7) val backgroundColor = if (isDarkTheme) Color(0xFF1A1A1A) else Color(0xFFF2F2F7)
val textColor = if (isDarkTheme) Color.White else Color.Black val textColor = if (isDarkTheme) Color.White else Color.Black
val secondaryTextColor = if (isDarkTheme) Color(0xFF8E8E93) else Color(0xFF8E8E93) val secondaryTextColor = if (isDarkTheme) Color(0xFF8E8E93) else Color(0xFF8E8E93)