[SWU-72] Implemented message search

Author: martinmitrevski

CHANGELOG.md

@@ -3,7 +3,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### ✅ Added
+- Pinning of a message
+- Display users who reacted to a message
+- Message Search
+- Customization of channel list separators
+
+### 🐞 Fixed
+- Bug with image attachments selection and display
+- Reactions issues on iPad
+
 ### 🔄 Changed
+- Creation method of channel destination
 
 # [4.8.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.8.0)
 _January 18, 2022_

DemoAppSwiftUI/iMessagePocView.swift

@@ -50,7 +50,7 @@ struct iMessagePocView: View {
                     onlineIndicatorShown: viewModel.onlineIndicatorShown(for:),
                     imageLoader: channelHeaderLoader.image(for:),
                     onItemTap: { channel in
-                        viewModel.selectedChannel = channel
+                        viewModel.selectedChannel = ChannelSelectionInfo(channel: channel, message: nil)
                     },
                     onItemAppear: viewModel.checkForChannels(index:),
                     channelNaming: viewModel.name(forChannel:),

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -18,12 +18,14 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
     public init(
         viewFactory: Factory,
         channelController: ChatChannelController,
-        messageController: ChatMessageController? = nil
+        messageController: ChatMessageController? = nil,
+        scrollToMessage: ChatMessage? = nil
     ) {
         _viewModel = StateObject(
             wrappedValue: ViewModelsFactory.makeChannelViewModel(
                 with: channelController,
-                messageController: messageController
+                messageController: messageController,
+                scrollToMessage: scrollToMessage
             )
         )
         factory = viewFactory

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -108,7 +108,8 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
     public init(
         channelController: ChatChannelController,
-        messageController: ChatMessageController? = nil
+        messageController: ChatMessageController? = nil,
+        scrollToMessage: ChatMessage? = nil
     ) {
         self.channelController = channelController
         channelController.synchronize()
@@ -125,6 +126,10 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
         channelDataSource.delegate = self
         messages = channelDataSource.messages
 
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+            self?.scrolledId = scrollToMessage?.messageId
+        }
+              
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(didReceiveMemoryWarning),
@@ -177,7 +182,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
             listId = UUID().uuidString
         }
 
-        if !showScrollToLatestButton {
+        if !showScrollToLatestButton && scrolledId == nil {
             scrollToLastMessage()
         }
     }
@@ -238,20 +243,6 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
         }
     }
 
-    private func topVC() -> UIViewController? {
-        let keyWindow = UIApplication.shared.windows.filter { $0.isKeyWindow }.first
-        
-        if var topController = keyWindow?.rootViewController {
-            while let presentedViewController = topController.presentedViewController {
-                topController = presentedViewController
-            }
-            
-            return topController
-        }
-        
-        return nil
-    }
-    
     private func save(lastDate: Date) {
         currentDate = lastDate
         timer?.invalidate()

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -166,10 +166,14 @@ struct MessageContainerView<Factory: ViewFactory>: View {
         .padding(.horizontal, paddingValue)
         .padding(.bottom, showsAllInfo || isMessagePinned ? paddingValue : 2)
         .padding(.top, isLast ? paddingValue : 0)
-        .background(isMessagePinned ? Color(colors.pinnedBackground) : nil)
+        .background(isMessagePinned || shouldAnimateBackground ? Color(colors.pinnedBackground) : nil)
         .padding(.bottom, isMessagePinned ? paddingValue / 2 : 0)
     }
 
+    private var shouldAnimateBackground: Bool {
+        scrolledId == message.messageId
+    }
+    
     private var isMessagePinned: Bool {
         message.pinDetails != nil
     }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -110,7 +110,13 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                 .frame(minWidth: self.width, minHeight: height)
                 .onChange(of: scrolledId) { scrolledId in
                     if let scrolledId = scrolledId {
-                        self.scrolledId = nil
+                        if scrolledId == messages.first?.messageId {
+                            self.scrolledId = nil
+                        } else {
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
+                                self.scrolledId = nil
+                            }
+                        }
                         withAnimation {
                             scrollView.scrollTo(scrolledId, anchor: .bottom)
                         }

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsOverlayView.swift

@@ -81,7 +81,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                         scrolledId: .constant(nil)
                     )
                     .offset(
-                        x: messageDisplayInfo.frame.origin.x
+                        x: messageDisplayInfo.frame.origin.x - diffWidth
                     )
                     .overlay(
                         channel.config.reactionsEnabled ?
@@ -94,7 +94,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                                 }
                             )
                             .offset(
-                                x: messageDisplayInfo.frame.origin.x,
+                                x: messageDisplayInfo.frame.origin.x - diffWidth,
                                 y: -24
                             )
                             : nil
