[Refactor] #239 - cleanup the code

Link-MIND · Jan 20, 2025 · ef8ae99 · ef8ae99
1 parent bb5865a
commit ef8ae99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/TOASTER-iOS/Application/Coordinator/Coordinators/TabBarCoordinator.swift b/TOASTER-iOS/Application/Coordinator/Coordinators/TabBarCoordinator.swift
@@ -52,7 +52,8 @@ private extension TabBarCoordinator {
         vc.onTimerScene = { [weak self] navController in
             self?.startTimerCoordinator(navController: navController)
         }
-        vc.didSelectPlusTab = { [weak self] in
+
+        vc.onPlusScene = { [weak self] in
             self?.handlePlusTabSelection()
         }
         self.tabBarController = vc
@@ -118,6 +119,7 @@ private extension TabBarCoordinator {
             self?.showSelectClipVC(linkURL: linkURL)
         }
         vc.onPopToRoot = { [weak self] in
+            self?.tabBarController?.selectTab(0)
             self?.router.popToRoot(animated: false)
         }
         router.push(vc, animated: false)
@@ -127,6 +129,7 @@ private extension TabBarCoordinator {
         let vc = ViewControllerFactory.shared.makeSelectClipVC(isNavigationBarHidden: false)
         vc.linkURL = linkURL
         vc.onPopToRoot = { [weak self] in
+            self?.tabBarController?.selectTab(0)
             self?.router.popToRoot(animated: false)
         }
         router.push(vc, animated: true)

diff --git a/TOASTER-iOS/Present/TabBar/TabBarController.swift b/TOASTER-iOS/Present/TabBar/TabBarController.swift
@@ -24,9 +24,7 @@ final class TabBarController: UITabBarController {
     var onPlusScene: (() -> Void)?
     var onSearchScene: Scene?
     var onTimerScene: Scene?
-
-    var didSelectPlusTab: (() -> Void)?
-
+
     // MARK: - Life Cycle
 
     override func viewDidLoad() {
@@ -117,14 +115,4 @@ extension TabBarController: UITabBarControllerDelegate {
         default: return
         }
     }
-
-    func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
-        if viewController == viewControllers?[2] {
-            didSelectPlusTab?()
-            selectedIndex = 0
-            currentIndex = selectedIndex
-            return false
-        }
-        return true
-    }
 }