added video support for inline replies

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/MessageList/QuotedMessageView.swift

@@ -16,7 +16,7 @@ struct QuotedMessageViewContainer: View {
 
     var body: some View {
         HStack(alignment: .bottom) {
-            if !message.isSentByCurrentUser {
+            if !quotedMessage.isSentByCurrentUser {
                 MessageAvatarView(
                     author: quotedMessage.author,
                     size: .init(width: avatarSize, height: avatarSize)
@@ -55,36 +55,40 @@ struct QuotedMessageView: View {
 
     var body: some View {
         HStack(alignment: .top) {
-            ZStack {
-                if !quotedMessage.imageAttachments.isEmpty {
-                    LazyLoadingImage(
-                        source: quotedMessage.imageAttachments[0].imagePreviewURL,
-                        width: attachmentWidth,
-                        resize: false
-                    )
-                } else if !quotedMessage.giphyAttachments.isEmpty {
-                    LazyGiphyView(
-                        source: quotedMessage.giphyAttachments[0].previewURL,
-                        width: attachmentWidth
-                    )
-                } else if !quotedMessage.fileAttachments.isEmpty {
-                    Image(uiImage: filePreviewImage(for: quotedMessage.fileAttachments[0].assetURL))
-                } else if !quotedMessage.videoAttachments.isEmpty {
-                    VideoAttachmentView(
-                        attachment: quotedMessage.videoAttachments[0],
-                        message: quotedMessage,
-                        width: attachmentWidth
-                    )
-                } else if !quotedMessage.linkAttachments.isEmpty {
-                    LazyImage(source: quotedMessage.linkAttachments[0].previewURL!)
-                        .onDisappear(.reset)
-                        .processors([ImageProcessors.Resize(width: attachmentWidth)])
-                        .priority(.high)
+            if !quotedMessage.attachmentCounts.isEmpty {
+                ZStack {
+                    if !quotedMessage.imageAttachments.isEmpty {
+                        LazyLoadingImage(
+                            source: quotedMessage.imageAttachments[0].imagePreviewURL,
+                            width: attachmentWidth,
+                            resize: false
+                        )
+                    } else if !quotedMessage.giphyAttachments.isEmpty {
+                        LazyGiphyView(
+                            source: quotedMessage.giphyAttachments[0].previewURL,
+                            width: attachmentWidth
+                        )
+                    } else if !quotedMessage.fileAttachments.isEmpty {
+                        Image(uiImage: filePreviewImage(for: quotedMessage.fileAttachments[0].assetURL))
+                    } else if !quotedMessage.videoAttachments.isEmpty {
+                        VideoAttachmentView(
+                            attachment: quotedMessage.videoAttachments[0],
+                            message: quotedMessage,
+                            width: attachmentWidth,
+                            ratio: 1.0,
+                            cornerRadius: 0
+                        )
+                    } else if !quotedMessage.linkAttachments.isEmpty {
+                        LazyImage(source: quotedMessage.linkAttachments[0].previewURL!)
+                            .onDisappear(.reset)
+                            .processors([ImageProcessors.Resize(width: attachmentWidth)])
+                            .priority(.high)
+                    }
                 }
+                .frame(width: attachmentWidth, height: attachmentWidth)
+                .aspectRatio(1, contentMode: .fill)
+                .clipShape(RoundedRectangle(cornerRadius: 8))
             }
-            .frame(width: attachmentWidth, height: attachmentWidth)
-            .aspectRatio(1, contentMode: .fill)
-            .clipShape(RoundedRectangle(cornerRadius: 8))
 
             Text(textForMessage)
                 .lineLimit(3)

Sources/StreamChatSwiftUI/ChatChannel/MessageList/VideoAttachmentView.swift

@@ -12,21 +12,49 @@ public struct VideoAttachmentsContainer: View {
 
     public var body: some View {
         VStack {
-            ForEach(message.videoAttachments, id: \.self) { attachment in
-                VideoAttachmentView(
-                    attachment: attachment,
+            if let quotedMessage = message.quotedMessage {
+                VStack {
+                    QuotedMessageViewContainer(
+                        quotedMessage: quotedMessage,
+                        message: message
+                    )
+                    
+                    VideoAttachmentsList(
+                        message: message,
+                        width: width
+                    )
+                }
+                .messageBubble(for: message, isFirst: false)
+            } else {
+                VideoAttachmentsList(
                     message: message,
                     width: width
                 )
-                .withUploadingStateIndicator(
-                    for: attachment.uploadingState,
-                    url: attachment.videoURL
-                )
             }
         }
     }
 }
 
+public struct VideoAttachmentsList: View {
+    
+    let message: ChatMessage
+    let width: CGFloat
+    
+    public var body: some View {
+        ForEach(message.videoAttachments, id: \.self) { attachment in
+            VideoAttachmentView(
+                attachment: attachment,
+                message: message,
+                width: width
+            )
+            .withUploadingStateIndicator(
+                for: attachment.uploadingState,
+                url: attachment.videoURL
+            )
+        }
+    }
+}
+
 public struct VideoAttachmentView: View {
     @Injected(\.utils) private var utils
 
@@ -37,6 +65,8 @@ public struct VideoAttachmentView: View {
     let attachment: ChatMessageVideoAttachment
     let message: ChatMessage
     let width: CGFloat
+    var ratio: CGFloat = 0.75
+    var cornerRadius: CGFloat = 24
 
     @State var previewImage: UIImage?
     @State var error: Error?
@@ -67,8 +97,8 @@ public struct VideoAttachmentView: View {
                 }
             }
         }
-        .frame(width: width, height: 3 * width / 4)
-        .cornerRadius(24)
+        .frame(width: width, height: width * ratio)
+        .cornerRadius(cornerRadius)
         .fullScreenCover(isPresented: $fullScreenShown) {
             VideoPlayerView(
                 attachment: attachment,
@@ -86,6 +116,5 @@ public struct VideoAttachmentView: View {
                 }
             }
         }
-        .cornerRadius(24)
     }
 }