Skip to content

Commit 8316494

Browse files
authored
Merge pull request #143 from boostcampwm2023/iOS/bug#142
bug: navigationBar 중첩 버그 수정
2 parents 4a61ff0 + 381fde8 commit 8316494

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

iOS/Layover/Layover/SceneDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ extension SceneDelegate {
8080
@objc private func routeToLoginViewController() {
8181
guard let rootNavigationViewController = window?.rootViewController as? UINavigationController else { return }
8282
// TODO: 세션이 만료되었습니다. Toast 띄우기
83+
rootNavigationViewController.setNavigationBarHidden(false, animated: false)
8384
rootNavigationViewController.setViewControllers([LoginViewController()], animated: true)
8485
}
8586
}

iOS/Layover/Layover/Scenes/EditProfile/EditProfileViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ final class EditProfileViewController: BaseViewController {
118118
// MARK: - Methods
119119

120120
override func setUI() {
121+
super.setUI()
121122
self.title = "프로필 수정"
122123
}
123124

124125
override func setConstraints() {
126+
super.setConstraints()
125127
view.addSubviews(profileImageView, editProfileImageButton, nicknameTextfield, nicknameAlertLabel, introduceTextfield,
126128
introduceAlertLabel, nicknameAlertLabel, checkDuplicateNicknameButton, confirmButton)
127129
view.subviews.forEach {

iOS/Layover/Layover/Scenes/Profile/ProfileRouter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ProfileRouter: NSObject, ProfileRoutingLogic, ProfileDataPassing {
3535
destination.nickname = source.nickname
3636
destination.introduce = source.introduce
3737
destination.profileImage = source.profileImage
38-
38+
editProfileViewController.hidesBottomBarWhenPushed = true
3939
viewController?.navigationController?.pushViewController(editProfileViewController, animated: true)
4040
}
4141

iOS/Layover/Layover/Scenes/SignUpScene/SignUpRouter.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2023 CodeBomber. All rights reserved.
77
//
88

9-
import Foundation
9+
import UIKit
1010

1111
protocol SignUpRoutingLogic {
1212
func routeToBack()
@@ -33,6 +33,7 @@ final class SignUpRouter: SignUpRoutingLogic, SignUpDataPassing {
3333

3434
func navigateToMain() {
3535
let mainTabBarViewController = MainTabBarViewController()
36+
viewController?.navigationController?.setNavigationBarHidden(true, animated: false)
3637
viewController?.navigationController?.setViewControllers([mainTabBarViewController], animated: true)
3738
}
3839
}

iOS/Layover/Layover/Scenes/Tabbar/MainTabBarConfigurator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class MainTabBarConfigurator: Configurator {
3131
profileViewController.tabBarItem = UITabBarItem(title: "프로필",
3232
image: profileIconImage.withTintColor(.white),
3333
selectedImage: nil)
34-
34+
viewController.navigationController?.setNavigationBarHidden(true, animated: false)
3535
viewController.setViewControllers([
3636
homeViewController,
3737
mapViewController,

0 commit comments

Comments
 (0)