Add voice message playback from the timeline

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -142,6 +142,24 @@
         "version" : "2.14.1"
       }
     },
+    {
+      "identity" : "ogg-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/vector-im/ogg-swift.git",
+      "state" : {
+        "revision" : "9d82ed838404f10b607a1a1689f404563e9115c3",
+        "version" : "0.8.3"
+      }
+    },
+    {
+      "identity" : "opus-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/vector-im/opus-swift",
+      "state" : {
+        "revision" : "11f1887767cbc87c4b64b789ee830b779cc744cb",
+        "version" : "0.8.4"
+      }
+    },
     {
       "identity" : "posthog-ios",
       "kind" : "remoteSourceControl",
@@ -205,6 +223,15 @@
         "version" : "1.0.2"
       }
     },
+    {
+      "identity" : "swift-ogg",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/vector-im/swift-ogg",
+      "state" : {
+        "branch" : "0.0.1",
+        "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88"
+      }
+    },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",

ElementX/Resources/Assets.xcassets/images/media/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ElementX/Resources/Assets.xcassets/images/media/media-pause.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "media-pause.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

ElementX/Resources/Assets.xcassets/images/media/media-play.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "media-play.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift

@@ -320,16 +320,22 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
 
         let userID = userSession.clientProxy.userID
 
+        let mediaPlayerProvider = MediaPlayerProvider(mediaProvider: userSession.mediaProvider)
+
         let timelineItemFactory = RoomTimelineItemFactory(userID: userID,
                                                           mediaProvider: userSession.mediaProvider,
                                                           attributedStringBuilder: AttributedStringBuilder(permalinkBaseURL: appSettings.permalinkBaseURL,
                                                                                                            mentionBuilder: MentionBuilder(mentionsEnabled: appSettings.mentionsEnabled)),
                                                           stateEventStringBuilder: RoomStateEventStringBuilder(userID: userID),
                                                           appSettings: appSettings)
 
+        let voiceMesssageMediaManager = VoiceMessageMediaManager(mediaProvider: userSession.mediaProvider)
+
         let timelineController = roomTimelineControllerFactory.buildRoomTimelineController(roomProxy: roomProxy,
                                                                                            timelineItemFactory: timelineItemFactory,
-                                                                                           mediaProvider: userSession.mediaProvider)
+                                                                                           mediaProvider: userSession.mediaProvider,
+                                                                                           mediaPlayerProvider: mediaPlayerProvider,
+                                                                                           voiceMessageMediaManager: voiceMesssageMediaManager)
         self.timelineController = timelineController
 
         analytics.trackViewRoom(isDM: roomProxy.isDirect, isSpace: roomProxy.isSpace)

ElementX/Sources/Generated/Assets.swift

@@ -63,6 +63,8 @@ internal enum Asset {
     internal static let locationPin = ImageAsset(name: "images/location-pin")
     internal static let locationPointerFull = ImageAsset(name: "images/location-pointer-full")
     internal static let locationPointer = ImageAsset(name: "images/location-pointer")
+    internal static let mediaPause = ImageAsset(name: "images/media-pause")
+    internal static let mediaPlay = ImageAsset(name: "images/media-play")
     internal static let addReaction = ImageAsset(name: "images/add-reaction")
     internal static let copy = ImageAsset(name: "images/copy")
     internal static let editOutline = ImageAsset(name: "images/edit-outline")

ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift

@@ -109,8 +109,8 @@ struct RoomScreenViewState: BindableState {
     /// A closure providing the actions to show when long pressing on an item in the timeline.
     var timelineItemMenuActionProvider: (@MainActor (_ itemId: TimelineItemIdentifier) -> TimelineItemMenuActions?)?
 
-    /// A closure providing the associated audio playback view state for an item in the timeline.
-    var audioPlaybackViewStateProvider: (@MainActor (_ itemId: TimelineItemIdentifier) -> VoiceRoomPlaybackViewState?)?
+    /// A closure providing the associated audio player state for an item in the timeline.
+    var audioPlayerStateProvider: (@MainActor (_ itemId: TimelineItemIdentifier) -> AudioPlayerState?)?
 }
 
 struct RoomScreenViewStateBindings {

ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift

@@ -77,10 +77,12 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
             return self.timelineItemMenuActionsForItemId(itemId)
         }
 
-        state.audioPlaybackViewStateProvider = { [weak self] itemId -> VoiceRoomPlaybackViewState? in
-            guard let self else { return nil }
+        state.audioPlayerStateProvider = { [weak self] itemId -> AudioPlayerState? in
+            guard let self else {
+                return nil
+            }
 
-            return self.audioPlaybackViewState(for: itemId)
+            return self.audioPlayerState(for: itemId)
         }
 
         buildTimelineViews()
@@ -883,8 +885,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
 
     // MARK: - Audio
 
-    private func audioPlaybackViewState(for itemID: TimelineItemIdentifier) -> VoiceRoomPlaybackViewState? {
-        timelineController.playbackViewState(for: itemID)
+    private func audioPlayerState(for itemID: TimelineItemIdentifier) -> AudioPlayerState {
+        timelineController.audioPlayerState(for: itemID)
     }
 }
 

ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift

@@ -491,21 +491,21 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
                                                          replyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
                                                                                contentType: .text(.init(body: "Short")))))
 
