fix: close properly keyboard in conversation screen [WPB-7630]

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt

@@ -56,9 +56,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -188,7 +186,6 @@ fun ConversationScreen(
     val coroutineScope = rememberCoroutineScope()
     val uriHandler = LocalUriHandler.current
     val showDialog = remember { mutableStateOf(ConversationScreenDialogType.NONE) }
-    val focusManager = LocalFocusManager.current
     val conversationScreenState = rememberConversationScreenState()
     val messageComposerViewState = messageComposerViewModel.messageComposerViewState
     val messageComposerStateHolder = rememberMessageComposerStateHolder(
@@ -374,7 +371,7 @@ fun ConversationScreen(
                 }
             }
         },
-        onBackButtonClick = { conversationScreenOnBackButtonClick(messageComposerViewModel, focusManager, navigator) },
+        onBackButtonClick = { conversationScreenOnBackButtonClick(messageComposerViewModel, messageComposerStateHolder, navigator) },
         composerMessages = messageComposerViewModel.infoMessage,
         conversationMessages = conversationMessagesViewModel.infoMessage,
         conversationMessagesViewModel = conversationMessagesViewModel,
@@ -403,7 +400,7 @@ fun ConversationScreen(
         },
         onTypingEvent = messageComposerViewModel::sendTypingEvent
     )
