meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Improve MessageItem layout and styling (#4208)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2026-01-13 21:46:10 -06:00 • committed by GitHub
parent 028596e013
commit 418ebe387c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
View file

@ -47,7 +47,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedCard
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.contentColorFor
@ -234,16 +233,11 @@ internal fun MessageItem(
contentColor = contentColorFor(containerColor),
shape = messageShape,
) {
val hasPrevPadding =
if (hasSamePrev) {
12.dp
} else {
0.dp
}
Column(modifier = Modifier.fillMaxWidth().padding(top = hasPrevPadding)) {
Column(modifier = Modifier.fillMaxWidth()) {
OriginalMessageSnippet(
message = message,
ourNode = ourNode,
hasSamePrev = hasSamePrev,
onNavigateToOriginalMessage = onNavigateToOriginalMessage,
)
Row(
@ -313,11 +307,11 @@ internal fun MessageItem(
Box(
modifier =
Modifier.align(if (message.fromLocal) Alignment.BottomEnd else Alignment.BottomStart)
.padding(horizontal = 24.dp)
.offset(y = 24.dp),
.padding(horizontal = 12.dp)
.offset(y = 20.dp),
) {
ReactionRow(
reactions = emojis,
reactions = if (message.fromLocal) emojis.reversed() else emojis,
myId = ourNode.user.id,
onSendReaction = sendReaction,
onShowReactions = onShowReactions,
@ -356,7 +350,12 @@ private fun MessageStatusIcon(status: MessageStatus, onClick: () -> Unit) {
}
@Composable
private fun OriginalMessageSnippet(message: Message, ourNode: Node, onNavigateToOriginalMessage: (Int) -> Unit) {
private fun OriginalMessageSnippet(
message: Message,
ourNode: Node,
hasSamePrev: Boolean,
onNavigateToOriginalMessage: (Int) -> Unit,
) {
val originalMessage = message.originalMessage
if (originalMessage != null && originalMessage.packetId != 0) {
val originalMessageNode = if (originalMessage.fromLocal) ourNode else originalMessage.node
@ -366,9 +365,17 @@ private fun OriginalMessageSnippet(message: Message, ourNode: Node, onNavigateTo
containerColor = Color(originalMessageNode.colors.second).copy(alpha = 0.8f),
contentColor = Color(originalMessageNode.colors.first),
)
OutlinedCard(
Surface(
modifier = Modifier.fillMaxWidth().clickable { onNavigateToOriginalMessage(originalMessage.packetId) },
colors = cardColors,
contentColor = cardColors.contentColor,
color = cardColors.containerColor,
shape =
getMessageBubbleShape(
cornerRadius = 16.dp,
isSender = originalMessage.fromLocal,
hasSamePrev = hasSamePrev,
hasSameNext = true, // always square off original message bottom
),
) {
Row(
modifier = Modifier.padding(8.dp),