element-hq · onurays · Jul 30, 2021 · Jun 17, 2021 · Jun 17, 2021 · Jul 1, 2021
diff --git a/build.gradle b/build.gradle
@@ -48,6 +48,9 @@ allprojects {
                 // Chat effects
                 includeGroupByRegex 'com\\.github\\.jetradarmobile'
                 includeGroupByRegex 'nl\\.dionsegijn'
+
+                // Voice RecordView
+                includeGroupByRegex 'com\\.github\\.Armen101'
             }
         }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }

diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
@@ -128,4 +128,20 @@
     <color name="vctr_chat_effect_snow_background_light">@color/black_alpha</color>
     <color name="vctr_chat_effect_snow_background_dark">@android:color/transparent</color>
 
+    <attr name="vctr_voice_message_lock_background" format="color" />
+    <color name="vctr_voice_message_lock_background_light">#FFF3F8FD</color>
+    <color name="vctr_voice_message_lock_background_dark">#22252B</color>
+
+    <attr name="vctr_voice_message_playback_background" format="color" />
+    <color name="vctr_voice_message_playback_background_light">#FFE3E8F0</color>
+    <color name="vctr_voice_message_playback_background_dark">#FF394049</color>
+
+    <attr name="vctr_voice_message_play_pause_button_background" format="color" />
+    <color name="vctr_voice_message_play_pause_button_background_light">@android:color/white</color>
+    <color name="vctr_voice_message_play_pause_button_background_dark">#FF8E99A4</color>
+
+    <attr name="vctr_voice_message_recording_playback_background" format="color" />
+    <color name="vctr_voice_message_recording_playback_background_light">#FFE3E8F0</color>
+    <color name="vctr_voice_message_recording_playback_background_dark">#FF394049</color>
+
 </resources>
diff --git a/library/ui-styles/src/main/res/values/styles_voice_message.xml b/library/ui-styles/src/main/res/values/styles_voice_message.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <attr name="vctr_voice_message_lock_background_style" format="reference" />
+    <attr name="vctr_voice_message_playback_background_style" format="reference" />
+    <attr name="vctr_voice_message_play_pause_button_background_style" format="reference" />
+    <attr name="vctr_voice_message_recording_playback_background_style" format="reference" />
+
+    <style name="VoiceMessageLockBackground">
+        <item name="android:layout_width">52dp</item>
+        <item name="android:layout_height">160dp</item>
+        <item name="android:background">@drawable/bg_voice_message_lock</item>
+        <item name="android:backgroundTint">?vctr_voice_message_lock_background</item>
+    </style>
+
+    <style name="VoiceMessageMicButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:layout_marginBottom">12dp</item>
+        <item name="android:layout_marginEnd">12dp</item>
+        <item name="android:src">@drawable/ic_voice_mic</item>
+    </style>
+
+    <style name="VoiceMessageSendButton">
+        <item name="android:layout_width">56dp</item>
+        <item name="android:layout_height">56dp</item>
+        <item name="android:background">@drawable/bg_send</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:src">@drawable/ic_send</item>
+    </style>
+
+    <style name="VoiceMessageTimerIndicator">
+        <item name="android:layout_width">10dp</item>
+        <item name="android:layout_height">10dp</item>
+        <item name="android:layout_marginStart">20dp</item>
+        <item name="android:src">@drawable/circle</item>
+        <item name="tint">@color/palette_vermilion</item>
+    </style>
+
+    <style name="VoiceMessageTimer">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">4dp</item>
+        <item name="android:lineSpacingExtra">4dp</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/palette_gray_200</item>
+    </style>
+
+    <style name="VoiceMessageSlideToCancel">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/palette_gray_300</item>
+        <item name="android:textSize">14sp</item>
+        <item name="drawableStartCompat">@drawable/ic_voice_slide_to_cancel_arrow</item>
+    </style>
+
+    <style name="VoiceMessageLockImage">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:src">@drawable/ic_voice_message_unlocked</item>
+    </style>
+
+    <style name="VoiceMessageLockArrow">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:src">@drawable/ic_voice_lock_arrow</item>
+    </style>
+
+    <style name="VoiceMessageRecordingPlaybackLayout">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:background">@drawable/bg_voice_playback</item>
+        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:backgroundTint">?vctr_voice_message_recording_playback_background</item>
+    </style>
+
+    <style name="VoiceMessageDeletePlayback">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:src">@drawable/ic_recycle_bin</item>
+        <item name="tint">@color/palette_gray_200</item>
+    </style>
+
+    <style name="VoiceMessagePlaybackTimerIndicator">
+        <item name="android:layout_width">10dp</item>
+        <item name="android:layout_height">10dp</item>
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:src">@drawable/circle</item>
+        <item name="layout_goneMarginStart">24dp</item>
+        <item name="tint">@color/palette_vermilion</item>
+    </style>
+
+    <style name="VoicePlaybackControlButton">
+        <item name="android:layout_width">32dp</item>
+        <item name="android:layout_height">32dp</item>
+        <item name="android:background">@drawable/bg_voice_play_pause_button</item>
+        <item name="android:paddingStart">3dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:src">@drawable/ic_voice_play</item>
+        <item name="android:backgroundTint">?vctr_voice_message_play_pause_button_background</item>
+    </style>
+
+    <style name="VoicePlaybackTime" parent="VoiceMessageTimer">
+        <item name="android:layout_marginStart">6dp</item>
+        <item name="layout_goneMarginStart">24dp</item>
+    </style>
+
+    <style name="VoicePlaybackWaveform">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:layout_marginEnd">8dp</item>
+        <item name="chunkColor">@color/palette_gray_300</item>
+        <item name="chunkAlignTo">center</item>
+        <item name="chunkMinHeight">1dp</item>
+        <item name="chunkRoundedCorners">true</item>
+        <item name="chunkSoftTransition">true</item>
+        <item name="chunkSpace">2dp</item>
+        <item name="chunkWidth">2dp</item>
+        <item name="direction">leftToRight</item>
+    </style>
+
+    <style name="VoiceTimelinePlaybackLayout">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/bg_voice_playback</item>
+        <item name="android:minHeight">48dp</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:backgroundTint">?vctr_voice_message_playback_background</item>
+    </style>
+
+    <style name="VoiceTimelinePlaybackControlButton">
+        <item name="android:layout_width">32dp</item>
+        <item name="android:layout_height">32dp</item>
+        <item name="android:background">@drawable/bg_voice_play_pause_button</item>
+        <item name="android:paddingStart">3dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:src">@drawable/ic_voice_play</item>
+        <item name="android:backgroundTint">?vctr_voice_message_play_pause_button_background</item>
+    </style>
+
+    <style name="VoiceTimelinePlaybackTime" parent="VoiceMessageTimer">
+        <item name="android:layout_marginStart">6dp</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -135,6 +135,11 @@
 
         <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Dark</item>
 