-    BackHandler { conversationScreenOnBackButtonClick(messageComposerViewModel, focusManager, navigator) }
+    BackHandler { conversationScreenOnBackButtonClick(messageComposerViewModel, messageComposerStateHolder, navigator) }
     DeleteMessageDialog(
         state = messageComposerViewModel.deleteMessageDialogsState,
         actions = messageComposerViewModel.deleteMessageHelper
@@ -499,11 +496,11 @@ fun ConversationScreen(
 
 private fun conversationScreenOnBackButtonClick(
     messageComposerViewModel: MessageComposerViewModel,
-    focusManager: FocusManager,
+    messageComposerStateHolder: MessageComposerStateHolder,
     navigator: Navigator
 ) {
     messageComposerViewModel.sendTypingEvent(TypingIndicatorMode.STOPPED)
-    focusManager.clearFocus(true)
+    messageComposerStateHolder.messageCompositionInputStateHolder.collapseComposer(null)
     navigator.navigateBack()
 }
 

app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/EnabledMessageComposer.kt

@@ -111,7 +111,7 @@ fun EnabledMessageComposer(
                 messageCompositionInputStateHolder.clearFocus()
             } else if (additionalOptionStateHolder.selectedOption == AdditionalOptionSelectItem.SelfDeleting) {
                 messageCompositionInputStateHolder.requestFocus()
-                additionalOptionStateHolder.hideAdditionalOptionsMenu()
+                additionalOptionStateHolder.unselectAdditionalOptionsMenu()
             }
         }
 
@@ -178,6 +178,7 @@ fun EnabledMessageComposer(
                                 inputFocused = messageCompositionInputStateHolder.inputFocused,
                                 onInputFocusedChanged = ::onInputFocusedChanged,
                                 onToggleInputSize = messageCompositionInputStateHolder::toggleInputSize,
+                                onTextCollapse = messageCompositionInputStateHolder::collapseText,
                                 onCancelReply = messageCompositionHolder::clearReply,
                                 onCancelEdit = ::cancelEdit,
                                 onMessageTextChanged = {
@@ -247,7 +248,7 @@ fun EnabledMessageComposer(
                                 onAdditionalOptionsMenuClicked = {
                                     if (!isKeyboardMoving) {
                                         if (additionalOptionStateHolder.selectedOption == AdditionalOptionSelectItem.AttachFile) {
-                                            additionalOptionStateHolder.hideAdditionalOptionsMenu()
+                                            additionalOptionStateHolder.unselectAdditionalOptionsMenu()
                                             messageCompositionInputStateHolder.toComposing()
                                         } else {
                                             showAdditionalOptionsMenu()
@@ -293,10 +294,7 @@ fun EnabledMessageComposer(
                 cancelEdit()
             }
             BackHandler(isImeVisible || inputStateHolder.optionsVisible) {
-                inputStateHolder.handleBackPressed(
-                    isImeVisible,
-                    additionalOptionStateHolder.additionalOptionsSubMenuState
-                )
+                inputStateHolder.collapseComposer(additionalOptionStateHolder.additionalOptionsSubMenuState)
             }
         }
     }

app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt

@@ -47,6 +47,9 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.nativeKeyCode
+import androidx.compose.ui.input.key.onPreInterceptKeyBeforeSoftKeyboard
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -79,6 +82,7 @@ fun ActiveMessageComposerInput(
     onEditButtonClicked: () -> Unit,
     onChangeSelfDeletionClicked: () -> Unit,
     onToggleInputSize: () -> Unit,
+    onTextCollapse: () -> Unit,
     onCancelReply: () -> Unit,
     onCancelEdit: () -> Unit,
     onInputFocusedChanged: (Boolean) -> Unit,
@@ -138,6 +142,7 @@ fun ActiveMessageComposerInput(
                     onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged,
                     showOptions = showOptions,
                     onPlusClick = onPlusClick,
+                    onTextCollapse = onTextCollapse,
                     modifier = stretchToMaxParentConstraintHeightOrWithInBoundary,
                 )
             }
@@ -162,6 +167,7 @@ fun ActiveMessageComposerInput(
                     onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged,
                     showOptions = showOptions,
                     onPlusClick = onPlusClick,
+                    onTextCollapse = onTextCollapse,
                     modifier = stretchToMaxParentConstraintHeightOrWithInBoundary
                 )
             }
@@ -196,6 +202,7 @@ private fun InputContent(
     onLineBottomYCoordinateChanged: (Float) -> Unit,
     showOptions: Boolean,
     onPlusClick: () -> Unit,
+    onTextCollapse: () -> Unit,
     modifier: Modifier,
 ) {
     if (!showOptions && inputType is MessageCompositionType.Composing) {
@@ -209,6 +216,7 @@ private fun InputContent(
     }
 
     MessageComposerTextInput(
+        isTextExpanded = isTextExpanded,
         inputFocused = inputFocused,
         colors = inputType.inputTextColor(),
         messageText = messageComposition.messageTextFieldValue,
@@ -218,6 +226,7 @@ private fun InputContent(
         onFocusChanged = onInputFocusedChanged,
         onSelectedLineIndexChanged = onSelectedLineIndexChanged,
         onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged,
+        onTextCollapse = onTextCollapse,
         modifier = modifier
     )
 
@@ -254,6 +263,7 @@ private fun InputContent(
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun MessageComposerTextInput(
+    isTextExpanded: Boolean,
     inputFocused: Boolean,
     colors: WireTextFieldColors,
     singleLine: Boolean,
@@ -263,6 +273,7 @@ private fun MessageComposerTextInput(
     onFocusChanged: (Boolean) -> Unit = {},
     onSelectedLineIndexChanged: (Int) -> Unit = { },
     onLineBottomYCoordinateChanged: (Float) -> Unit = { },
+    onTextCollapse: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     val keyboardController = LocalSoftwareKeyboardController.current
@@ -304,6 +315,18 @@ private fun MessageComposerTextInput(
                 if (focusState.isFocused) {
                     onFocusChanged(focusState.isFocused)
                 }
+            }
+            .onPreInterceptKeyBeforeSoftKeyboard { event ->
+                if (event.key.nativeKeyCode == android.view.KeyEvent.KEYCODE_BACK) {
+                    if (isTextExpanded) {
+                        onTextCollapse()
+                        true
+                    } else {
+                        false
+                    }
+                } else {
+                    false
+                }
             },
         interactionSource = interactionSource,
         onSelectedLineIndexChanged = onSelectedLineIndexChanged,

app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/state/AdditionalOptionMenuState.kt

@@ -64,7 +64,7 @@ class AdditionalOptionStateHolder {
         additionalOptionsSubMenuState = AdditionalOptionSubMenuState.AttachFile
     }
 
-    fun hideAdditionalOptionsMenu() {
+    fun unselectAdditionalOptionsMenu() {
         selectedOption = AdditionalOptionSelectItem.None
     }
 
@@ -88,6 +88,7 @@ class AdditionalOptionStateHolder {
 
     fun toAttachmentAndAdditionalOptionsMenu() {
         additionalOptionState = AdditionalOptionMenuState.AttachmentAndAdditionalOptionsMenu
+        unselectAdditionalOptionsMenu()
     }
 
     fun toSelfDeletingOptionsMenu() {

app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/state/MessageComposerStateHolder.kt

@@ -112,7 +112,7 @@ class MessageComposerStateHolder(
 
     fun onInputFocusedChanged(onFocused: Boolean) {
         if (onFocused) {
-            additionalOptionStateHolder.hideAdditionalOptionsMenu()
+            additionalOptionStateHolder.unselectAdditionalOptionsMenu()
             messageCompositionInputStateHolder.requestFocus()
         } else {
             messageCompositionInputStateHolder.clearFocus()

app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/state/MessageCompositionInputStateHolder.kt

@@ -149,6 +149,10 @@ class MessageCompositionInputStateHolder(
         isTextExpanded = !isTextExpanded
     }
 
+    fun collapseText() {
+        isTextExpanded = false
+    }
+
     fun clearFocus() {
         inputFocused = false
     }
@@ -168,8 +172,8 @@ class MessageCompositionInputStateHolder(
         clearFocus()
     }
 
-    fun handleBackPressed(isImeVisible: Boolean, additionalOptionsSubMenuState: AdditionalOptionSubMenuState) {
-        if ((isImeVisible || optionsVisible) && additionalOptionsSubMenuState != AdditionalOptionSubMenuState.RecordAudio) {
+    fun collapseComposer(additionalOptionsSubMenuState: AdditionalOptionSubMenuState? = null) {
+        if (additionalOptionsSubMenuState != AdditionalOptionSubMenuState.RecordAudio) {
             optionsVisible = false
             subOptionsVisible = false
             isTextExpanded = false