Add progress indicator for sending voice messages (#1618)

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/VoiceMessageComposerPresenter.kt

@@ -142,7 +142,11 @@ class VoiceMessageComposerPresenter @Inject constructor(
         return VoiceMessageComposerState(
             voiceMessageState = when (val state = recorderState) {
                 is VoiceRecorderState.Recording -> VoiceMessageState.Recording(level = state.level)
-                is VoiceRecorderState.Finished -> VoiceMessageState.Preview
+                is VoiceRecorderState.Finished -> if (isSending) {
+                    VoiceMessageState.Sending
+                } else {
+                    VoiceMessageState.Preview
+                }
                 else -> VoiceMessageState.Idle
             },
             showPermissionRationaleDialog = permissionState.showDialog,

features/messages/impl/src/test/kotlin/io/element/android/features/messages/voicemessages/VoiceMessageComposerPresenterTest.kt

@@ -127,6 +127,7 @@ class VoiceMessageComposerPresenterTest {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecordButtonEvent(PressEvent.PressStart))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecordButtonEvent(PressEvent.LongPressEnd))
             awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            assertThat(awaitItem().voiceMessageState).isEqualTo(VoiceMessageState.Sending)
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
@@ -148,6 +149,7 @@ class VoiceMessageComposerPresenterTest {
                 eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
                 eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
             }
+            assertThat(awaitItem().voiceMessageState).isEqualTo(VoiceMessageState.Sending)
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
@@ -167,11 +169,13 @@ class VoiceMessageComposerPresenterTest {
         }.test {
             awaitItem().eventSink(VoiceMessageComposerEvents.RecordButtonEvent(PressEvent.PressStart))
             awaitItem().eventSink(VoiceMessageComposerEvents.RecordButtonEvent(PressEvent.LongPressEnd))
-
+            awaitItem().apply {
-            val finalState = awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(VoiceMessageState.Preview)
                 eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
             }
+
+            val finalState = awaitItem()
+            assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Sending)
             assertThat(matrixRoom.sendMediaCount).isEqualTo(0)
             assertThat(analyticsService.trackedErrors).hasSize(0)
 
@@ -192,6 +196,7 @@ class VoiceMessageComposerPresenterTest {
             val previewState = awaitItem()
 
             previewState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            assertThat(awaitItem().voiceMessageState).isEqualTo(VoiceMessageState.Sending)
 
             ensureAllEventsConsumed()
             assertThat(previewState.voiceMessageState).isEqualTo(VoiceMessageState.Preview)
@@ -349,7 +354,8 @@ class VoiceMessageComposerPresenterTest {
 
         val onPauseState = when (mostRecentState.voiceMessageState) {
             VoiceMessageState.Idle,
-            VoiceMessageState.Preview -> {
+            VoiceMessageState.Preview,
+            VoiceMessageState.Sending -> {
                 mostRecentState
             }
             is VoiceMessageState.Recording -> {
@@ -364,7 +370,8 @@ class VoiceMessageComposerPresenterTest {
         )
 
         when (onPauseState.voiceMessageState) {
-            VoiceMessageState.Idle ->
+            VoiceMessageState.Idle,
+            VoiceMessageState.Sending ->
                 ensureAllEventsConsumed()
             is VoiceMessageState.Recording,
             VoiceMessageState.Preview ->

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

@@ -50,6 +50,7 @@ import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.applyScaleUp
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.CommonDrawables
@@ -153,24 +154,35 @@ fun TextComposer(
             composerMode = composerMode,
         )
     }
+    val uploadVoiceProgress = @Composable {
+        CircularProgressIndicator(
+            modifier = Modifier.size(24.dp),
+        )
+    }
 
     val textFormattingOptions = @Composable { TextFormatting(state = state) }
 
     val sendOrRecordButton = when {
         enableVoiceMessages && !canSendMessage ->
             when (voiceMessageState) {
+                VoiceMessageState.Idle,
+                is VoiceMessageState.Recording -> recordVoiceButton
                 is VoiceMessageState.Preview -> sendVoiceButton
-                else -> recordVoiceButton
+                is VoiceMessageState.Sending -> uploadVoiceProgress
             }
         else ->
             sendButton
     }
 
     val voiceRecording = @Composable {
-        if (voiceMessageState is VoiceMessageState.Recording) {
+        when(voiceMessageState) {
-            VoiceMessageRecording(voiceMessageState.level)
+            VoiceMessageState.Preview ->
-        } else if (voiceMessageState is VoiceMessageState.Preview) {
+                VoiceMessagePreview(isInteractive = true)
-            VoiceMessagePreview()
+            VoiceMessageState.Sending ->
+                VoiceMessagePreview(isInteractive = false)
+            is VoiceMessageState.Recording ->
+                VoiceMessageRecording(voiceMessageState.level)
+            VoiceMessageState.Idle -> {}
         }
     }
 
@@ -245,6 +257,8 @@ private fun StandardLayout(
         Box(
             Modifier
                 .padding(bottom = 5.dp, top = 5.dp, end = 6.dp, start = 6.dp)
+                .size(48.dp.applyScaleUp()),
+            contentAlignment = Alignment.Center,
         ) {
             endButton()
         }
@@ -721,6 +735,30 @@ internal fun TextComposerReplyPreview() = ElementPreview {
     )
 }
 
+@PreviewsDayNight
+@Composable
+internal fun TextComposerVoicePreview() = ElementPreview {
+    @Composable
+    fun VoicePreview(
+        voiceMessageState: VoiceMessageState
+    ) = TextComposer(
+        RichTextEditorState("", initialFocus = true),
+        voiceMessageState = voiceMessageState,
+        onSendMessage = {},
+        composerMode = MessageComposerMode.Normal,
+        onResetComposerMode = {},
+        enableTextFormatting = true,
+        enableVoiceMessages = true,
+    )
+    PreviewColumn(items = persistentListOf({
+        VoicePreview(voiceMessageState = VoiceMessageState.Recording(0.5))
+    }, {
+        VoicePreview(voiceMessageState = VoiceMessageState.Preview)
+    }, {
+        VoicePreview(voiceMessageState = VoiceMessageState.Sending)
+    }))
+}
+
 @Composable
 private fun PreviewColumn(
     items: ImmutableList<@Composable () -> Unit>,

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

@@ -17,6 +17,7 @@
 package io.element.android.libraries.textcomposer.components
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
@@ -33,6 +34,7 @@ import io.element.android.libraries.theme.ElementTheme
 
 @Composable
 internal fun VoiceMessagePreview(
+    isInteractive: Boolean,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -49,7 +51,11 @@ internal fun VoiceMessagePreview(
         // TODO Replace with recording preview UI
         Text(
             text = "Finished recording", // Not localized because it is a placeholder
-            color = ElementTheme.colors.textSecondary,
+            color = if (isInteractive) {
+                ElementTheme.colors.textSecondary
+            } else {
+                ElementTheme.colors.textDisabled
+            },
             style = ElementTheme.typography.fontBodySmMedium
         )
     }
@@ -58,5 +64,8 @@ internal fun VoiceMessagePreview(
 @PreviewsDayNight
 @Composable
 internal fun VoiceMessagePreviewPreview() = ElementPreview {
-    VoiceMessagePreview()
+    Column {
+        VoiceMessagePreview(isInteractive = true)
+        VoiceMessagePreview(isInteractive = false)
+    }
 }

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

@@ -20,6 +20,7 @@ sealed class VoiceMessageState {
     data object Idle: VoiceMessageState()
 
     data object Preview: VoiceMessageState()
+    data object Sending: VoiceMessageState()
     data class Recording(
         val level: Double,
     ): VoiceMessageState()

tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer.components_null_VoiceMessagePreview-D-13_13_null,NEXUS_5,1.0,en].png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ae279216869b9a1a9fc8dd73ab9c5a6f769b3f275a8cfafddc51ab009868089
-size 7829

tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer.components_null_VoiceMessagePreview-D-14_14_null,NEXUS_5,1.0,en].png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:256a21f9da287b5330fccf8de408137a39de1a73cefc5428e45cf391147fa249
+size 10955

tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer.components_null_VoiceMessagePreview-N-13_14_null,NEXUS_5,1.0,en].png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:646d5522a31967921f2b1fbbf5716c8bd47d8c312e7778772e92618102526bc8
-size 7521

tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer.components_null_VoiceMessagePreview-N-14_15_null,NEXUS_5,1.0,en].png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d92dac54bc06086757108838beb2e4f2067fdc0525a1a71c3f92b7787fce128
+size 10261

tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_null_TextComposerVoice-D-4_4_null,NEXUS_5,1.0,en].png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1bba507fdd9fc8526408d176f0519f42179a3618ff8e8a41f25b36a13a1a00f
+size 18323

tests/uitests/src/test/snapshots/images/ui_S_t[l.textcomposer_null_TextComposerVoice-N-4_5_null,NEXUS_5,1.0,en].png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c268e0a5bbdabb2355cb44820f666d2c4f298e5eeda7720328ad08ac9ac7cdc5
+size 17357