Merge pull request #1002 from DeluxeAlonso/feature/code-cleanup

Feature/code cleanup
DeluxeAlonso · Oct 26, 2024 · 787f9e3 · 787f9e3
2 parents ad593c4 + d92158c
commit 787f9e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/UpcomingMovies/Helpers/Handlers/NavigationHandler/NavigationHandler.swift b/UpcomingMovies/Helpers/Handlers/NavigationHandler/NavigationHandler.swift
@@ -52,10 +52,10 @@ final class NavigationHandler: NavigationHandlerProtocol {
                 changeTabBarToSelectedIndex(RootCoordinatorIdentifier.account, from: window)
                 // TODO: - Refactor
                 let rootCoordinator = rootCoordinators[index(for: RootCoordinatorIdentifier.account)]
-                let unwrappedParentCoordinator = rootCoordinator.childCoordinators.last?.unwrappedParentCoordinator
-                let coordinator = FavoritesSavedMoviesCoordinator(navigationController: unwrappedParentCoordinator?.navigationController ?? UINavigationController())
+                let unwrappedParentCoordinator = rootCoordinator.childCoordinators.last?.unwrappedParentCoordinator ?? rootCoordinator
+                let coordinator = FavoritesSavedMoviesCoordinator(navigationController: unwrappedParentCoordinator.navigationController)
                 coordinator.parentCoordinator = unwrappedParentCoordinator
-                unwrappedParentCoordinator?.childCoordinators.append(coordinator)
+                unwrappedParentCoordinator.childCoordinators.append(coordinator)
                 coordinator.start()
             }
         }

diff --git a/UpcomingMovies/Scenes/Account/AccountCoordinator.swift b/UpcomingMovies/Scenes/Account/AccountCoordinator.swift
@@ -13,13 +13,12 @@ final class AccountCoordinator: BaseCoordinator, AccountCoordinatorProtocol {
     private var profileCoordinator: ProfileCoordinator?
     private var signInCoordinator: SignInCoordinator?
 
-    override func start() {
+    override func build() -> AccountViewController {
         let viewController = AccountViewController.instantiate()
-
         viewController.viewModel = DIContainer.shared.resolve()
         viewController.coordinator = self
 
-        navigationController.pushViewController(viewController, animated: true)
+        return viewController
     }
 
     func embedSignInViewController(on parentViewController: SignInViewControllerDelegate) {

diff --git a/UpcomingMovies/Scenes/TabBar/MainTabBarBuilder.swift b/UpcomingMovies/Scenes/TabBar/MainTabBarBuilder.swift
@@ -29,7 +29,7 @@ final class MainTabBarBuilder {
 
         let accountNavigationController = createNavigationController(title: LocalizedStrings.accountTabBarTitle(), image: #imageLiteral(resourceName: "Account"))
         let accountCoordinator = AccountCoordinator(navigationController: accountNavigationController)
-        accountCoordinator.start()
+        accountCoordinator.start(coordinatorMode: .push)
 
         return [
             upcomingMoviesCoordinator,