@@ -148,6 +148,16 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
         }
     }
 
+    private var diffWidth: CGFloat {
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            let screenWidth = UIScreen.main.bounds.size.width
+            let viewWidth = topVC()?.view.frame.width ?? 0
+            return screenWidth - viewWidth
+        } else {
+            return 0
+        }
+    }
+    
     private var originY: CGFloat {
         let bottomPopupOffset =
             messageDisplayInfo.showsMessageActions ? messageActionsSize : userReactionsPopupHeight
@@ -160,7 +170,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
         } else if originY > maxOrigin {
             originY = maxOrigin
         }
-        
+                
         return originY
     }
 

Sources/StreamChatSwiftUI/ChatChannel/Utils/ChatChannelHelpers.swift

@@ -75,3 +75,30 @@ public struct BottomLeftView<Content: View>: View {
         }
     }
 }
+
+/// Returns the top most view controller.
+func topVC() -> UIViewController? {
+    let keyWindow = UIApplication.shared.windows.filter { $0.isKeyWindow }.first
+    
+    if var topController = keyWindow?.rootViewController {
+        while let presentedViewController = topController.presentedViewController {
+            topController = presentedViewController
+        }
+        
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            let children = topController.children
+            if !children.isEmpty {
+                let splitVC = children[0]
+                let sideVCs = splitVC.children
+                if sideVCs.count > 1 {
+                    topController = sideVCs[1]
+                    return topController
+                }
+            }
+        }
+        
+        return topController
+    }
+    
+    return nil
+}

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelDeepLink.swift

@@ -7,12 +7,12 @@ import SwiftUI
 
 /// View providing support for deeplinking.
 public struct ChannelDeepLink<ChannelDestination: View>: View {
-    private var channelDestination: (ChatChannel) -> ChannelDestination
-    @Binding var deeplinkChannel: ChatChannel?
+    private var channelDestination: (ChannelSelectionInfo) -> ChannelDestination
+    @Binding var deeplinkChannel: ChannelSelectionInfo?
 
     public init(
-        deeplinkChannel: Binding<ChatChannel?>,
-        channelDestination: @escaping (ChatChannel) -> ChannelDestination
+        deeplinkChannel: Binding<ChannelSelectionInfo?>,
+        channelDestination: @escaping (ChannelSelectionInfo) -> ChannelDestination
     ) {
         self.channelDestination = channelDestination
         _deeplinkChannel = deeplinkChannel

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelHelperViews.swift

@@ -55,6 +55,21 @@ public struct AvatarView: View {
     }
 }
 
+struct ChatTitleView: View {
+    
+    @Injected(\.fonts) private var fonts
+    @Injected(\.colors) private var colors
+    
+    var name: String
+    
+    var body: some View {
+        Text(name)
+            .lineLimit(1)
+            .font(fonts.bodyBold)
+            .foregroundColor(Color(colors.text))
+    }
+}
+
 extension CGSize {
     /// Default size of the avatar used in the channel list.
     public static var defaultAvatarSize: CGSize = CGSize(width: 48, height: 48)