feat: navigation overhaul - WPB-6647

WireUI/Sources/WireDesign/Colors/SemanticColors.swift

@@ -134,7 +134,6 @@ public enum SemanticColors {
         public static let backgroundSeparatorCell = UIColor(light: .gray40, dark: .gray90)
         public static let backgroundSeparatorEditView = UIColor(light: .gray60, dark: .gray70)
         public static let backgroundConversationList = UIColor(light: .gray20, dark: .gray100)
-        public static let backgroundConversationListTableViewCell = UIColor(light: .white, dark: .gray95)
         public static let borderConversationListTableViewCell = UIColor(light: .gray40, dark: .gray90)
         public static let backgroundCollectionCell = UIColor(light: .white, dark: .gray90)
         public static let borderCollectionCell = UIColor(light: .gray30, dark: .gray80)

WireUI/Sources/WireMainNavigationUI/Containers/MainTabBarController.swift

@@ -39,11 +39,6 @@ public final class MainTabBarController<
         set { setConversationListUI(newValue, animated: false) }
     }
 
-    public var foldersUI: UIViewController? {
-        get { _foldersUI }
-        set { setFoldersUI(newValue, animated: false) }
-    }
-
     public var archiveUI: ArchiveUI? {
         get { _archiveUI }
         set { setArchiveUI(newValue, animated: false) }
@@ -71,14 +66,11 @@ public final class MainTabBarController<
 
     // MARK: - Private Properties
 
-    private weak var contactsNavigationController: UINavigationController!
     private weak var conversationListNavigationController: UINavigationController!
-    private weak var foldersNavigationController: UINavigationController!
     private weak var archiveNavigationController: UINavigationController!
-    private /* weak */ var settingsNavigationController: UINavigationController! // TODO: [WPB-6647] make this property weak as well
+    private weak var settingsNavigationController: UINavigationController!
 
     private weak var _conversationListUI: ConversationListUI?
-    private weak var _foldersUI: UIViewController?
     private weak var _archiveUI: ArchiveUI?
     private weak var _settingsUI: SettingsUI?
     private weak var _conversationUI: ConversationUI?
@@ -98,42 +90,23 @@ public final class MainTabBarController<
     }
 
     private func setupTabs() {
-        let contactsNavigationController = UINavigationController()
-        self.contactsNavigationController = contactsNavigationController
-
         let conversationListNavigationController = UINavigationController()
         self.conversationListNavigationController = conversationListNavigationController
 
-        let foldersNavigationController = UINavigationController()
-        self.foldersNavigationController = foldersNavigationController
-
         let archiveNavigationController = UINavigationController()
         self.archiveNavigationController = archiveNavigationController
 
         let settingsNavigationController = UINavigationController()
         self.settingsNavigationController = settingsNavigationController
 
         viewControllers = [
-            contactsNavigationController,
             conversationListNavigationController,
-            foldersNavigationController,
             archiveNavigationController,
             settingsNavigationController
         ]
 
         for content in MainTabBarControllerContent.allCases {
             switch content {
-            case .contacts:
-                let tabBarItem = UITabBarItem(
-                    title: String(localized: "tabBar.contacts.title", bundle: .module),
-                    image: .init(systemName: "person"),
-                    selectedImage: .init(systemName: "person.fill")
-                )
-                tabBarItem.accessibilityIdentifier = "bottomBarPlusButton"
-                tabBarItem.accessibilityLabel = String(localized: "tabBar.contacts.description", bundle: .module)
-                tabBarItem.accessibilityHint = String(localized: "tabBar.contacts.hint", bundle: .module)
-                contactsNavigationController.tabBarItem = tabBarItem
-
             case .conversations:
                 let tabBarItem = UITabBarItem(
                     title: String(localized: "tabBar.conversations.title", bundle: .module),
@@ -145,17 +118,6 @@ public final class MainTabBarController<
                 tabBarItem.accessibilityHint = String(localized: "tabBar.conversations.hint", bundle: .module)
                 conversationListNavigationController.tabBarItem = tabBarItem
 
-            case .folders:
-                let tabBarItem = UITabBarItem(
-                    title: String(localized: "tabBar.folders.title", bundle: .module),
-                    image: .init(systemName: "folder"),
-                    selectedImage: .init(systemName: "folder.fill")
-                )
-                tabBarItem.accessibilityIdentifier = "bottomBarFolderListButton"
-                tabBarItem.accessibilityLabel = String(localized: "tabBar.folders.description", bundle: .module)
-                tabBarItem.accessibilityHint = String(localized: "tabBar.folders.hint", bundle: .module)
-                foldersNavigationController.tabBarItem = tabBarItem
-
             case .archive:
                 let tabBarItem = UITabBarItem(
                     title: String(localized: "tabBar.archived.title", bundle: .module),
@@ -180,7 +142,6 @@ public final class MainTabBarController<
                 settingsNavigationController.tabBarItem = tabBarItem
             }
         }
-        viewControllers?.removeLast() // this line will be removed with navigation overhaul
         selectedContent = .conversations
     }
 
@@ -214,14 +175,6 @@ public final class MainTabBarController<
         conversationListNavigationController.view.layoutIfNeeded()
     }
 
-    private func setFoldersUI(_ foldersUI: UIViewController?, animated: Bool) {
-        _foldersUI = foldersUI
-
-        let viewControllers = [foldersUI].compactMap { $0 }
-        foldersNavigationController.setViewControllers(viewControllers, animated: animated)
-        foldersNavigationController.view.layoutIfNeeded()
-    }
-
     private func setArchiveUI(_ archiveUI: ArchiveUI?, animated: Bool) {
         _archiveUI = archiveUI
 

WireUI/Sources/WireMainNavigationUI/Coordinator/MainCoordinator.swift

@@ -457,9 +457,6 @@ public final class MainCoordinator<Dependencies>: NSObject, MainCoordinatorProto
 
         case .settings:
             sidebar.selectedMenuItem = .init(.settings)
-
-        case .contacts, .folders:
-            break
         }
     }
 

WireUI/Sources/WireMainNavigationUI/Models/MainTabBarControllerContent.swift

@@ -19,8 +19,5 @@
 /// The type of tabs of the main tab bar controller shows.
 /// Since UIKit has a type `UITab` this type has been suffixed with "Content".
 public enum MainTabBarControllerContent: Int, CaseIterable {
-    case contacts // will be removed in navigation overhaul
-    case conversations
-    case folders // will be removed in navigation overhaul
-    case archive, settings
+    case conversations, archive, settings
 }

WireUI/Sources/WireMainNavigationUI/Protocols/Coordinator/MainCoordinatorProtocol.swift

@@ -46,6 +46,13 @@ public protocol MainCoordinatorProtocol: AnyObject {
     @MainActor
     func hideSettingsContent()
 
+    @MainActor
+    func presentViewController(_ viewController: UIViewController) async
+    @MainActor
+    func dismissPresentedViewController() async
+
+    // TODO: [WPB-11651] Move theses methods out of the protocol. The `presentViewController(_:)` method should be used.
+
     @MainActor
     func showSelfProfile() async
     @MainActor
@@ -54,9 +61,4 @@ public protocol MainCoordinatorProtocol: AnyObject {
     func showConnect() async
     @MainActor
     func showCreateGroupConversation() async
-
-    @MainActor
-    func presentViewController(_ viewController: UIViewController) async
-    @MainActor
-    func dismissPresentedViewController() async
 }