Merge branch 'main' into develop

Busan-Dinosaur · Feb 12, 2024 · 1c8a0d0 · 1c8a0d0
2 parents 9636d3a + 6e0d88c
commit 1c8a0d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/FoodBowl.xcodeproj/project.pbxproj b/FoodBowl.xcodeproj/project.pbxproj
@@ -2164,7 +2164,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				NONCE = wH_pSu5wSUHzoFPBUE9Q9ZRs3fcKzGSn;
 				PRODUCT_BUNDLE_IDENTIFIER = com.coby.FoodBowl;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2207,7 +2207,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				NONCE = wH_pSu5wSUHzoFPBUE9Q9ZRs3fcKzGSn;
 				PRODUCT_BUNDLE_IDENTIFIER = com.coby.FoodBowl;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/FoodBowl/Presentation/Common/Component/ViewController/MapViewController.swift b/FoodBowl/Presentation/Common/Component/ViewController/MapViewController.swift
@@ -128,6 +128,11 @@ class MapViewController: UIViewController, Navigationable, Optionable, Helperabl
         self.setModalState()
     }
 
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        self.tabBarController?.tabBar.frame.origin = CGPoint(x: 0, y: UIScreen.main.bounds.maxY - self.tabBarHeight)
+    }
+
     // MARK: - func
 
     func setupLayout() {