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

Обновлён стиль кнопок на экране группы

Browse Source
This commit is contained in:
k1ngsterr1
2026-03-09 16:52:46 +05:00
parent ce376d340f
commit f35596f18d
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/rosetta/messenger/ui/chats/GroupInfoScreen.kt
View File

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