Updated rendering of attachments with text

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift

@@ -49,13 +49,7 @@ public struct ImageAttachmentContainer<Factory: ViewFactory>: View {
                 }
 
                 if !message.text.isEmpty {
-                    HStack {
-                        Text(message.text)
-                            .standardPadding()
-                            .foregroundColor(textColor(for: message))
-                        Spacer()
-                    }
-                    .background(Color(backgroundColor))
+                    AttachmentTextView(message: message)
                 }
             }
         }
@@ -77,16 +71,34 @@ public struct ImageAttachmentContainer<Factory: ViewFactory>: View {
             )
         }
     }
+}
+
+struct AttachmentTextView: View {
+    
+    @Injected(\.colors) private var colors
+    
+    var message: ChatMessage
+    
+    var body: some View {
+        HStack {
+            Text(message.text)
+                .standardPadding()
+                .foregroundColor(textColor(for: message))
+            Spacer()
+        }
+        .background(Color(backgroundColor))
+    }
 
     private var backgroundColor: UIColor {
+        var colors = colors
         if message.isSentByCurrentUser {
             if message.type == .ephemeral {
                 return colors.background8
             } else {
-                return colors.background6
+                return colors.messageCurrentUserBackground[0]
             }
         } else {
-            return colors.background8
+            return colors.messageOtherUserBackground[0]
         }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/VideoAttachmentView.swift

@@ -16,7 +16,7 @@ public struct VideoAttachmentsContainer<Factory: ViewFactory>: View {
     @Binding var scrolledId: String?
 
     public var body: some View {
-        VStack {
+        VStack(spacing: 0) {
             if let quotedMessage = utils.messageCachingUtils.quotedMessage(for: message) {
                 VStack {
                     factory.makeQuotedMessageView(
@@ -45,7 +45,14 @@ public struct VideoAttachmentsContainer<Factory: ViewFactory>: View {
                     width: width
                 )
             }
+            
+            if !message.text.isEmpty {
+                AttachmentTextView(message: message)
+            }
         }
+        .if(!message.text.isEmpty, transform: { view in
+            view.messageBubble(for: message, isFirst: true, cornerRadius: 24)
+        })
     }
 }
 

StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelTestHelpers.swift

@@ -114,6 +114,28 @@ class ChatChannelTestHelpers {
         return giphyAttachments
     }()
 
+    static var videoAttachment: ChatMessageVideoAttachment = {
+        let attachmentFile = AttachmentFile(type: .mp4, size: 0, mimeType: "video/mp4")
+        let uploadingState = AttachmentUploadingState(
+            localFileURL: testURL,
+            state: .pendingUpload,
+            file: attachmentFile
+        )
+        
+        return ChatMessageVideoAttachment(
+            id: .unique,
+            type: .video,
+            payload: VideoAttachmentPayload(
+                title: "test",
+                videoRemoteURL: testURL,
+                file: attachmentFile,
+                extraData: nil
+            ),
+            uploadingState: uploadingState
+        )
+
+    }()
+    
     static var linkAttachments: [AnyChatMessageAttachment] = {
         let attachmentFile = AttachmentFile(type: .generic, size: 0, mimeType: "video/mp4")
         let uploadingState = AttachmentUploadingState(

StreamChatSwiftUITests/Tests/ChatChannel/MessageContainerView_Tests.swift

@@ -60,6 +60,52 @@ class MessageContainerView_Tests: StreamChatTestCase {
         testMessageViewContainerSnapshot(message: message)
     }
 
+    func test_videoAttachment_snapshotNoText() {
+        // Given
+        let attachment = ChatChannelTestHelpers.videoAttachment
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "",
+            author: .mock(id: .unique)
+        )
+        
+        // When
+        let view = VideoAttachmentView(
+            attachment: attachment,
+            message: message,
+            width: 2 * defaultScreenSize.width / 3
+        )
+        .applyDefaultSize()
+        
+        // Then
+        assertSnapshot(matching: view, as: .image)
+    }
+    
+    func test_videoAttachment_snapshotText() {
+        // Given
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "Test message",
+            author: .mock(id: .unique),
+            attachments: ChatChannelTestHelpers.videoAttachments
+        )
+        
+        // When
+        let view = VideoAttachmentsContainer(
+            factory: DefaultViewFactory.shared,
+            message: message,
+            width: 2 * defaultScreenSize.width / 3,
+            scrolledId: .constant(nil)
+        )
+        .frame(width: 200)
+        .padding()
+        
+        // Then
+        assertSnapshot(matching: view, as: .image)
+    }
+    
     // MARK: - private
 
     func testMessageViewContainerSnapshot(message: ChatMessage) {