bug: 🐞navigation & tabBar load 시점 수정(#45)

codesquad-members-2021 · Jun 3, 2021 · d069669 · d069669
1 parent 7ff44a3
commit d069669
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 5 deletions.
diff --git a/...roj/project.xcworkspace/xcuserdata/gimjigyeong.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/gimjigyeong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iOS/Airbnb/Airbnb/ConditionPage/Calendar/CalendarViewController.swift b/iOS/Airbnb/Airbnb/ConditionPage/Calendar/CalendarViewController.swift
@@ -189,7 +189,6 @@ extension CalendarViewController {
 extension CalendarViewController {
 
     func configureToolBar() {
-        self.tabBarController?.tabBar.isHidden = true
         let toolbar = UIToolbar()
         view.addSubview(toolbar)
 

diff --git a/iOS/Airbnb/Airbnb/ConditionPage/People/PeopleViewController.swift b/iOS/Airbnb/Airbnb/ConditionPage/People/PeopleViewController.swift
@@ -93,7 +93,6 @@ extension PeopleViewController {
 extension PeopleViewController {
 
     private func configureToolBar() {
-        self.tabBarController?.tabBar.isHidden = true
         let toolbar = UIToolbar()
         view.addSubview(toolbar)
 
@@ -106,8 +105,8 @@ extension PeopleViewController {
         ])
 
         let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: self, action: nil)
-        let toolbarItem1 = UIBarButtonItem(title: "건너뛰기", style: .plain, target: self, action: nil)
-        let toolbarItem2 = UIBarButtonItem(title: "다음", style: .done, target: self, action: nil)
+        let toolbarItem1 = UIBarButtonItem(title: "건너뛰기", style: .plain, target: self, action: #selector(nextButtonPressed))
+        let toolbarItem2 = UIBarButtonItem(title: "다음", style: .done, target: self, action: #selector(nextButtonPressed))
 
         let items = [toolbarItem1, flexibleSpace, toolbarItem2]
         items.forEach{ $0.tintColor = .black }
@@ -122,4 +121,19 @@ extension PeopleViewController {
         self.navigationController?.navigationBar.topItem?.backBarButtonItem = backButton
     }
 
+    @objc func nextButtonPressed() {
+        let nextVC = RoomsViewController(conditionViewModel: conditionViewModel)
+        self.navigationController?.pushViewController(nextVC, animated: true)
+    }
+
+}
+
+
+extension PeopleViewController {
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.tabBarController?.tabBar.isHidden = true
+    }
+
 }
diff --git a/iOS/Airbnb/Airbnb/ConditionPage/Price/PriceViewController.swift b/iOS/Airbnb/Airbnb/ConditionPage/Price/PriceViewController.swift
@@ -121,7 +121,6 @@ extension PriceViewController {
 extension PriceViewController {
 
     private func configureToolBar() {
-        self.tabBarController?.tabBar.isHidden = true
         let toolbar = UIToolbar()
         view.addSubview(toolbar)
 

diff --git a/iOS/Airbnb/Airbnb/MainPage/Controller/MainPageViewController.swift b/iOS/Airbnb/Airbnb/MainPage/Controller/MainPageViewController.swift
@@ -64,3 +64,12 @@ extension MainPageViewController: UISearchBarDelegate {
     }
 
 }
+
+
+extension MainPageViewController {
+
+    override func viewWillAppear(_ animated: Bool) {
+        self.tabBarController?.tabBar.isHidden = false
+    }
+
+}
diff --git a/iOS/Airbnb/Airbnb/MainPage/Controller/SearchCityViewController.swift b/iOS/Airbnb/Airbnb/MainPage/Controller/SearchCityViewController.swift
@@ -267,6 +267,7 @@ extension SearchCityViewController: UICollectionViewDelegate {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        self.tabBarController?.tabBar.isHidden = true
 
         guard let indexPath = self.collectionView.indexPathsForSelectedItems?.first else { return }
         if let coordinator = self.transitionCoordinator {

diff --git a/iOS/Airbnb/Airbnb/ResultPage/Model/RoomDTO.swift b/iOS/Airbnb/Airbnb/ResultPage/Model/RoomDTO.swift
@@ -9,6 +9,7 @@ import Foundation
 
 struct Rooms: Codable, Hashable {
     var rooms : [Room]
+    let uuid = UUID()
 }
 
 struct Room: Codable, Hashable {

diff --git a/iOS/Airbnb/Airbnb/ResultPage/ViewController/RoomsViewController.swift b/iOS/Airbnb/Airbnb/ResultPage/ViewController/RoomsViewController.swift
@@ -162,6 +162,7 @@ extension RoomsViewController: UICollectionViewDelegate {
 extension RoomsViewController {
 
     func configureNavigation() {
+        self.tabBarController?.tabBar.isHidden = false
         self.navigationItem.title = "숙소 찾기"
         let backButton = UIBarButtonItem()
         backButton.title = "Back"