Merge branch 'develop' into leave-channel-permissions

Author: nuno-vieira

.github/workflows/testflight.yml

@@ -0,0 +1,44 @@
+name: Test Flight Deploy DemoApp
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+
+  release:
+    types: [published]
+
+  workflow_dispatch:
+
+env:
+  HOMEBREW_NO_INSTALL_CLEANUP: 1
+
+jobs:
+  deploy:
+    runs-on: macos-14
+    steps:
+    - name: Connect Bot
+      uses: webfactory/[email protected]
+      with:
+        ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
+    - uses: actions/[email protected]
+      with:
+        fetch-depth: 0
+    - uses: ./.github/actions/ruby-cache
+    - uses: ./.github/actions/xcode-cache
+    - name: Deploy Demo app
+      env:
+        MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_PR_NUM: ${{ github.event.number }}
+      run: bundle exec fastlane swiftui_testflight_build
+    - uses: 8398a7/action-slack@v3
+      with:
+        status: ${{ job.status }}
+        text: "You shall not pass!"
+        fields: message,commit,author,action,workflow,job,took
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        MATRIX_CONTEXT: ${{ toJson(matrix) }}
+      if: failure()

CHANGELOG.md

@@ -3,7 +3,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
-### 🔄 Changed
+### ✅ Added
+- Add support for Channel Search in the Channel List [#628](https://github.com/GetStream/stream-chat-swiftui/pull/628)
+### 🐞 Fixed
+- Fix crash when opening message overlay in iPad with a TabBar [#627](https://github.com/GetStream/stream-chat-swiftui/pull/627)
 
 # [4.65.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.65.0)
 _October 18, 2024_

DemoAppSwiftUI/DemoAppSwiftUIApp.swift

@@ -18,7 +18,11 @@ struct DemoAppSwiftUIApp: App {
     var channelListController: ChatChannelListController? {
         appState.channelListController
     }
-    
+
+    var channelListSearchType: ChannelListSearchType {
+        .messages
+    }
+
     var body: some Scene {
         WindowGroup {
             switch appState.userState {
@@ -64,12 +68,14 @@ struct DemoAppSwiftUIApp: App {
             ChatChannelListView(
                 viewFactory: DemoAppFactory.shared,
                 channelListController: channelListController,
-                selectedChannelId: notificationsHandler.notificationChannelId
+                selectedChannelId: notificationsHandler.notificationChannelId,
+                searchType: channelListSearchType
             )
         } else {
             ChatChannelListView(
                 viewFactory: DemoAppFactory.shared,
-                channelListController: channelListController
+                channelListController: channelListController,
+                searchType: channelListSearchType
             )
         }
     }

Gemfile.lock

@@ -200,7 +200,7 @@ GEM
       fastlane
       pry
     fastlane-plugin-sonarcloud_metric_kit (0.2.1)
-    fastlane-plugin-stream_actions (0.3.70)
+    fastlane-plugin-stream_actions (0.3.71)
       xctest_list (= 1.2.1)
     fastlane-plugin-versioning (0.6.0)
     ffi (1.17.0)
@@ -427,7 +427,7 @@ DEPENDENCIES
   fastlane-plugin-create_xcframework
   fastlane-plugin-lizard
   fastlane-plugin-sonarcloud_metric_kit
-  fastlane-plugin-stream_actions (= 0.3.70)
+  fastlane-plugin-stream_actions (= 0.3.71)
   fastlane-plugin-versioning
   jazzy
   json

Sources/StreamChatSwiftUI/ChatChannel/Gallery/GalleryView.swift

@@ -153,20 +153,40 @@ public struct GalleryView: View {
 }
 
 struct StreamVideoPlayer: View {
-    
-    @State var player: AVPlayer
-    
+
+    @Injected(\.utils) private var utils
+
+    private var fileCDN: FileCDN {
+        utils.fileCDN
+    }
+
+    let url: URL
+
+    @State var avPlayer: AVPlayer?
+    @State var error: Error?
+
     init(url: URL) {
-        let player = AVPlayer(url: url)
-        _player = State(wrappedValue: player)
+        self.url = url
     }
 
     var body: some View {
-        VideoPlayer(player: player)
-            .clipped()
-            .onAppear {
-                try? AVAudioSession.sharedInstance().setCategory(.playback, options: [])
-                player.play()
+        VStack {
+            if let avPlayer {
+                VideoPlayer(player: avPlayer)
+                    .clipped()
+            }
+        }
+        .onAppear {
+            fileCDN.adjustedURL(for: url) { result in
+                switch result {
+                case let .success(url):
+                    self.avPlayer = AVPlayer(url: url)
+                    try? AVAudioSession.sharedInstance().setCategory(.playback, options: [])
+                    self.avPlayer?.play()
+                case let .failure(error):
+                    self.error = error
+                }
             }
+        }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/Gallery/VideoPlayerView.swift

@@ -12,12 +12,18 @@ public struct VideoPlayerView: View {
 
     @Injected(\.fonts) private var fonts
     @Injected(\.colors) private var colors
+    @Injected(\.utils) private var utils
+
+    private var fileCDN: FileCDN {
+        utils.fileCDN
+    }
 
     let attachment: ChatMessageVideoAttachment
     let author: ChatUser
     @Binding var isShown: Bool
 
-    private let avPlayer: AVPlayer
+    @State private var avPlayer: AVPlayer?
+    @State private var error: Error?
 
     public init(
         attachment: ChatMessageVideoAttachment,
@@ -26,7 +32,6 @@ public struct VideoPlayerView: View {
     ) {
         self.attachment = attachment
         self.author = author
-        avPlayer = AVPlayer(url: attachment.payload.videoURL)
         _isShown = isShown
     }
 
@@ -37,7 +42,9 @@ public struct VideoPlayerView: View {
                 subtitle: author.onlineText,
                 isShown: $isShown
             )
-            VideoPlayer(player: avPlayer)
+            if let avPlayer {
+                VideoPlayer(player: avPlayer)
+            }
             Spacer()
             HStack {
                 ShareButtonView(content: [attachment.payload.videoURL])
@@ -48,11 +55,19 @@ public struct VideoPlayerView: View {
             .foregroundColor(Color(colors.text))
         }
         .onAppear {
-            try? AVAudioSession.sharedInstance().setCategory(.playback, options: [])
-            avPlayer.play()
+            fileCDN.adjustedURL(for: attachment.payload.videoURL) { result in
+                switch result {
+                case let .success(url):
+                    self.avPlayer = AVPlayer(url: url)
+                    try? AVAudioSession.sharedInstance().setCategory(.playback, options: [])
+                    self.avPlayer?.play()
+                case let .failure(error):
+                    self.error = error
+                }
+            }
         }
         .onDisappear {
-            avPlayer.replaceCurrentItem(with: nil)
+            avPlayer?.replaceCurrentItem(with: nil)
         }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/FileAttachmentPreview.swift

@@ -18,7 +18,7 @@ public struct FileAttachmentPreview: View {
 
     var url: URL
 
-    @State var adjustedUrl: URL?
+    @State private var adjustedUrl: URL?
     @State private var isLoading = false
     @State private var title: String?
     @State private var error: Error?

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsOverlayView.swift

@@ -71,7 +71,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                         currentSnapshot: currentSnapshot,
                         popInAnimationInProgress: !popIn
                     )
-                    .offset(y: spacing > 0 ? screenHeight - currentSnapshot.size.height : 0)
+                    .offset(y: overlayOffsetY)
                 } else {
                     Color.gray.opacity(0.4)
                 }
@@ -290,7 +290,16 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
 
         return originY - spacing
     }
-    
+
+    private var overlayOffsetY: CGFloat {
+        if isIPad && UITabBar.appearance().isHidden == false {
+            // When using iPad with TabBar, this hard coded value makes
+            // sure that the overlay is in the correct position.
+            return 20
+        }
+        return spacing > 0 ? screenHeight - currentSnapshot.size.height : 0
+    }
+
     private var spacing: CGFloat {
         let divider: CGFloat = isIPad ? 2 : 1
         let spacing = (UIScreen.main.bounds.height - screenHeight) / divider

Sources/StreamChatSwiftUI/ChatChannel/Utils/ChatChannelHelpers.swift

@@ -82,6 +82,9 @@ public struct BottomLeftView<Content: View>: View {
 
 /// Returns the top most view controller.
 func topVC() -> UIViewController? {
+    // TODO: Refactor ReactionsOverlayView to use a background blur, instead of a snapshot.
+    /// Since the current approach is too error-prone and dependent of the app's hierarchy,
+
     let keyWindow = UIApplication.shared.windows.filter { $0.isKeyWindow }.first
 
     if var topController = keyWindow?.rootViewController {
@@ -92,10 +95,16 @@ func topVC() -> UIViewController? {
         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]
+                if let splitVC = children[0] as? UISplitViewController,
+                   let contentVC = splitVC.viewControllers.last {
+                    topController = contentVC
+                    return topController
+                } else if let tabVC = children[0] as? UITabBarController,
+                          let selectedVC = tabVC.selectedViewController {
+                    // If the selectedVC is split view, we need to grab the content view of it
+                    // other wise, the selectedVC is already the content view.
+                    let selectedContentVC = selectedVC.children.first?.children.last?.children.first
+                    topController = selectedContentVC ?? selectedVC
                     return topController
                 }
             }

Sources/StreamChatSwiftUI/ChatChannelList/ChannelHeaderLoader.swift

@@ -82,7 +82,7 @@ open class ChannelHeaderLoader: ObservableObject {
         }
     }
 
-    func channelAvatarChanged(_ cid: ChannelId?) -> AnyPublisher<Void, Never> {
+    open func channelAvatarChanged(_ cid: ChannelId?) -> AnyPublisher<Void, Never> {
         didLoadImage
             .filter { $0 == cid }
             .map { _ in () }