Merge pull request #1230 from WalletConnect/feature/tabbar-ui

[Sample] Tabbar redesign

Example/DApp/Modules/Main/MainViewController.swift

@@ -21,8 +21,6 @@ final class MainViewController: UITabBarController {
     }
 
     private func setupTabs() {
-        tabBar.unselectedItemTintColor = .white
-
         let viewControllers = presenter.viewControllers
 
         for (index, viewController) in viewControllers.enumerated() {

Example/WalletApp/ApplicationLayer/Configurator/AppearanceConfigurator.swift

@@ -3,6 +3,6 @@ import UIKit
 struct AppearanceConfigurator: Configurator {
 
     func configure() {
-
+        
     }
 }

Example/WalletApp/Other/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,6 +1,33 @@
 {
   "colors" : [
     {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.078",
+          "green" : "0.078",
+          "red" : "0.078"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
       "idiom" : "universal"
     }
   ],

Example/WalletApp/Other/Assets.xcassets/connections_tab.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "connections_tab.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Example/WalletApp/Other/Assets.xcassets/inbox_tab.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "inbox_tab.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Example/WalletApp/Other/Assets.xcassets/settings_tab.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "settings_tab.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Example/WalletApp/PresentationLayer/Wallet/Main/MainPresenter.swift

@@ -17,7 +17,6 @@ final class MainPresenter {
         return [
             router.walletViewController(importAccount: importAccount),
             router.notificationsViewController(importAccount: importAccount),
-            router.browserViewController(),
             router.settingsViewController()
         ]
     }

Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift

@@ -27,11 +27,6 @@ final class MainRouter {
             .wrapToNavigationController()
     }
 
-    func browserViewController() -> UIViewController {
-        return BrowserModule.create(app: app)
-            .wrapToNavigationController()
-    }
-
     func present(proposal: Session.Proposal, importAccount: ImportAccount, context: VerifyContext?) {
         SessionProposalModule.create(app: app, importAccount: importAccount, proposal: proposal, context: context)
             .presentFullScreen(from: viewController, transparentBackground: true)

Example/WalletApp/PresentationLayer/Wallet/Main/Model/TabPage.swift

@@ -3,32 +3,27 @@ import UIKit
 enum TabPage: CaseIterable {
     case wallet
     case notifications
-    case browser
     case settings
 
     var title: String {
         switch self {
         case .wallet:
-            return "Apps"
+            return "Connections"
         case .notifications:
-            return "Notifications"
+            return "Inbox"
         case .settings:
             return "Settings"
-        case .browser:
-            return "Browser"
         }
     }
 
     var icon: UIImage {
         switch self {
         case .wallet:
-            return UIImage(systemName: "house.fill")!
+            return UIImage(named: "connections_tab")!
         case .notifications:
-            return UIImage(systemName: "bell.fill")!
-        case .browser:
-            return UIImage(systemName: "network")!
+            return UIImage(named: "inbox_tab")!
         case .settings:
-            return UIImage(systemName: "gearshape.fill")!
+            return UIImage(named: "settings_tab")!
         }
     }
 
@@ -37,6 +32,6 @@ enum TabPage: CaseIterable {
     }
 
     static var enabledTabs: [TabPage] {
-        return [.wallet, .notifications, .browser, .settings]
+        return [.wallet, .notifications, .settings]
     }
 }

Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsRouter.swift

@@ -12,7 +12,8 @@ final class NotificationsRouter {
     }
 
     func presentNotifications(subscription: NotifySubscription) {
-        SubscriptionModule.create(app: app, subscription: subscription)
-            .push(from: viewController)
+        let module = SubscriptionModule.create(app: app, subscription: subscription)
+        module.hidesBottomBarWhenPushed = true
+        module.push(from: viewController)
     }
 }

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsPresenter.swift

@@ -38,6 +38,10 @@ final class SettingsPresenter: ObservableObject {
         return deviceToken
     }
 
+    func browserPressed() {
+        router.presentBrowser()
+    }
+
     func logoutPressed() async throws {
         guard let account = accountStorage.importAccount?.account else { return }
         try await interactor.notifyUnregister(account: account)

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsRouter.swift

@@ -13,4 +13,9 @@ final class SettingsRouter {
     @MainActor func presentWelcome() async {
         WelcomeModule.create(app: app).present()
     }
+
+    func presentBrowser() {
+        BrowserModule.create(app: app)
+            .push(from: viewController)
+    }
 }

Example/WalletApp/PresentationLayer/Wallet/Settings/SettingsView.swift

@@ -19,6 +19,15 @@ struct SettingsView: View {
                 row(title: "Device Token", subtitle: viewModel.deviceToken)
             }
 
+            Section {
+                Button {
+                    viewModel.browserPressed()
+                } label: {
+                    Text("Browser")
+                        .frame(maxWidth: .infinity)
+                }
+            }
+
             Section {
                 AsyncButton {
                     try await viewModel.logoutPressed()