Improvements to the tab bar display flow

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelHelperViews.swift

@@ -112,35 +112,6 @@ struct TabBarAccessor: UIViewControllerRepresentable {
     }
 }
 
-struct NavigationControllerAccessor: UIViewControllerRepresentable {
-    var callback: (UINavigationController) -> Void
-    private let proxyController = ViewController()
-
-    func makeUIViewController(context: UIViewControllerRepresentableContext<NavigationControllerAccessor>) ->
-        UIViewController {
-        proxyController.callback = callback
-        return proxyController
-    }
-
-    func updateUIViewController(
-        _ uiViewController: UIViewController,
-        context: UIViewControllerRepresentableContext<NavigationControllerAccessor>
-    ) {}
-
-    typealias UIViewControllerType = UIViewController
-
-    private class ViewController: UIViewController {
-        var callback: (UINavigationController) -> Void = { _ in }
-
-        override func viewWillAppear(_ animated: Bool) {
-            super.viewWillAppear(animated)
-            if let navigationController = self.navigationController {
-                callback(navigationController)
-            }
-        }
-    }
-}
-
 var isIphone: Bool {
     UIDevice.current.userInterfaceIdiom == .phone
 }

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift

@@ -161,9 +161,6 @@ public struct ChatChannelListContentView<Factory: ViewFactory>: View {
     @ObservedObject private var viewModel: ChatChannelListViewModel
     @StateObject private var channelHeaderLoader = ChannelHeaderLoader()
     private var onItemTap: (ChatChannel) -> Void
-    // We have to drop back to UIKit to get the number of pushed controllers.
-    // This is needed for controlling the tabbar visibility.
-    @State private var navigationController: UINavigationController?
 
     public init(
         viewFactory: Factory,
@@ -211,8 +208,7 @@ public struct ChatChannelListContentView<Factory: ViewFactory>: View {
                     imageLoader: channelHeaderLoader.image(for:),
                     onItemTap: onItemTap,
                     onItemAppear: { index in
-                        let pushedScreens = navigationController?.viewControllers.count ?? 0
-                        viewModel.checkTabBarAppearance(numberOfScreens: pushedScreens)
+                        viewModel.checkTabBarAppearance()
                         viewModel.checkForChannels(index: index)
                     },
                     channelNaming: viewModel.name(forChannel:),
@@ -225,12 +221,5 @@ public struct ChatChannelListContentView<Factory: ViewFactory>: View {
 
             viewFactory.makeChannelListStickyFooterView()
         }
-        .background(
-            Color.clear.background(
-                NavigationControllerAccessor { navController in
-                    self.navigationController = navController
-                }
-            )
-        )
     }
 }

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListViewModel.swift

@@ -48,9 +48,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
     @Published public var selectedChannel: ChannelSelectionInfo? {
         willSet {
             hideTabBar = newValue != nil
-        }
-        didSet {
-            if oldValue != nil && selectedChannel == nil {
+            if selectedChannel != nil && newValue == nil {
                 // pop happened, apply the queued changes.
                 if !queuedChannelsChanges.isEmpty {
                     channels = queuedChannelsChanges
@@ -59,7 +57,12 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
         }
     }
 
-    @Published public var deeplinkChannel: ChannelSelectionInfo?
+    @Published public var deeplinkChannel: ChannelSelectionInfo? {
+        willSet {
+            hideTabBar = newValue != nil
+        }
+    }
+
     @Published public var swipedChannelId: String?
     @Published public var channelAlertType: ChannelAlertType? {
         didSet {
@@ -219,18 +222,17 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
         channel.membership != nil
     }
 
-    func checkTabBarAppearance(numberOfScreens: Int) {
+    func checkTabBarAppearance() {
         guard #available(iOS 15, *) else { return }
-        let newValue = numberOfScreens > 1
-        if newValue != hideTabBar {
-            hideTabBar = newValue
+        if hideTabBar != false {
+            hideTabBar = false
         }
     }
 
     // MARK: - private
 
     private func handleChannelListChanges(_ controller: ChatChannelListController) {
-        if selectedChannel != nil || !searchText.isEmpty {
+        if selectedChannel != nil || !searchText.isEmpty || deeplinkChannel != nil {
             queuedChannelsChanges = controller.channels
         } else {
             channels = controller.channels
@@ -350,7 +352,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
     }
 
     private func handleChannelAppearance() {
-        if !queuedChannelsChanges.isEmpty {
+        if !queuedChannelsChanges.isEmpty && selectedChannel == nil && deeplinkChannel == nil {
             channels = queuedChannelsChanges
         }
     }

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelNavigatableListItem.swift

@@ -63,22 +63,31 @@ public struct ChatChannelNavigatableListItem<ChannelDestination: View>: View {
 
 /// Used for representing selection of an item in the channel list.
 /// The optional message is used in case we need to scroll to a particular one in the message list.
-public struct ChannelSelectionInfo: Identifiable, Hashable {
+public struct ChannelSelectionInfo: Identifiable {
 
-    public var id: String {
-        if let message = message {
-            return "\(channel.id)-\(message.id)"
-        } else {
-            return channel.id
-        }
-    }
-
+    public let id: String
     public let channel: ChatChannel
     public let message: ChatMessage?
 
     public init(channel: ChatChannel, message: ChatMessage?) {
         self.channel = channel
         self.message = message
+        if let message = message {
+            id = "\(channel.cid.id)-\(message.id)"
+        } else {
+            id = channel.name ?? channel.cid.id
+        }
+    }
+}
+
+extension ChannelSelectionInfo: Hashable, Equatable {
+    
+    public static func == (lhs: ChannelSelectionInfo, rhs: ChannelSelectionInfo) -> Bool {
+        lhs.id == rhs.id
+    }
+    
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
     }
 }