implemented inline replies

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -68,6 +68,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
             factory.makeMessageComposerViewType(
                 with: viewModel.channelController,
                 messageController: viewModel.messageController,
+                quotedMessage: $viewModel.quotedMessage,
                 onMessageSent: viewModel.scrollToLastMessage
             )
         }
@@ -80,6 +81,8 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
                     messageDisplayInfo: messageDisplayInfo!,
                     onBackgroundTap: {
                         viewModel.reactionsShown = false
+                    }, onActionExecuted: { actionInfo in
+                        viewModel.messageActionExecuted(actionInfo)
                     }
                 )
                 .transition(.identity)

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -86,6 +86,7 @@ public class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     }
 
     @Published var reactionsShown = false
+    @Published var quotedMessage: ChatMessage?
 
     var channel: ChatChannel {
         channelController.channel!
@@ -188,6 +189,13 @@ public class ChatChannelViewModel: ObservableObject, MessagesDataSource {
         UIGraphicsEndImageContext()
     }
 
+    func messageActionExecuted(_ messageActionInfo: MessageActionInfo) {
+        utils.messageActionsResolver.resolveMessageAction(
+            info: messageActionInfo,
+            viewModel: self
+        )
+    }
+    
     func onViewAppear() {
         reactionsShown = false
         isActive = true

Sources/StreamChatSwiftUI/ChatChannel/Composer/DiscardAttachmentButton.swift

@@ -22,16 +22,24 @@ public struct DiscardAttachmentButton: View {
                     onDiscard(attachmentIdentifier)
                 }
             }, label: {
-                ZStack {
-                    Circle()
-                        .fill(Color.white)
-                        .frame(width: 16, height: 16)
-                    
-                    Image(systemName: "xmark.circle.fill")
-                        .foregroundColor(Color.black.opacity(0.8))
-                }
-                .padding(.all, 4)
+                DiscardButtonView()
             })
         }
     }
 }
+
+/// View for the discard button.
+struct DiscardButtonView: View {
+    
+    var body: some View {
+        ZStack {
+            Circle()
+                .fill(Color.white)
+                .frame(width: 16, height: 16)
+            
+            Image(systemName: "xmark.circle.fill")
+                .foregroundColor(Color.black.opacity(0.8))
+        }
+        .padding(.all, 4)
+    }
+}

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -8,16 +8,19 @@ import SwiftUI
 /// Main view for the message composer.
 public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable {
     @Injected(\.colors) private var colors
+    @Injected(\.fonts) private var fonts
 
     // Initial popup size, before the keyboard is shown.
     @State private var popupSize: CGFloat = 350
 
     private var factory: Factory
+    @Binding var quotedMessage: ChatMessage?
 
     public init(
         viewFactory: Factory,
         channelController: ChatChannelController,
         messageController: ChatMessageController?,
+        quotedMessage: Binding<ChatMessage?>,
         onMessageSent: @escaping () -> Void
     ) {
         factory = viewFactory
@@ -27,6 +30,7 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
                 messageController: messageController
             )
         )
+        _quotedMessage = quotedMessage
         self.onMessageSent = onMessageSent
     }
 