-            VoiceRoomTimelineView(timelineItem: .init(id: .init(timelineID: ""),
-                                                      timestamp: "10:42",
-                                                      isOutgoing: true,
-                                                      isEditable: false,
-                                                      canBeRepliedTo: true,
-                                                      isThreaded: true,
-                                                      sender: .init(id: ""),
-                                                      content: .init(body: "audio.ogg",
-                                                                     duration: 100,
-                                                                     waveform: Waveform.mockWaveform,
-                                                                     source: nil,
-                                                                     contentType: nil),
-                                                      replyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
-                                                                            contentType: .text(.init(body: "Short")))),
-                                  playbackViewState: VoiceRoomPlaybackViewState(duration: 10, waveform: Waveform.mockWaveform))
+            VoiceMessageRoomTimelineView(timelineItem: .init(id: .init(timelineID: ""),
+                                                             timestamp: "10:42",
+                                                             isOutgoing: true,
+                                                             isEditable: false,
+                                                             canBeRepliedTo: true,
+                                                             isThreaded: true,
+                                                             sender: .init(id: ""),
+                                                             content: .init(body: "audio.ogg",
+                                                                            duration: 100,
+                                                                            waveform: Waveform.mockWaveform,
+                                                                            source: nil,
+                                                                            contentType: nil),
+                                                             replyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
+                                                                                   contentType: .text(.init(body: "Short")))),
+                                         playerState: AudioPlayerState(duration: 10, waveform: Waveform.mockWaveform))
         }
         .environmentObject(viewModel.context)
     }

ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift

@@ -218,21 +218,21 @@ struct TimelineItemPlainStylerView_Previews: PreviewProvider, TestablePreview {
                                                                         geoURI: .init(latitude: 41.902782, longitude: 12.496366), description: nil),
                                                          replyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
                                                                                contentType: .text(.init(body: "Short")))))
-            VoiceRoomTimelineView(timelineItem: .init(id: .init(timelineID: ""),
-                                                      timestamp: "10:42",
-                                                      isOutgoing: true,
-                                                      isEditable: false,
-                                                      canBeRepliedTo: true,
-                                                      isThreaded: true,
-                                                      sender: .init(id: ""),
-                                                      content: .init(body: "audio.ogg",
-                                                                     duration: 100,
-                                                                     waveform: Waveform.mockWaveform,
-                                                                     source: nil,
-                                                                     contentType: nil),
-                                                      replyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
-                                                                            contentType: .text(.init(body: "Short")))),
-                                  playbackViewState: VoiceRoomPlaybackViewState(duration: 10, waveform: Waveform.mockWaveform))
+            VoiceMessageRoomTimelineView(timelineItem: .init(id: .init(timelineID: ""),
+                                                             timestamp: "10:42",
+                                                             isOutgoing: true,
+                                                             isEditable: false,
+                                                             canBeRepliedTo: true,
+                                                             isThreaded: true,
+                                                             sender: .init(id: ""),
+                                                             content: .init(body: "audio.ogg",
+                                                                            duration: 100,
+                                                                            waveform: Waveform.mockWaveform,
+                                                                            source: nil,
+                                                                            contentType: nil),
+                                                             replyDetails: .loaded(sender: .init(id: "", displayName: "Alice"),
+                                                                                   contentType: .text(.init(body: "Short")))),
+                                         playerState: AudioPlayerState(duration: 10, waveform: Waveform.mockWaveform))
         }
         .environmentObject(viewModel.context)
     }

ElementX/Sources/Services/AudioPlayer/AudioConverter.swift

@@ -0,0 +1,43 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// 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.
+//
+
+import AVFoundation
+import Foundation
+import SwiftOGG
+
+enum AudioConverterError: Error {
+    case conversionFailed(Error?)
+}
+
+struct AudioConverter {
+    func convertToOpusOgg(sourceURL: URL, destinationURL: URL) throws {
+        do {
+            try OGGConverter.convertM4aFileToOpusOGG(src: sourceURL, dest: destinationURL)
+        } catch {
+            MXLog.error("failed to convert to OpusOgg: \(error)")
+            throw AudioConverterError.conversionFailed(error)
+        }
+    }
+
+    func convertToMPEG4AAC(sourceURL: URL, destinationURL: URL) throws {
+        do {
+            try OGGConverter.convertOpusOGGToM4aFile(src: sourceURL, dest: destinationURL)
+        } catch {
+            MXLog.error("failed to convert to MPEG4AAC: \(error)")
+            throw AudioConverterError.conversionFailed(error)
+        }
+    }
+}