Voice Message

vector/src/main/assets/open_source_licenses.html

@@ -595,5 +595,18 @@ <h3>
     </li>
 </ul>
 
+<h3>
+    GNU GENERAL PUBLIC LICENSE
+    <br/>
+    Version 3, 29 June 2007
+</h3>
+<ul>
+    <li>
+        <b>ffmpeg-kit</b>
+        <br/>
+        Copyright (c) 2021 Taner Sener
+    </li>
+</ul>
+
 </body>
 </html>

vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt

@@ -1291,7 +1291,14 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onTextBlankStateChanged(isBlank: Boolean) {
-                views.voiceMessageRecorderView.isVisible = !views.composerLayout.views.sendButton.isVisible && vectorPreferences.labsUseVoiceMessage()
+                if (!views.composerLayout.views.sendButton.isVisible && vectorPreferences.labsUseVoiceMessage()) {
+                    // Animate alpha to prevent overlapping with the animation of the send button
+                    views.voiceMessageRecorderView.alpha = 0f
+                    views.voiceMessageRecorderView.isVisible = true
+                    views.voiceMessageRecorderView.animate().alpha(1f).setDuration(300).start()
+                } else {
+                    views.voiceMessageRecorderView.isVisible = false
+                }
             }
         }
     }
@@ -1356,11 +1363,13 @@ class RoomDetailFragment @Inject constructor(
             views.inviteView.isVisible = false
             if (state.tombstoneEvent == null) {
                 if (state.canSendMessage) {
-                    views.composerLayout.isVisible = true
-                    views.voiceMessageRecorderView.isVisible = vectorPreferences.labsUseVoiceMessage()
-                    views.composerLayout.setRoomEncrypted(summary.isEncrypted)
-                    views.notificationAreaView.render(NotificationAreaView.State.Hidden)
-                    views.composerLayout.alwaysShowSendButton = !vectorPreferences.labsUseVoiceMessage()
+                    if (!views.voiceMessageRecorderView.isActive()) {
+                        views.composerLayout.isVisible = true
+                        views.voiceMessageRecorderView.isVisible = vectorPreferences.labsUseVoiceMessage()
+                        views.composerLayout.setRoomEncrypted(summary.isEncrypted)
+                        views.notificationAreaView.render(NotificationAreaView.State.Hidden)
+                        views.composerLayout.alwaysShowSendButton = !vectorPreferences.labsUseVoiceMessage()
+                    }
                 } else {
                     views.composerLayout.isVisible = false
                     views.voiceMessageRecorderView.isVisible = false
@@ -1904,13 +1913,21 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
             is EventSharedAction.Edit                       -> {
-                roomDetailViewModel.handle(RoomDetailAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
+                if (!views.voiceMessageRecorderView.isActive()) {
+                    roomDetailViewModel.handle(RoomDetailAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
+                } else {
+                    requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
+                }
             }
             is EventSharedAction.Quote                      -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
             }
             is EventSharedAction.Reply                      -> {
-                roomDetailViewModel.handle(RoomDetailAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
+                if (!views.voiceMessageRecorderView.isActive()) {
+                    roomDetailViewModel.handle(RoomDetailAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
+                } else {
+                    requireActivity().toast(R.string.error_voice_message_cannot_reply_or_edit)
+                }
             }
             is EventSharedAction.CopyPermalink              -> {
                 val permalink = session.permalinkService().createPermalink(roomDetailArgs.roomId, action.eventId)

vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt

@@ -400,6 +400,11 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
         PLAYBACK
     }
 
+    /**
+     * Returns true if the voice message is recording or is in playback mode
+     */
+    fun isActive() = recordingState !in listOf(RecordingState.NONE, RecordingState.CANCELLED)
+
     override fun onUpdate(state: VoiceMessagePlaybackTracker.Listener.State) {
         when (state) {
             is VoiceMessagePlaybackTracker.Listener.State.Recording -> {

vector/src/main/res/values/strings.xml

@@ -3454,4 +3454,5 @@
     <string name="voice_message_tap_to_stop_toast">Tap on the wavelength to stop and playback</string>
     <string name="error_voice_message_unable_to_play">Cannot play this voice message</string>
     <string name="error_voice_message_unable_to_record">Cannot record a voice message</string>
+    <string name="error_voice_message_cannot_reply_or_edit">Cannot reply or edit while voice message is active</string>
 </resources>