ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7413 from element-hq/feature/bma/fixThreadPlaceholder

Browse Source 
Fix wrong TextComposer placeholder displayed when in a thread.
This commit is contained in:
Benoit Marty
2026-08-13 09:01:24 +02:00
committed by GitHub
parent 7c648b34b7 ae5c4161c7
commit a3e7d9cc1a
6 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
+1
View File
@@ -425,6 +425,7 @@ class MessageComposerPresenter(
textEditorState = textEditorState,
isFullScreen = isFullScreen.value,
mode = messageComposerContext.composerMode,
isInThreadTimeline = isInThread,
showAttachmentSourcePicker = showAttachmentSourcePicker,
showTextFormatting = showTextFormatting,
canShareLocation = canShareLocation.value,
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt
+1
View File
@@ -21,6 +21,7 @@ data class MessageComposerState(
val textEditorState: TextEditorState,
val isFullScreen: Boolean,
val mode: MessageComposerMode,
val isInThreadTimeline: Boolean,
val showAttachmentSourcePicker: Boolean,
val showTextFormatting: Boolean,
val canShareLocation: Boolean,
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
+2
View File
@@ -29,6 +29,7 @@ fun aMessageComposerState(
textEditorState: TextEditorState = aTextEditorStateRich(),
isFullScreen: Boolean = false,
mode: MessageComposerMode = MessageComposerMode.Normal,
isInThreadTimeline: Boolean = false,
showTextFormatting: Boolean = false,
showAttachmentSourcePicker: Boolean = false,
canShareLocation: Boolean = true,
@@ -39,6 +40,7 @@ fun aMessageComposerState(
textEditorState = textEditorState,
isFullScreen = isFullScreen,
mode = mode,
isInThreadTimeline = isInThreadTimeline,
showTextFormatting = showTextFormatting,
showAttachmentSourcePicker = showAttachmentSourcePicker,
canShareLocation = canShareLocation,
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
+1
View File
@@ -102,6 +102,7 @@ internal fun MessageComposerView(
onRequestFocus = ::onRequestFocus,
onSendMessage = ::sendMessage,
composerMode = state.mode,
isInThreadTimeline = state.isInThreadTimeline,
showTextFormatting = state.showTextFormatting,
onResetComposerMode = ::onCloseSpecialMode,
onAddAttachment = ::onAddAttachment,
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
+14
View File
@@ -61,6 +61,7 @@ import io.element.android.libraries.matrix.test.A_CAPTION
import io.element.android.libraries.matrix.test.A_MESSAGE
import io.element.android.libraries.matrix.test.A_REPLY
import io.element.android.libraries.matrix.test.A_ROOM_ID
import io.element.android.libraries.matrix.test.A_THREAD_ID
import io.element.android.libraries.matrix.test.A_TRANSACTION_ID
import io.element.android.libraries.matrix.test.A_USER_ID
import io.element.android.libraries.matrix.test.A_USER_ID_2
@@ -148,12 +149,25 @@ class MessageComposerPresenterTest : RobolectricTest() {
assertThat(initialState.isFullScreen).isFalse()
assertThat(initialState.textEditorState.messageHtml()).isEqualTo("")
assertThat(initialState.mode).isEqualTo(MessageComposerMode.Normal)
assertThat(initialState.isInThreadTimeline).isFalse()
assertThat(initialState.showAttachmentSourcePicker).isFalse()
assertThat(initialState.canShareLocation).isTrue()
assertThat(initialState.slashCommandAction).isEqualTo(AsyncAction.Uninitialized)
}
}
@Test
fun `present - when a threadRoot is provided, isInThreadTimeline is true`() = runTest {
val presenter = createPresenter(
threadRoot = A_THREAD_ID,
)
presenter.test {
val initialState = awaitFirstItem()
assertThat(initialState.mode).isEqualTo(MessageComposerMode.Normal)
assertThat(initialState.isInThreadTimeline).isTrue()
}
}
@Test
fun `present - toggle fullscreen`() = runTest {
val presenter = createPresenter()
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
+2 -1
View File
@@ -131,6 +131,7 @@ fun TextComposer(
resolveAtRoomMentionDisplay: () -> TextDisplay,
modifier: Modifier = Modifier,
showTextFormatting: Boolean = false,
isInThreadTimeline: Boolean = false,
) {
val markdown = when (state) {
is TextEditorState.Markdown -> state.state.text.value()
@@ -153,7 +154,7 @@ fun TextComposer(
.fillMaxSize()
.height(IntrinsicSize.Min)
val placeholder = if (composerMode.inThread) {
val placeholder = if (composerMode.inThread || composerMode is MessageComposerMode.Normal && isInThreadTimeline) {
stringResource(id = CommonStrings.action_reply_in_thread)
} else if (composerMode is MessageComposerMode.Attachment || composerMode is MessageComposerMode.EditCaption) {
stringResource(id = R.string.rich_text_editor_composer_caption_placeholder)