From fdff92dff9a840a0d9941d0f7a7891e8026d8e96 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 6 Aug 2025 18:01:19 -0400 Subject: [PATCH] New Public Message screen: to field should get focus if it is empty, otherwise the message field should have the focus --- .../publicMessages/NewPublicMessageScreen.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt index f8279cc1f..8c126e857 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt @@ -173,7 +173,7 @@ fun PublicMessageScreenContent( ) { SendDirectMessageTo(postViewModel, accountViewModel) - MessageFieldRow(postViewModel, accountViewModel) + MessageFieldRow(postViewModel, accountViewModel, postViewModel.toUsers.text.isNotBlank()) DisplayPreviews(postViewModel.urlPreviews, accountViewModel, nav) @@ -327,9 +327,11 @@ fun SendDirectMessageTo( val keyboardController = LocalSoftwareKeyboardController.current LaunchedEffect(Unit) { - launch { - delay(200) - focusRequester.requestFocus() + if (postViewModel.toUsers.text.isBlank()) { + launch { + delay(200) + focusRequester.requestFocus() + } } }