Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: new line can not be added to message composer 🍒 #3755

Merged
merged 8 commits into from
Jan 27, 2025
Merged

fix: new line can not be added to message composer 🍒 #3755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34d450d
Commit with unresolved merge conflicts outside of submodules
MohamadJaara Dec 17, 2024
c86b48b
Update MessageComposerInput.kt
MohamadJaara Dec 18, 2024
b208f6e
Merge branch 'develop' into fix/newline-can-not-be-added-in-message-c…
yamilmedina Dec 19, 2024
70aacb0
Trigger CI
MohamadJaara Dec 23, 2024
ff9aed6
Merge branch 'develop' into fix/newline-can-not-be-added-in-message-c…
yamilmedina Dec 23, 2024
aa9dacc
fix on dev
MohamadJaara Jan 6, 2025
249c171
Merge remote-tracking branch 'origin/develop' into fix/newline-can-no…
MohamadJaara Jan 27, 2025
a53867c
kalium
MohamadJaara Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.text.input.TextFieldLineLimits
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -312,7 +313,8 @@ private fun MessageComposerTextInput(
},
interactionSource = interactionSource,
onSelectedLineIndexChanged = onSelectedLineIndexChanged,
onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged
onLineBottomYCoordinateChanged = onLineBottomYCoordinateChanged,
lineLimits = TextFieldLineLimits.Default,
)
}

Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 34 files
+1 −1 .github/workflows/quay.yml
+39 −0 data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/SubConversation.kt
+1 −1 gradle/libs.versions.toml
+9 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/JoinExistingMLSConversationUseCase.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/LeaveSubconversationUseCase.kt
+8 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
+43 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/SubConversationMapper.kt
+5 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/SubconversationRepository.kt
+3 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/id/IdMappers.kt
+3 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+10 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/backup/BackupScope.kt
+202 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/backup/CreateObfuscatedCopyUseCase.kt
+3 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt
+29 −6 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/NotifyConversationIsOpenUseCase.kt
+22 −7 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/mls/OneOnOneMigrator.kt
+49 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/StaleEpochVerifier.kt
+20 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandler.kt
+14 −10 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandler.kt
+16 −1 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/NotifyConversationIsOpenUseCaseTest.kt
+82 −16 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/mls/OneOnOneMigratorTest.kt
+1 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/message/MessageSenderTest.kt
+138 −3 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/message/StaleEpochVerifierTest.kt
+4 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt
+34 −3 ...rc/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandlerTest.kt
+12 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/mls/MLSConversationRepositoryArrangement.kt
+1 −1 logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/mls/StaleEpochVerifierArrangement.kt
+137 −0 ...commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/SubconversationRepositoryArrangement.kt
+2 −2 ...-model/src/commonMain/kotlin/com/wire/kalium/network/api/authenticated/conversation/ConversationResponse.kt
+12 −0 persistence/src/androidMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
+5 −0 persistence/src/appleMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
+180 −0 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/backup/ObfuscatedCopyExporter.kt
+10 −1 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
+5 −0 persistence/src/jsMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
+5 −0 persistence/src/jvmMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
Loading