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

fix: autofocus in message threads (#3869)

Browse source
This commit is contained in:
Mac DeCourcy 2025-12-01 03:54:44 -08:00 • committed by GitHub
parent c27df15d0a
commit f3d030527a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/Message.kt
View file

@ -22,6 +22,7 @@ package org.meshtastic.feature.messaging
import android.content.ClipData
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.background
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
@ -85,6 +86,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalClipboard
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
@ -158,6 +160,7 @@ fun MessageScreen(
) {
val coroutineScope = rememberCoroutineScope()
val clipboardManager = LocalClipboard.current
val focusManager = LocalFocusManager.current
val nodes by viewModel.nodeList.collectAsStateWithLifecycle()
val ourNode by viewModel.ourNodeInfo.collectAsStateWithLifecycle()
@ -175,6 +178,9 @@ fun MessageScreen(
val messageInputState = rememberTextFieldState(message)
val showQuickChat by viewModel.showQuickChat.collectAsStateWithLifecycle()
// Prevent the message TextField from stealing focus when the screen opens
LaunchedEffect(contactKey) { focusManager.clearFocus() }
// Derived state, memoized for performance
val channelInfo =
remember(contactKey, channels) {
@ -337,7 +343,7 @@ fun MessageScreen(
}
},
) { paddingValues ->
Column(Modifier.padding(paddingValues)) {
Column(Modifier.fillMaxSize().padding(paddingValues).focusable()) {
Box(modifier = Modifier.weight(1f)) {
MessageListPaged(
modifier = Modifier.fillMaxSize(),