Merge branch 'main' of https://github.com/GetStream/stream-chat-swiftui into feature/offline-mode-branch

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelScreen.swift

@@ -6,10 +6,10 @@ import StreamChat
 import SwiftUI
 
 /// Screen component for the chat channel view.
-struct ChatChannelScreen: View {
-    var chatChannelController: ChatChannelController
+public struct ChatChannelScreen: View {
+    public var chatChannelController: ChatChannelController
 
-    var body: some View {
+    public var body: some View {
         ChatChannelView(
             viewFactory: DefaultViewFactory.shared,
             channelController: chatChannelController

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -133,6 +133,9 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     }
 
     public func handleMessageAppear(index: Int) {
+        if index >= messages.count {
+            return
+        }
         let message = messages[index]
         checkForNewMessages(index: index)
         if utils.messageListConfig.dateIndicatorPlacement == .overlay {
@@ -200,7 +203,6 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     }
 
     public func onViewAppear() {
-        reactionsShown = false
         isActive = true
         messages = channelDataSource.messages
     }
@@ -320,6 +322,10 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     }
 
     private func shouldAnimate(changes: [ListChange<ChatMessage>]) -> Bool {
+        if !utils.messageListConfig.messageDisplayOptions.animateChanges {
+            return false
+        }
+        
         for change in changes {
             switch change {
             case .insert(_, index: _),

Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerView.swift

@@ -38,13 +38,17 @@ public struct AttachmentPickerView<Factory: ViewFactory>: View {
             if selectedPickerState == .photos {
                 if let assets = photoLibraryAssets,
                    let collection = PHFetchResultCollection(fetchResult: assets) {
-                    viewFactory.makePhotoAttachmentPickerView(
-                        assets: collection,
-                        onAssetTap: onAssetTap,
-                        isAssetSelected: isAssetSelected
-                    )
+                    if !collection.isEmpty {
+                        viewFactory.makePhotoAttachmentPickerView(
+                            assets: collection,
+                            onAssetTap: onAssetTap,
+                            isAssetSelected: isAssetSelected
+                        )
+                    } else {
+                        viewFactory.makeAssetsAccessPermissionView()
+                    }
                 } else {
-                    viewFactory.makeAssetsAccessPermissionView()
+                    LoadingView()
                 }
 
             } else if selectedPickerState == .files {

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -36,13 +36,17 @@ open class MessageComposerViewModel: ObservableObject {
     @Published public var text = "" {
         didSet {
             if text != "" {
+                checkTypingSuggestions()
                 if pickerTypeState != .collapsed {
-                    withAnimation {
+                    if composerCommand == nil {
+                        withAnimation {
+                            pickerTypeState = .collapsed
+                        }
+                    } else {
                         pickerTypeState = .collapsed
                     }
                 }
                 channelController.sendKeystrokeEvent()
-                checkTypingSuggestions()
             } else {
                 if composerCommand?.displayInfo?.isInstant == false {
                     composerCommand = nil
@@ -57,6 +61,10 @@ open class MessageComposerViewModel: ObservableObject {
 
     @Published public var addedFileURLs = [URL]() {
         didSet {
+            if totalAttachmentsCount > chatClient.config.maxAttachmentCountPerMessage
+                || !checkAttachmentSize(with: addedFileURLs.last) {
+                addedFileURLs.removeLast()
+            }
             checkPickerSelectionState()
         }
     }
@@ -138,6 +146,16 @@ open class MessageComposerViewModel: ObservableObject {
         }
     }
 
+    private var totalAttachmentsCount: Int {
+        addedAssets.count +
+            addedCustomAttachments.count +
+            addedFileURLs.count
+    }
+    
+    private var canAddAdditionalAttachments: Bool {
+        totalAttachmentsCount < chatClient.config.maxAttachmentCountPerMessage
+    }
+    
     public init(
         channelController: ChatChannelController,
         messageController: ChatMessageController?
@@ -286,7 +304,7 @@ open class MessageComposerViewModel: ObservableObject {
             }
         }
 
-        if !imageRemoved {
+        if !imageRemoved && canAddAttachment(with: addedAsset.url) {
             images.append(addedAsset)
         }
 
@@ -314,7 +332,9 @@ open class MessageComposerViewModel: ObservableObject {
     }
 
     public func cameraImageAdded(_ image: AddedAsset) {
-        addedAssets.append(image)
+        if canAddAttachment(with: image.url) {
+            addedAssets.append(image)
+        }
         pickerState = .photos
     }
 
@@ -339,7 +359,7 @@ open class MessageComposerViewModel: ObservableObject {
             }
         }
 
-        if !attachmentRemoved {
+        if !attachmentRemoved && canAddAdditionalAttachments {
             temp.append(attachment)
         }
 
@@ -363,12 +383,15 @@ open class MessageComposerViewModel: ObservableObject {
                 log.debug("Access to photos granted.")
                 let fetchOptions = PHFetchOptions()
                 fetchOptions.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
-                DispatchQueue.main.async { [unowned self] in
-                    self.imageAssets = PHAsset.fetchAssets(with: fetchOptions)
+                let assets = PHAsset.fetchAssets(with: fetchOptions)
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { [weak self] in
+                    self?.imageAssets = assets
                 }
             case .denied, .restricted:
+                self.imageAssets = PHFetchResult<PHAsset>()
                 log.debug("Access to photos is denied, showing the no permissions screen.")
             case .notDetermined:
+                self.imageAssets = PHFetchResult<PHAsset>()
                 log.debug("Access to photos is still not determined.")
             @unknown default:
                 log.debug("Unknown authorization status.")
@@ -504,4 +527,25 @@ open class MessageComposerViewModel: ObservableObject {
             self?.text = ""
         }
     }
+    
+    private func canAddAttachment(with url: URL) -> Bool {
+        if !canAddAdditionalAttachments {
+            return false
+        }
+        
+        return checkAttachmentSize(with: url)
+    }
+    
+    private func checkAttachmentSize(with url: URL?) -> Bool {
+        guard let url = url else { return true }
+        
+        _ = url.startAccessingSecurityScopedResource()
+        
+        do {
+            let fileSize = try AttachmentFile(url: url).size
+            return fileSize < chatClient.config.maxAttachmentSize
+        } catch {
+            return false
+        }
+    }
 }

Sources/StreamChatSwiftUI/ChatChannel/Composer/PhotoAssetsUtils.swift

@@ -3,10 +3,14 @@
 //
 
 import Photos
+import StreamChat
 import SwiftUI
 
 /// Helper class that loads assets from the photo library.
 public class PhotoAssetLoader: NSObject, ObservableObject {
+    
+    @Injected(\.chatClient) private var chatClient
+
     @Published var loadedImages = [String: UIImage]()
 
     /// Loads an image from the provided asset.
@@ -30,6 +34,57 @@ public class PhotoAssetLoader: NSObject, ObservableObject {
         }
     }
 
+    func compressAsset(at url: URL, type: AssetType, completion: @escaping (URL?) -> Void) {
+        if type == .video {
+            let compressedURL = NSURL.fileURL(withPath: NSTemporaryDirectory() + UUID().uuidString + ".mp4")
+            compressVideo(inputURL: url, outputURL: compressedURL) { exportSession in
+                guard let session = exportSession else {
+                    return
+                }
+
+                switch session.status {
+                case .completed:
+                    completion(compressedURL)
+                default:
+                    completion(nil)
+                }
+            }
+        }
+    }
+    
+    func assetExceedsAllowedSize(url: URL?) -> Bool {
+        _ = url?.startAccessingSecurityScopedResource()
+        if let assetURL = url,
+           let file = try? AttachmentFile(url: assetURL),
+           file.size >= chatClient.config.maxAttachmentSize {
+            return true
+        } else {
+            return false
+        }
+    }
+    
+    private func compressVideo(
+        inputURL: URL,
+        outputURL: URL,
+        handler: @escaping (_ exportSession: AVAssetExportSession?) -> Void
+    ) {
+        let urlAsset = AVURLAsset(url: inputURL, options: nil)
+        
+        guard let exportSession = AVAssetExportSession(
+            asset: urlAsset,
+            presetName: AVAssetExportPresetMediumQuality
+        ) else {
+            handler(nil)
+            return
+        }
+
+        exportSession.outputURL = outputURL
+        exportSession.outputFileType = .mp4
+        exportSession.exportAsynchronously {
+            handler(exportSession)
+        }
+    }
+    
     /// Clears the cache when there's memory warning.
     func didReceiveMemoryWarning() {
         loadedImages = [String: UIImage]()

Sources/StreamChatSwiftUI/ChatChannel/Composer/PhotoAttachmentPickerView.swift

@@ -43,12 +43,17 @@ public struct PhotoAttachmentCell: View {
 
     @StateObject var assetLoader: PhotoAssetLoader
 
-    @State var assetURL: URL?
+    @State private var assetURL: URL?
+    @State private var compressing = false
 
     var asset: PHAsset
     var onImageTap: (AddedAsset) -> Void
     var imageSelected: (String) -> Bool
 
+    private var assetType: AssetType {
+        asset.mediaType == .video ? .video : .image
+    }
+    
     public var body: some View {
         ZStack {
             if let image = assetLoader.loadedImages[asset.localIdentifier] {
@@ -75,14 +80,17 @@ public struct PhotoAttachmentCell: View {
                                                 image: image,
                                                 id: asset.localIdentifier,
                                                 url: assetURL,
-                                                type: asset.mediaType == .video ? .video : .image,
+                                                type: assetType,
                                                 extraData: asset.mediaType == .video ? ["duration": asset.durationString] : [:]
                                             )
                                         )
                                     }
                                 }
                             }
                     }
+                    .overlay(
+                        compressing ? ProgressView() : nil
+                    )
                 }
             } else {
                 Color(colors.background1)
@@ -117,12 +125,26 @@ public struct PhotoAttachmentCell: View {
         )
         .onAppear {
             assetLoader.loadImage(from: asset)
+            
+            if self.assetURL != nil {
+                return
+            }
+            
             asset.requestContentEditingInput(with: nil) { input, _ in
                 if asset.mediaType == .image {
                     self.assetURL = input?.fullSizeImageURL
                 } else if let url = (input?.audiovisualAsset as? AVURLAsset)?.url {
                     self.assetURL = url
                 }
+                
+                // Check file size.
+                if let assetURL = assetURL, assetLoader.assetExceedsAllowedSize(url: assetURL) {
+                    compressing = true
+                    assetLoader.compressAsset(at: assetURL, type: assetType) { url in
+                        self.assetURL = url
+                        self.compressing = false
+                    }
+                }
             }
         }
     }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListConfig.swift

@@ -60,10 +60,16 @@ public struct MessageDisplayOptions {
 
     let showAvatars: Bool
     let showMessageDate: Bool
+    let animateChanges: Bool
 
-    public init(showAvatars: Bool = true, showMessageDate: Bool = true) {
+    public init(
+        showAvatars: Bool = true,
+        showMessageDate: Bool = true,
+        animateChanges: Bool = true
+    ) {
         self.showAvatars = showAvatars
         self.showMessageDate = showMessageDate
+        self.animateChanges = animateChanges
     }
 }
 

Sources/StreamChatSwiftUI/ColorPalette.swift

@@ -26,7 +26,7 @@ public struct ColorPalette {
     // MARK: - Text interactions
 
     public var highlightedColorForColor: (UIColor) -> UIColor = { $0.withAlphaComponent(0.5) }
-    public var disabledColorForColor: (UIColor) -> UIColor = { _ in .lightGray }
+    public var disabledColorForColor: (UIColor) -> UIColor = { _ in .streamDisabled }
     public var unselectedColorForColor: (UIColor) -> UIColor = { _ in .lightGray }
 
     // MARK: - Background
@@ -94,6 +94,7 @@ private extension UIColor {
     static let streamGrayDisabledText = mode(0x72767e, 0x72767e)
     static let streamInnerBorder = mode(0xdbdde1, 0x272a30)
     static let streamHighlight = mode(0xfbf4dd, 0x333024)
+    static let streamDisabled = mode(0xb4b7bb, 0x4c525c)
 
     // Currently we are not using the correct shadow color from figma's color palette. This is to avoid
     // an issue with snapshots inconsistency between Intel vs M1. We can't use shadows with transparency.