diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/GroupInfoScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/GroupInfoScreen.kt index 620da55..93859d1 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/GroupInfoScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/GroupInfoScreen.kt @@ -265,6 +265,7 @@ fun GroupInfoScreen( val secondaryText = Color(0xFF8E8E93) val accentColor = if (isDarkTheme) Color(0xFF5AA5FF) else Color(0xFF228BE6) val actionContentColor = if (isDarkTheme) Color.White else Color(0xFF1C1C1E) + val groupActionButtonBlue = if (isDarkTheme) Color(0xFF285683) else Color(0xFF2478C2) LaunchedEffect(Unit) { val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager @@ -863,12 +864,12 @@ fun GroupInfoScreen( modifier = Modifier .fillMaxSize() .background(backgroundColor) - .statusBarsPadding() ) { Box( modifier = Modifier .fillMaxWidth() .background(topSurfaceColor) + .statusBarsPadding() .padding(horizontal = 14.dp, vertical = 10.dp) ) { IconButton(onClick = onBack, modifier = Modifier.align(Alignment.TopStart)) { @@ -989,16 +990,18 @@ fun GroupInfoScreen( modifier = Modifier.weight(1f), icon = Icons.Default.Message, label = "Message", - backgroundColor = cardColor, - contentColor = actionContentColor, + backgroundColor = groupActionButtonBlue, + contentColor = Color.White, + iconColor = Color.White, onClick = onBack ) GroupActionButton( modifier = Modifier.weight(1f), icon = if (isMuted) Icons.Default.Notifications else Icons.Default.NotificationsOff, label = if (isMuted) "Unmute" else "Mute", - backgroundColor = cardColor, - contentColor = actionContentColor, + backgroundColor = groupActionButtonBlue, + contentColor = Color.White, + iconColor = Color.White, onClick = { scope.launch { val newMutedState = !isMuted @@ -1015,8 +1018,9 @@ fun GroupInfoScreen( modifier = Modifier.weight(1f), icon = Icons.Default.ExitToApp, label = "Leave", - backgroundColor = cardColor, - contentColor = Color(0xFFFF7A7A), + backgroundColor = groupActionButtonBlue, + contentColor = Color.White, + iconColor = Color.White, onClick = { showLeaveConfirm = true } ) } @@ -1586,13 +1590,13 @@ private fun GroupEncryptionKeyPage( Column( modifier = Modifier .fillMaxSize() - .statusBarsPadding() ) { // Top bar Row( modifier = Modifier .fillMaxWidth() .background(topSurfaceColor) + .statusBarsPadding() .padding(horizontal = 4.dp, vertical = 6.dp), verticalAlignment = Alignment.CenterVertically ) { @@ -1696,6 +1700,7 @@ private fun GroupActionButton( label: String, backgroundColor: Color, contentColor: Color, + iconColor: Color = contentColor, onClick: () -> Unit ) { Surface( @@ -1714,7 +1719,7 @@ private fun GroupActionButton( Icon( imageVector = icon, contentDescription = null, - tint = contentColor, + tint = iconColor, modifier = Modifier.size(20.dp) ) Spacer(modifier = Modifier.height(4.dp))