Commit with unresolved merge conflicts outside of submodules

wireapp · Jan 10, 2025 · 51c8693 · 51c8693
1 parent 040eeeb
commit 51c8693
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
@@ -277,6 +277,22 @@ private fun MessageComposerTextInput(
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isPressed by interactionSource.collectIsPressedAsState()
+<<<<<<< HEAD
+=======
+    var isReadOnly by remember { mutableStateOf(false) }
+
+    LaunchedEffect(inputFocused) {
+        if (inputFocused) {
+            isReadOnly = false
+            keyboardController?.show()
+            focusRequester.requestFocus()
+        } else {
+            isReadOnly = true
+            keyboardController?.hide()
+            focusRequester.freeFocus()
+        }
+    }
+>>>>>>> fa7fdbe8f (fix: reappearing keyboard [WPB-10889] (#3791))
 
     LaunchedEffect(isPressed) {
         if (isPressed) {
@@ -295,9 +311,13 @@ private fun MessageComposerTextInput(
         modifier = modifier
             .focusRequester(focusRequester)
             .onFocusChanged { focusState ->
+<<<<<<< HEAD
                 if (focusState.isFocused) {
                     onFocused()
                 }
+=======
+                onFocusChanged(focusState.isFocused)
+>>>>>>> fa7fdbe8f (fix: reappearing keyboard [WPB-10889] (#3791))
             }
             .onPreInterceptKeyBeforeSoftKeyboard { event ->
                 if (event.key.nativeKeyCode == android.view.KeyEvent.KEYCODE_BACK) {