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

fix(reactions): fix sent message reaction alignment (#4355)

Browse Source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich
2026-01-29 07:25:20 -06:00
committed by GitHub
parent 49da6a80bf
commit 68beca60a5
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
View File

@@ -17,7 +17,6 @@
package org.meshtastic.feature.messaging.component
import android.content.ClipData
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
@@ -342,20 +341,19 @@ internal fun MessageItem(
}
}
}
AnimatedVisibility(emojis.isNotEmpty()) {
ReactionRow(
modifier =
Modifier.align(if (message.fromLocal) Alignment.End else Alignment.Start)
.padding(
start = if (!message.fromLocal) 0.dp else 24.dp,
end = if (message.fromLocal) 0.dp else 24.dp,
),
reactions = if (message.fromLocal) emojis.reversed() else emojis,
myId = ourNode.user.id,
onSendReaction = sendReaction,
onShowReactions = onShowReactions,
)
}
ReactionRow(
modifier =
Modifier.align(if (message.fromLocal) Alignment.End else Alignment.Start)
.padding(
start = if (!message.fromLocal) 0.dp else 24.dp,
end = if (message.fromLocal) 0.dp else 24.dp,
),
reactions = if (message.fromLocal) emojis.reversed() else emojis,
myId = ourNode.user.id,
onSendReaction = sendReaction,
onShowReactions = onShowReactions,
)
}
private const val SELECTED_ALPHA = 0.6f

8
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/Reaction.kt
View File

@@ -146,12 +146,8 @@ internal fun ReactionRow(
) {
val emojiGroups = reactions.groupBy { it.emoji }
AnimatedVisibility(emojiGroups.isNotEmpty()) {
LazyRow(
modifier = modifier,
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
AnimatedVisibility(emojiGroups.isNotEmpty(), modifier = modifier) {
LazyRow(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) {
items(emojiGroups.entries.toList()) { (emoji, reactions) ->
val localReaction = reactions.find { it.user.id == DataPacket.ID_LOCAL || it.user.id == myId }
ReactionItem(