+        <!-- Voice Message -->
+        <item name="vctr_voice_message_lock_background">@color/vctr_voice_message_lock_background_dark</item>
+        <item name="vctr_voice_message_playback_background">@color/vctr_voice_message_playback_background_dark</item>
+        <item name="vctr_voice_message_play_pause_button_background">@color/vctr_voice_message_play_pause_button_background_dark</item>
+        <item name="vctr_voice_message_recording_playback_background">@color/vctr_voice_message_recording_playback_background_dark</item>
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />

diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -137,6 +137,11 @@
 
         <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Light</item>
 
+        <!-- Voice Message -->
+        <item name="vctr_voice_message_lock_background">@color/vctr_voice_message_lock_background_light</item>
+        <item name="vctr_voice_message_playback_background">@color/vctr_voice_message_playback_background_light</item>
+        <item name="vctr_voice_message_play_pause_button_background">@color/vctr_voice_message_play_pause_button_background_light</item>
+        <item name="vctr_voice_message_recording_playback_background">@color/vctr_voice_message_recording_playback_background_light</item>
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -23,6 +23,7 @@ import io.reactivex.Single
 import kotlinx.coroutines.rx2.rxCompletable
 import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.Room
@@ -146,6 +147,10 @@ class RxRoom(private val room: Room) {
     fun deleteAvatar(): Completable = rxCompletable {
         room.deleteAvatar()
     }
+
+    fun sendMedia(attachment: ContentAttachmentData, compressBeforeSending: Boolean, roomIds: Set<String>): Completable = rxCompletable {
+        room.sendMedia(attachment, compressBeforeSending, roomIds)
+    }
 }
 
 fun Room.rx(): RxRoom {

diff --git a/...android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt b/...android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
@@ -35,7 +35,8 @@ data class ContentAttachmentData(
         val name: String? = null,
         val queryUri: Uri,
         val mimeType: String?,
-        val type: Type
+        val type: Type,
+        val waveform: List<Int>? = null
 ) : Parcelable {
 
     @JsonClass(generateAdapter = false)

diff --git a/...rc/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt b/...rc/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
@@ -20,6 +20,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
+import org.matrix.android.sdk.internal.crypto.model.rest.AudioWaveformInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
@@ -50,7 +51,17 @@ data class MessageAudioContent(
         /**
          * Required if the file is encrypted. Information on the encrypted file, as specified in End-to-end encryption.
          */
-        @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
+        @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null,
+
+        /**
+         * Encapsulates waveform and duration of the audio.
+         */
+        @Json(name = "org.matrix.msc1767.audio") val audioWaveformInfo: AudioWaveformInfo? = null,
+
+        /**
+         * Indicates that is a voice message.
+         */
+        @Json(name = "org.matrix.msc2516.voice") val voiceMessageIndicator: Any? = null
 ) : MessageWithAttachmentContent {
 
     override val mimeType: String?

diff --git a/...roid/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/AudioWaveformInfo.kt b/...roid/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/AudioWaveformInfo.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.model.rest
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class AudioWaveformInfo(
+        @Json(name = "duration")
+        val duration: Int? = null,
+
+        @Json(name = "waveform")
+        val waveform: List<Int>? = null
+
+)
diff --git a/.../src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/.../src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -53,6 +53,7 @@ import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.isReply
+import org.matrix.android.sdk.internal.crypto.model.rest.AudioWaveformInfo
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
 import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
@@ -289,14 +290,20 @@ internal class LocalEchoEventFactory @Inject constructor(
     }
 
     private fun createAudioEvent(roomId: String, attachment: ContentAttachmentData): Event {
+        val isVoiceMessage = attachment.mimeType == "audio/ogg"
         val content = MessageAudioContent(
                 msgType = MessageType.MSGTYPE_AUDIO,
                 body = attachment.name ?: "audio",
                 audioInfo = AudioInfo(
                         mimeType = attachment.getSafeMimeType()?.takeIf { it.isNotBlank() },
                         size = attachment.size
                 ),
-                url = attachment.queryUri.toString()
+                url = attachment.queryUri.toString(),
+                audioWaveformInfo = if (!isVoiceMessage) null else AudioWaveformInfo(
+                        duration = attachment.duration?.toInt(),
+                        waveform = attachment.waveform
+                ),
+                voiceMessageIndicator = if (!isVoiceMessage) null else Any()
         )
         return createMessageEvent(roomId, content)
     }

diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt
@@ -23,5 +23,6 @@ data class MultiPickerAudioType(
         override val size: Long,
         override val mimeType: String?,
         override val contentUri: Uri,
-        val duration: Long
+        val duration: Long,
+        var waveform: List<Int>? = null
 ) : MultiPickerBaseType
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
@@ -111,7 +111,7 @@ internal fun Uri.toMultiPickerVideoType(context: Context): MultiPickerVideoType?
     }
 }
 
-internal fun Uri.toMultiPickerAudioType(context: Context): MultiPickerAudioType? {
+fun Uri.toMultiPickerAudioType(context: Context): MultiPickerAudioType? {
     val projection = arrayOf(
             MediaStore.Audio.Media.DISPLAY_NAME,
             MediaStore.Audio.Media.SIZE

diff --git a/vector/build.gradle b/vector/build.gradle
@@ -144,6 +144,8 @@ android {
 
         buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
 
+        buildConfigField "Long", "VOICE_MESSAGE_DURATION_LIMIT_MS", "120000L"
+
         //  If set, MSC3086 asserted identity messages sent on VoIP calls will cause the call to appear in the room corresponding to the asserted identity.
         //  This *must* only be set in trusted environments.
         buildConfigField "Boolean", "handleCallAssertedIdentityEvents", "false"
@@ -339,7 +341,7 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-beta02'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation 'androidx.core:core-ktx:1.5.0'
     implementation "androidx.media:media:1.3.1"
@@ -401,6 +403,7 @@ dependencies {
     implementation "androidx.autofill:autofill:$autofill_version"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
+    implementation 'com.github.Armen101:AudioRecordView:1.0.5'
 
     // Custom Tab
     implementation 'androidx.browser:browser:1.3.0'

diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
@@ -57,7 +57,8 @@ fun MultiPickerAudioType.toContentAttachmentData(): ContentAttachmentData {
             size = size,
             name = displayName,
             duration = duration,
-            queryUri = contentUri
+            queryUri = contentUri,
+            waveform = waveform
     )
 }