Merge develop into the PreviewParam rename

The 174 commits develop gained since this branch was cut touch preview data in three ways, and each is resolved so the flipped konsist rule still holds across the merged tree. Two screens the branch had renamed were deleted upstream by "Remove the account provider search screen and homeserver resolver": the changeaccountprovider and searchaccountprovider packages. Their deletion wins, so ChangeAccountProviderStatePreviewParam, SearchAccountProviderStatePreviewParam and the two views that used them go with them rather than coming back under the new name. Two preview classes develop added still carried the old suffix and are renamed here, along with the `@PreviewParameter` reference in each view: GlobalSearchStateProvider -> GlobalSearchStatePreviewParam and SendFailureDialogStateProvider -> SendFailureDialogStatePreviewParam. Everything else merged textually. No production class extending PreviewParameterProvider is left with a `Provider` name, and no reference to any of the 194 renamed names survives outside the CHANGES.md entry that records a past pull request title.
2026-11-02 12:07:28 +00:00 · 2026-08-24 10:55:40 +03:00
parent 03c330ee07 16954bb66e
commit 23005317cf
397 changed files with 6635 additions and 4221 deletions
@@ -245,6 +245,20 @@ fun TextComposer(
        canSendTextMessage,
    ) {
        when {
+            composerMode.isEditing -> EndButtonParams(
+                endButtonContentDescriptionResId = CommonStrings.action_send_edited_message,
+                endButtonClick = {
+                    if (canSendTextMessage) {
+                        onSendMessage()
+                    }
+                },
+                endButtonContent = @Composable {
+                    SendButtonIcon(
+                        canSendMessage = canSendTextMessage,
+                        isEditing = true,
+                    )
+                },
+            )
            !canSendTextMessage ->
                when (voiceMessageState) {
                    VoiceMessageState.Idle -> EndButtonParams(
@@ -296,18 +310,6 @@ fun TextComposer(
                        )
                    }
                }
-            composerMode.isEditing -> EndButtonParams(
-                endButtonContentDescriptionResId = CommonStrings.action_send_edited_message,
-                endButtonClick = {
-                    onSendMessage()
-                },
-                endButtonContent = @Composable {
-                    SendButtonIcon(
-                        canSendMessage = true,
-                        isEditing = true,
-                    )
-                },
-            )
            else -> EndButtonParams(
                endButtonContentDescriptionResId = CommonStrings.action_send_message,
                endButtonClick = {
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ * Copyright 2026 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalTestApi::class)
+
+package io.element.android.libraries.textcomposer
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.libraries.textcomposer.model.MessageComposerMode
+import io.element.android.libraries.textcomposer.model.VoiceMessageState
+import io.element.android.libraries.textcomposer.model.aTextEditorStateMarkdown
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import io.element.android.wysiwyg.display.TextDisplay
+import org.junit.Test
+
+class TextComposerEndButtonTest : RobolectricTest() {
+    @Test
+    fun `editing a message with text shows the send edited message button`() = runAndroidComposeUiTest {
+        setTextComposer(text = "Some text", composerMode = aMessageComposerModeEdit())
+        onNodeWithContentDescription(getString(CommonStrings.action_send_edited_message)).assertIsDisplayed()
+    }
+
+    @Test
+    fun `emptying the composer while editing keeps the send edited message button`() = runAndroidComposeUiTest {
+        setTextComposer(text = "", composerMode = aMessageComposerModeEdit())
+        onNodeWithContentDescription(getString(CommonStrings.action_send_edited_message)).assertIsDisplayed()
+        onNodeWithContentDescription(getString(CommonStrings.a11y_voice_message_record)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `emptying the composer while editing a caption keeps the send edited message button`() = runAndroidComposeUiTest {
+        setTextComposer(text = "", composerMode = aMessageComposerModeEditCaption(content = "An existing caption"))
+        onNodeWithContentDescription(getString(CommonStrings.action_send_edited_message)).assertIsDisplayed()
+        onNodeWithContentDescription(getString(CommonStrings.a11y_voice_message_record)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `an empty composer outside of edition still offers to record a voice message`() = runAndroidComposeUiTest {
+        setTextComposer(text = "", composerMode = MessageComposerMode.Normal)
+        onNodeWithContentDescription(getString(CommonStrings.a11y_voice_message_record)).assertIsDisplayed()
+    }
+
+    private fun AndroidComposeUiTest<ComponentActivity>.getString(resId: Int): String {
+        return activity!!.getString(resId)
+    }
+
+    private fun AndroidComposeUiTest<ComponentActivity>.setTextComposer(
+        text: String,
+        composerMode: MessageComposerMode,
+    ) {
+        setContent {
+            TextComposer(
+                state = aTextEditorStateMarkdown(initialText = text, initialFocus = true),
+                voiceMessageState = VoiceMessageState.Idle,
+                composerMode = composerMode,
+                onRequestFocus = {},
+                onSendMessage = {},
+                onResetComposerMode = {},
+                onAddAttachment = {},
+                onDismissTextFormatting = {},
+                onVoiceRecorderEvent = {},
+                onVoicePlayerEvent = {},
+                onSendVoiceMessage = {},
+                onDeleteVoiceMessage = {},
+                onError = {},
+                onTyping = {},
+                onReceiveSuggestion = {},
+                onSelectRichContent = null,
+                resolveMentionDisplay = { _, _ -> TextDisplay.Plain },
+                resolveAtRoomMentionDisplay = { TextDisplay.Plain },
+            )
+        }
+    }
+}