Send caption with media

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt

@@ -125,16 +125,22 @@ fun TextComposer(
 
     val composerOptionsButton: @Composable () -> Unit = remember {
         @Composable {
-            ComposerOptionsButton(
-                modifier = Modifier
-                    .size(48.dp),
-                onClick = onAddAttachment
-            )
+            if (composerMode == MessageComposerMode.Caption) {
+                Spacer(modifier = Modifier.width(9.dp))
+            } else {
+                ComposerOptionsButton(
+                    modifier = Modifier
+                        .size(48.dp),
+                    onClick = onAddAttachment
+                )
+            }
         }
     }
 
     val placeholder = if (composerMode.inThread) {
         stringResource(id = CommonStrings.action_reply_in_thread)
+    } else if (composerMode == MessageComposerMode.Caption) {
+        stringResource(id = R.string.rich_text_editor_composer_caption_placeholder)
     } else {
         stringResource(id = R.string.rich_text_editor_composer_placeholder)
     }
@@ -180,7 +186,7 @@ fun TextComposer(
         }
     }
 
-    val canSendMessage = markdown.isNotBlank()
+    val canSendMessage = markdown.isNotBlank() || composerMode == MessageComposerMode.Caption
     val sendButton = @Composable {
         SendButton(
             canSendMessage = canSendMessage,
@@ -592,6 +598,21 @@ internal fun TextComposerReplyPreview(@PreviewParameter(InReplyToDetailsProvider
     }
 }
 
+@PreviewsDayNight
+@Composable
+internal fun TextComposerCaptionPreview(@PreviewParameter(InReplyToDetailsProvider::class) inReplyToDetails: InReplyToDetails) = ElementPreview {
+    PreviewColumn(
+        items = aTextEditorStateMarkdownList()
+    ) { textEditorState ->
+        ATextComposer(
+            state = textEditorState,
+            voiceMessageState = VoiceMessageState.Idle,
+            composerMode = MessageComposerMode.Caption,
+            enableVoiceMessages = false,
+        )
+    }
+}
+
 @PreviewsDayNight
 @Composable
 internal fun TextComposerVoicePreview() = ElementPreview {

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt

@@ -18,6 +18,8 @@ import io.element.android.libraries.matrix.ui.messages.reply.eventId
 sealed interface MessageComposerMode {
     data object Normal : MessageComposerMode
 
+    data object Caption : MessageComposerMode
+
     sealed interface Special : MessageComposerMode
 
     data class Edit(
@@ -34,7 +36,8 @@ sealed interface MessageComposerMode {
 
     val relatedEventId: EventId?
         get() = when (this) {
-            is Normal -> null
+            is Normal,
+            is Caption -> null
             is Edit -> eventOrTransactionId.eventId
             is Reply -> eventId
         }

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/TextEditorState.kt

@@ -36,6 +36,7 @@ sealed interface TextEditorState {
         is Rich -> richTextEditorState.hasFocus
     }
 
+    // Note: for test only
     suspend fun setHtml(html: String) {
         when (this) {
             is Markdown -> Unit
@@ -43,6 +44,7 @@ sealed interface TextEditorState {
         }
     }
 
+    // Note: for test only
     suspend fun setMarkdown(text: String) {
         when (this) {
             is Markdown -> state.text.update(text, true)