From 34d450d364539a5800627a214aaa2e02a64d4c38 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Tue, 17 Dec 2024 17:03:55 +0000 Subject: [PATCH 1/4] Commit with unresolved merge conflicts outside of submodules --- .../ui/home/messagecomposer/MessageComposerInput.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 index 1a4888f7f8..e1c1dc4898 100644 --- 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 @@ -29,6 +29,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.text.KeyboardOptions +<<<<<<< HEAD +======= +import androidx.compose.foundation.text.input.TextFieldLineLimits +import androidx.compose.foundation.text.input.TextFieldState +>>>>>>> bd79bceaa (fix: new line can not be added to message composer (#3754)) import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -327,7 +332,8 @@ private fun MessageComposerTextInput( }, interactionSource = interactionSource, onSelectedLineIndexChanged = onSelectedLineIndexChanged, - onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged + onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged, + lineLimits = TextFieldLineLimits.MultiLine() ) } From c86b48bb9e37996475044536db9abc7d0bb4ec94 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Wed, 18 Dec 2024 12:47:50 +0100 Subject: [PATCH 2/4] Update MessageComposerInput.kt --- .../android/ui/home/messagecomposer/MessageComposerInput.kt | 3 --- 1 file changed, 3 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 index e1c1dc4898..63493efa43 100644 --- 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 @@ -29,11 +29,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.text.KeyboardOptions -<<<<<<< HEAD -======= import androidx.compose.foundation.text.input.TextFieldLineLimits import androidx.compose.foundation.text.input.TextFieldState ->>>>>>> bd79bceaa (fix: new line can not be added to message composer (#3754)) import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton From 70aacb089e13cd4b3ef580bee4764ed5bd13fb3b Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Mon, 23 Dec 2024 09:47:56 +0100 Subject: [PATCH 3/4] Trigger CI From aa9dacc4ceec67064904772912c7d4cfec95f43e Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Mon, 6 Jan 2025 18:22:56 +0100 Subject: [PATCH 4/4] fix on dev --- .../android/ui/home/messagecomposer/MessageComposerInput.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 63493efa43..85ab3b61f1 100644 --- 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 @@ -330,7 +330,7 @@ private fun MessageComposerTextInput( interactionSource = interactionSource, onSelectedLineIndexChanged = onSelectedLineIndexChanged, onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged, - lineLimits = TextFieldLineLimits.MultiLine() + singleLine = false, ) }