180829 네비게이션바 개선

woowahan-techcamp · Aug 29, 2017 · e365675 · e365675
1 parent b93f191
commit e365675
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 237 deletions.
diff --git a/iOSProject/pyunrihae/pyunrihae.xcodeproj/project.pbxproj b/iOSProject/pyunrihae/pyunrihae.xcodeproj/project.pbxproj
@@ -41,7 +41,6 @@
 		989FA79C1F511E59001D1E42 /* ReviewPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 989FA79B1F511E59001D1E42 /* ReviewPopupView.xib */; };
 		989FA7A01F52BEC8001D1E42 /* Popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989FA79F1F52BEC8001D1E42 /* Popup.swift */; };
 		989FA7A41F52E2BA001D1E42 /* ic_check.png in Resources */ = {isa = PBXBuildFile; fileRef = 989FA7A31F52E2BA001D1E42 /* ic_check.png */; };
-		989FA7A61F53DAA0001D1E42 /* Segue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989FA7A51F53DAA0001D1E42 /* Segue.swift */; };
 		989FA7A81F53EA9A001D1E42 /* empty_star.png in Resources */ = {isa = PBXBuildFile; fileRef = 989FA7A71F53EA9A001D1E42 /* empty_star.png */; };
 		98B288601F53EF43007673FF /* ic_default_product.png in Resources */ = {isa = PBXBuildFile; fileRef = 98B2885F1F53EF43007673FF /* ic_default_product.png */; };
 		98B394861F4D59190071BB8B /* ProductAllergyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98B394851F4D59190071BB8B /* ProductAllergyViewController.swift */; };
@@ -189,10 +188,7 @@
 		989FA79B1F511E59001D1E42 /* ReviewPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReviewPopupView.xib; sourceTree = "<group>"; };
 		989FA79F1F52BEC8001D1E42 /* Popup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Popup.swift; sourceTree = "<group>"; };
 		989FA7A31F52E2BA001D1E42 /* ic_check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_check.png; sourceTree = "<group>"; };
-
-		989FA7A51F53DAA0001D1E42 /* Segue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Segue.swift; sourceTree = "<group>"; };
 		989FA7A71F53EA9A001D1E42 /* empty_star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty_star.png; sourceTree = "<group>"; };
-
 		98B2885F1F53EF43007673FF /* ic_default_product.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_default_product.png; sourceTree = "<group>"; };
 		98B394851F4D59190071BB8B /* ProductAllergyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductAllergyViewController.swift; sourceTree = "<group>"; };
 		98B394871F4E5EDA0071BB8B /* MainProduct.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainProduct.xib; sourceTree = "<group>"; };
@@ -412,7 +408,6 @@
 			isa = PBXGroup;
 			children = (
 				9865E54D1F3C576D00014795 /* Image.swift */,
-				989FA7A51F53DAA0001D1E42 /* Segue.swift */,
 				9865E5071F3943BD00014795 /* Button.swift */,
 				9865E5231F3AE04C00014795 /* Label.swift */,
 				989FA79F1F52BEC8001D1E42 /* Popup.swift */,
@@ -952,7 +947,6 @@
 				98F865A51F442B3800C2F333 /* LoginSignUpViewController.swift in Sources */,
 				98D9F2E31F418DF3009D0E10 /* YNSearch.swift in Sources */,
 				98DED89B1F41729100CC4D63 /* SearchViewController.swift in Sources */,
-				989FA7A61F53DAA0001D1E42 /* Segue.swift in Sources */,
 				9865E4F61F387C7A00014795 /* TabBarViewController.swift in Sources */,
 				9865E52C1F3AF3EE00014795 /* MypageTableViewCell.swift in Sources */,
 				98B394861F4D59190071BB8B /* ProductAllergyViewController.swift in Sources */,

diff --git a/iOSProject/pyunrihae/pyunrihae/AllergyViewController.swift b/iOSProject/pyunrihae/pyunrihae/AllergyViewController.swift
@@ -20,12 +20,12 @@ class AllergyViewController: UIViewController {
         super.didReceiveMemoryWarning()
     }
     @IBAction func tabBackBtn(_ sender: UIButton) {
-        let writingReviewViewController = self.navigationController?.viewControllers[1] as! WritingReviewViewController
+        let writingReviewViewController = self.navigationController?.viewControllers[2] as! WritingReviewViewController
         self.navigationController?.popToViewController(writingReviewViewController, animated: true)
     }
     @IBAction func tabCompleteBtn(_ sender: UIButton) {
         NotificationCenter.default.post(name: NSNotification.Name("selectAllergy"), object: self, userInfo: ["allergy" : selectedAllergy])
-        let writingReviewViewController = self.navigationController?.viewControllers[1] as! WritingReviewViewController
+        let writingReviewViewController = self.navigationController?.viewControllers[2] as! WritingReviewViewController
         self.navigationController?.popToViewController(writingReviewViewController, animated: true)
     }
 }

diff --git a/iOSProject/pyunrihae/pyunrihae/AppDelegate.swift b/iOSProject/pyunrihae/pyunrihae/AppDelegate.swift
@@ -36,9 +36,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate,GIDSignInDelegate{
                 }
             }
         }
-
-        // 오프라인 일 때 기기에 저장
-        Database.database().isPersistenceEnabled = true
         return true
     }
     func applicationWillResignActive(_ application: UIApplication) {