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

fixes #2609: Use a Bundle-persistable type for remembering replyTo message (#2620)

Browse source
This commit is contained in:
Joshua Soberg 2025-08-02 11:40:26 -04:00 • committed by GitHub
parent 3076f457b5
commit f7eb10c17b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
View file

@ -147,7 +147,7 @@ internal fun MessageScreen(
val messages by viewModel.getMessagesFrom(contactKey).collectAsStateWithLifecycle(initialValue = emptyList())
// UI State managed within this Composable
var replyingTo by rememberSaveable { mutableStateOf<Message?>(null) }
var replyingToPacketId by rememberSaveable { mutableStateOf<Int?>(null) }
var showDeleteDialog by rememberSaveable { mutableStateOf(false) }
var sharedContact by rememberSaveable { mutableStateOf<Node?>(null) }
val selectedMessageIds = rememberSaveable { mutableStateOf(emptySet<Long>()) }
@ -192,7 +192,7 @@ internal fun MessageScreen(
when (event) {
is MessageScreenEvent.SendMessage -> {
viewModel.sendMessage(event.text, contactKey, event.replyingToPacketId)
if (event.replyingToPacketId != null) replyingTo = null
if (event.replyingToPacketId != null) replyingToPacketId = null
messageInputState.clearText()
}
@ -304,7 +304,7 @@ internal fun MessageScreen(
onSendReaction = { emoji, id -> onEvent(MessageScreenEvent.SendReaction(emoji, id)) },
viewModel = viewModel,
contactKey = contactKey,
onReply = { message -> replyingTo = message },
onReply = { message -> replyingToPacketId = message?.packetId },
onNodeMenuAction = { action -> onEvent(MessageScreenEvent.HandleNodeMenuAction(action)) },
)
// Show FAB if we can scroll towards the newest messages (index 0).
@ -325,14 +325,24 @@ internal fun MessageScreen(
},
)
}
ReplySnippet(originalMessage = replyingTo, onClearReply = { replyingTo = null }, ourNode = ourNode)
val originalMessage by
remember(replyingToPacketId, messages) {
derivedStateOf {
replyingToPacketId?.let { messages.firstOrNull { it.packetId == replyingToPacketId } }
}
}
ReplySnippet(
originalMessage = originalMessage,
onClearReply = { replyingToPacketId = null },
ourNode = ourNode,
)
MessageInput(
isEnabled = isConnected,
textFieldState = messageInputState,
onSendMessage = {
val messageText = messageInputState.text.toString().trim()
if (messageText.isNotEmpty()) {
onEvent(MessageScreenEvent.SendMessage(messageText, replyingTo?.packetId))
onEvent(MessageScreenEvent.SendMessage(messageText, replyingToPacketId))
}
},
)