diff --git a/YOGIZOGI_iOS/YOZO_iOS.xcworkspace/contents.xcworkspacedata b/YOGIZOGI_iOS/YOZO_iOS.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 25690dc..0000000 --- a/YOGIZOGI_iOS/YOZO_iOS.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/YOZO_iOS.xcodeproj/project.pbxproj b/YOZO_iOS.xcodeproj/project.pbxproj index 8b61b97..ec3010e 100644 --- a/YOZO_iOS.xcodeproj/project.pbxproj +++ b/YOZO_iOS.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 7A7E2F172A32FC22007B566E /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A7E2F162A32FC22007B566E /* MenuCell.swift */; }; 7ACBC83F2A0A224D00896297 /* TasteReviewListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ACBC83E2A0A224D00896297 /* TasteReviewListVC.swift */; }; 7AD6253A2A36FBD900768257 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD625392A36FBD900768257 /* UIColor+Extension.swift */; }; + 7AD6253C2A3864BE00768257 /* TasteReviewVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD6253B2A3864BE00768257 /* TasteReviewVC.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -55,6 +56,7 @@ 7A7E2F162A32FC22007B566E /* MenuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = ""; }; 7ACBC83E2A0A224D00896297 /* TasteReviewListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasteReviewListVC.swift; sourceTree = ""; }; 7AD625392A36FBD900768257 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = ""; }; + 7AD6253B2A3864BE00768257 /* TasteReviewVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TasteReviewVC.swift; path = ../../../../Documents/TasteReviewVC.swift; sourceTree = ""; }; D4DCA2243FF8BECE59C2C208 /* Pods_YOZO_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YOZO_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -160,6 +162,7 @@ 7A7E2F162A32FC22007B566E /* MenuCell.swift */, 7ACBC83E2A0A224D00896297 /* TasteReviewListVC.swift */, 7A36AB2A2A18DB7600ADE4EC /* TasteReivewCell.swift */, + 7AD6253B2A3864BE00768257 /* TasteReviewVC.swift */, ); path = Controllers; sourceTree = ""; @@ -290,6 +293,7 @@ files = ( 7A4FAF4129EFAFF100E19842 /* SignupViewModel.swift in Sources */, 7A5BC8F929E63A2500BBC3B3 /* LoginVC.swift in Sources */, + 7AD6253C2A3864BE00768257 /* TasteReviewVC.swift in Sources */, 7A36AB032A18CBA400ADE4EC /* TasteReviewListViewModel.swift in Sources */, 7A36AB2B2A18DB7600ADE4EC /* TasteReivewCell.swift in Sources */, 7AD6253A2A36FBD900768257 /* UIColor+Extension.swift in Sources */, diff --git a/YOZO_iOS/Controllers/MainVC.swift b/YOZO_iOS/Controllers/MainVC.swift index 2a616cf..6238c5a 100644 --- a/YOZO_iOS/Controllers/MainVC.swift +++ b/YOZO_iOS/Controllers/MainVC.swift @@ -16,6 +16,7 @@ class MainVC: UIViewController,CLLocationManagerDelegate, UISheetPresentationCon override func viewDidLoad() { super.viewDidLoad() + let mapView = NMFMapView(frame: view.frame) view.addSubview(mapView) @@ -59,7 +60,7 @@ class MainVC: UIViewController,CLLocationManagerDelegate, UISheetPresentationCon } } - + } diff --git a/YOZO_iOS/Controllers/RestaurantInfoVC.swift b/YOZO_iOS/Controllers/RestaurantInfoVC.swift index 97700f3..722fad0 100644 --- a/YOZO_iOS/Controllers/RestaurantInfoVC.swift +++ b/YOZO_iOS/Controllers/RestaurantInfoVC.swift @@ -84,7 +84,10 @@ class RestaurantInfoVC: UIViewController, UICollectionViewDataSource, UICollecti make.trailing.equalToSuperview().offset(-10) make.bottom.equalToSuperview() } + + } + // MARK: - UICollectionViewDataSource diff --git a/YOZO_iOS/Controllers/TasteReviewListVC.swift b/YOZO_iOS/Controllers/TasteReviewListVC.swift index 7a66296..781e7d2 100644 --- a/YOZO_iOS/Controllers/TasteReviewListVC.swift +++ b/YOZO_iOS/Controllers/TasteReviewListVC.swift @@ -20,6 +20,6 @@ class TasteReviewListVC: UIViewController { } - + } diff --git a/YOZO_iOS/SceneDelegate.swift b/YOZO_iOS/SceneDelegate.swift index 4f1c551..ffb0f00 100644 --- a/YOZO_iOS/SceneDelegate.swift +++ b/YOZO_iOS/SceneDelegate.swift @@ -13,23 +13,24 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let windowScene = (scene as? UIWindowScene) else { return } - - window = UIWindow(frame: UIScreen.main.bounds) - - let mainVC = LoginVC() - - let navVC = UINavigationController(rootViewController: LoginVC()) - - window?.rootViewController = navVC - - window?.makeKeyAndVisible() - - window?.windowScene = windowScene - } + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let windowScene = (scene as? UIWindowScene) else { return } + + window = UIWindow(frame: UIScreen.main.bounds) + + let mainVC = LoginVC() + + let navVC = UINavigationController(rootViewController: TasteReviewVC()) + + window?.rootViewController = navVC + + window?.makeKeyAndVisible() + + window?.windowScene = windowScene + } + func sceneDidDisconnect(_ scene: UIScene) { // Called as the scene is being released by the system.