@@ -36,6 +40,25 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
 
     public var body: some View {
         VStack(spacing: 0) {
+            if quotedMessage != nil {
+                ZStack {
+                    Text("Reply to Message")
+                        .font(fonts.bodyBold)
+                    
+                    HStack {
+                        Spacer()
+                        Button(action: {
+                            withAnimation {
+                                quotedMessage = nil
+                            }
+                        }, label: {
+                            DiscardButtonView()
+                        })
+                    }
+                }
+                .frame(height: 32)
+            }
+            
             HStack(alignment: .bottom) {
                 factory.makeLeadingComposerView(state: $viewModel.pickerTypeState)
 
@@ -44,13 +67,15 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
                     addedAssets: viewModel.addedAssets,
                     addedFileURLs: viewModel.addedFileURLs,
                     addedCustomAttachments: viewModel.addedCustomAttachments,
+                    quotedMessage: $quotedMessage,
                     onCustomAttachmentTap: viewModel.customAttachmentTapped(_:),
                     shouldScroll: viewModel.inputComposerShouldScroll,
                     removeAttachmentWithId: viewModel.removeAttachment(with:)
                 )
 
                 factory.makeTrailingComposerView(enabled: viewModel.sendButtonEnabled) {
-                    viewModel.sendMessage {
+                    viewModel.sendMessage(quotedMessage: quotedMessage) {
+                        quotedMessage = nil
                         onMessageSent()
                     }
                 }
@@ -109,8 +134,8 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
     var addedAssets: [AddedAsset]
     var addedFileURLs: [URL]
     var addedCustomAttachments: [CustomAttachment]
+    var quotedMessage: Binding<ChatMessage?>
     var onCustomAttachmentTap: (CustomAttachment) -> Void
-    
     var removeAttachmentWithId: (String) -> Void
 
     @State var textHeight: CGFloat = 34
@@ -132,6 +157,14 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
 
     public var body: some View {
         VStack {
+            if let quotedMessage = quotedMessage.wrappedValue {
+                QuotedMessageViewContainer(
+                    quotedMessage: quotedMessage,
+                    fillAvailableSpace: true,
+                    forceLeftToRight: true
+                )
+            }
+            
             if !addedAssets.isEmpty {
                 AddedImageAttachmentsView(
                     images: addedAssets,

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -8,6 +8,8 @@ import SwiftUI
 
 /// View model for the `MessageComposerView`.
 public class MessageComposerViewModel: ObservableObject {
+    @Injected(\.chatClient) private var chatClient
+    
     @Published var pickerState: AttachmentPickerState = .photos {
         didSet {
             if pickerState == .camera {
@@ -85,7 +87,10 @@ public class MessageComposerViewModel: ObservableObject {
         self.messageController = messageController
     }
 
-    public func sendMessage(completion: @escaping () -> Void) {
+    public func sendMessage(
+        quotedMessage: ChatMessage?,
+        completion: @escaping () -> Void
+    ) {
         do {
             var attachments = try addedAssets.map { added in
                 try AnyAttachmentPayload(
@@ -107,7 +112,8 @@ public class MessageComposerViewModel: ObservableObject {
                 messageController.createNewReply(
                     text: text,
                     attachments: attachments,
-                    showReplyInChannel: showReplyInChannel
+                    showReplyInChannel: showReplyInChannel,
+                    quotedMessageId: quotedMessage?.id
                 ) { [weak self] in
                     switch $0 {
                     case .success:
@@ -119,7 +125,8 @@ public class MessageComposerViewModel: ObservableObject {
             } else {
                 channelController.createNewMessage(
                     text: text,
-                    attachments: attachments
+                    attachments: attachments,
+                    quotedMessageId: quotedMessage?.id
                 ) { [weak self] in
                     switch $0 {
                     case .success:

Sources/StreamChatSwiftUI/ChatChannel/MessageList/FileAttachmentView.swift

@@ -15,7 +15,7 @@ public struct FileAttachmentsContainer: View {
             if let quotedMessage = message.quotedMessage {
                 QuotedMessageViewContainer(
                     quotedMessage: quotedMessage,
-                    message: message
+                    fillAvailableSpace: !message.attachmentCounts.isEmpty
                 )
             }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/GiphyAttachmentView.swift

@@ -21,7 +21,7 @@ public struct GiphyAttachmentView: View {
             if let quotedMessage = message.quotedMessage {
                 QuotedMessageViewContainer(
                     quotedMessage: quotedMessage,
-                    message: message
+                    fillAvailableSpace: !message.attachmentCounts.isEmpty
                 )
             }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift

@@ -22,7 +22,7 @@ public struct ImageAttachmentContainer: View {
             if let quotedMessage = message.quotedMessage {
                 QuotedMessageViewContainer(
                     quotedMessage: quotedMessage,
-                    message: message
+                    fillAvailableSpace: !message.attachmentCounts.isEmpty
                 )
             }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/LinkAttachmentView.swift

@@ -26,7 +26,7 @@ public struct LinkAttachmentContainer: View {
             if let quotedMessage = message.quotedMessage {
                 QuotedMessageViewContainer(
                     quotedMessage: quotedMessage,
-                    message: message
+                    fillAvailableSpace: !message.attachmentCounts.isEmpty
                 )
             }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageBubble.swift

@@ -13,6 +13,7 @@ public struct MessageBubbleModifier: ViewModifier {
     var isFirst: Bool
     var injectedBackgroundColor: UIColor?
     var cornerRadius: CGFloat = 18
+    var forceLeftToRight = false
 
     public func body(content: Content) -> some View {
         content
@@ -30,7 +31,7 @@ public struct MessageBubbleModifier: ViewModifier {
             return [.topLeft, .topRight, .bottomLeft, .bottomRight]
         }
 
-        if message.isSentByCurrentUser {
+        if message.isSentByCurrentUser && !forceLeftToRight {
             return [.topLeft, .topRight, .bottomLeft]
         } else {
             return [.topLeft, .topRight, .bottomRight]
@@ -110,14 +111,16 @@ extension View {
         for message: ChatMessage,
         isFirst: Bool,
         backgroundColor: UIColor? = nil,
-        cornerRadius: CGFloat = 18
+        cornerRadius: CGFloat = 18,
+        forceLeftToRight: Bool = false
     ) -> some View {
         modifier(
             MessageBubbleModifier(
                 message: message,
                 isFirst: isFirst,
                 injectedBackgroundColor: backgroundColor,
-                cornerRadius: cornerRadius
+                cornerRadius: cornerRadius,
+                forceLeftToRight: forceLeftToRight
             )
         )
     }