Clone/Gearslip
1
0 Fork 0
mirror of https://github.com/twinksoftware/Gearslip.git synced 2026-11-11 00:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

messages: the Read, Reply and other buttons sit in a row under the messages

Browse Source
This commit is contained in:
Seb3thehacker committed 2026-10-26 20:28:46 -07:00
1 parent 83c33eeea3
commit 7959b27d38
1 file changed
+19 -8
Download Patch File Download Diff File Expand all files Collapse all files
gearslip/src/main/java/app/seb3thehacker/gearslip/car/MessagesScreen.kt
+19 -8
View File
@@ -11,6 +11,8 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
@@ -107,6 +109,7 @@ fun MessagesScreen(packageName: String) {
} }
} }
@OptIn(ExperimentalLayoutApi::class)
@Composable @Composable
private fun ConversationCard(n: CarNotification, onRead: () -> Unit, onReply: () -> Unit, onMarkRead: () -> Unit) { private fun ConversationCard(n: CarNotification, onRead: () -> Unit, onReply: () -> Unit, onMarkRead: () -> Unit) {
var expanded by rememberSaveable(n.key) { mutableStateOf(false) } var expanded by rememberSaveable(n.key) { mutableStateOf(false) }
@@ -146,6 +149,14 @@ private fun ConversationCard(n: CarNotification, onRead: () -> Unit, onReply: ()
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1, maxLines = 1,
) )
if (n.replied) {
Icon(
Icons.Filled.Check,
contentDescription = stringResource(R.string.notif_replied),
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.padding(start = 8.dp).size(20.dp),
)
}
} }
if (!expanded && lines.size > COLLAPSED_LINES) { if (!expanded && lines.size > COLLAPSED_LINES) {
Text( Text(
@@ -155,12 +166,12 @@ private fun ConversationCard(n: CarNotification, onRead: () -> Unit, onReply: ()
) )
} }
shown.forEach { MessageLine(it, showSender = n.isGroup) } shown.forEach { MessageLine(it, showSender = n.isGroup) }
if (quick) QuickReplies(n, Modifier.padding(top = 6.dp)) // Below the messages and side by side, so the text keeps the card's whole width.
} FlowRow(
Column(horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.spacedBy(8.dp)) { Modifier.padding(top = 6.dp),
if (n.replied) { horizontalArrangement = Arrangement.spacedBy(8.dp),
Icon(Icons.Filled.Check, contentDescription = stringResource(R.string.notif_replied), tint = MaterialTheme.colorScheme.primary) verticalArrangement = Arrangement.spacedBy(8.dp),
} ) {
GsButton(onClick = onRead, tone = GsTone.Neutral) { GsButton(onClick = onRead, tone = GsTone.Neutral) {
ReadGlyph(Modifier.size(20.dp)) ReadGlyph(Modifier.size(20.dp))
Text(stringResource(R.string.msg_read), Modifier.padding(start = 8.dp)) Text(stringResource(R.string.msg_read), Modifier.padding(start = 8.dp))
@@ -170,8 +181,6 @@ private fun ConversationCard(n: CarNotification, onRead: () -> Unit, onReply: ()
ReplyGlyph(Modifier.size(20.dp)) ReplyGlyph(Modifier.size(20.dp))
Text(stringResource(R.string.crumb_reply), Modifier.padding(start = 8.dp)) Text(stringResource(R.string.crumb_reply), Modifier.padding(start = 8.dp))
} }
}
if (n.reply != null) {
GsButton(onClick = { quick = !quick }, tone = GsTone.Neutral) { GsButton(onClick = { quick = !quick }, tone = GsTone.Neutral) {
Text(stringResource(if (quick) R.string.msg_hide_quick else R.string.msg_quick)) Text(stringResource(if (quick) R.string.msg_hide_quick else R.string.msg_quick))
} }
@@ -180,6 +189,8 @@ private fun ConversationCard(n: CarNotification, onRead: () -> Unit, onReply: ()
GsButton(onClick = onMarkRead, tone = GsTone.Neutral) { Text(stringResource(R.string.msg_mark_read)) } GsButton(onClick = onMarkRead, tone = GsTone.Neutral) { Text(stringResource(R.string.msg_mark_read)) }
} }
} }
if (quick) QuickReplies(n, Modifier.padding(top = 6.dp))
}
} }
} }
} }