From a151cd4ddefc0f0c7eda73f3de18e48d3171058f Mon Sep 17 00:00:00 2001 From: kim-seonwoo Date: Sat, 13 Jan 2024 02:29:44 +0900 Subject: [PATCH] =?UTF-8?q?[Fix/#62]=20Extension=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20root=EC=9D=B4=EB=8F=99=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMH_iOS/HMH_iOS/Application/SceneDelegate.swift | 4 +++- .../Login/ViewControllers/LoginViewController.swift | 6 ++---- .../ViewControllers/SignInCompleteViewController.swift | 8 +------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/HMH_iOS/HMH_iOS/Application/SceneDelegate.swift b/HMH_iOS/HMH_iOS/Application/SceneDelegate.swift index 628fc9e..ddb9347 100644 --- a/HMH_iOS/HMH_iOS/Application/SceneDelegate.swift +++ b/HMH_iOS/HMH_iOS/Application/SceneDelegate.swift @@ -33,9 +33,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { let window = UIWindow(windowScene: windowScene) self.window = window - let splashViewController = SplashViewController() window.rootViewController = splashViewController + if let navigationController = window.rootViewController as? UINavigationController { + navigationController.isNavigationBarHidden = true + } window.makeKeyAndVisible() DispatchQueue.main.asyncAfter(deadline: .now() + 2) { diff --git a/HMH_iOS/HMH_iOS/Presentation/Login/ViewControllers/LoginViewController.swift b/HMH_iOS/HMH_iOS/Presentation/Login/ViewControllers/LoginViewController.swift index 3189ce7..56caf28 100644 --- a/HMH_iOS/HMH_iOS/Presentation/Login/ViewControllers/LoginViewController.swift +++ b/HMH_iOS/HMH_iOS/Presentation/Login/ViewControllers/LoginViewController.swift @@ -99,11 +99,9 @@ extension LoginViewController: ASAuthorizationControllerDelegate, ASAuthorizatio print(UserManager.shared.getUserIdentifier) print(UserManager.shared.getUserName) if (UserManager.shared.appleUserIdentifier != nil) { - let nextViewController = TabBarController() - self.navigationController?.pushViewController(nextViewController, animated: true) + setRootViewController(TabBarController()) } else { - let nextViewController = TimeSurveyViewController() - self.navigationController?.pushViewController(nextViewController, animated: true) + setRootViewController(TimeSurveyViewController()) } default: diff --git a/HMH_iOS/HMH_iOS/Presentation/Onboarding/ViewControllers/SignInCompleteViewController.swift b/HMH_iOS/HMH_iOS/Presentation/Onboarding/ViewControllers/SignInCompleteViewController.swift index 44cb594..679b6fa 100644 --- a/HMH_iOS/HMH_iOS/Presentation/Onboarding/ViewControllers/SignInCompleteViewController.swift +++ b/HMH_iOS/HMH_iOS/Presentation/Onboarding/ViewControllers/SignInCompleteViewController.swift @@ -77,13 +77,7 @@ final class SignInCompleteViewController: OnboardingBaseViewController { extension SignInCompleteViewController: NextViewPushDelegate { func didTapButton() { - let nextViewController = TabBarController() - let navigationController = UINavigationController(rootViewController: nextViewController) - let sceneDelegate = UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate - guard let delegate = sceneDelegate else { - return - } - delegate.window?.rootViewController = navigationController + setRootViewController(TabBarController()) } }