Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰

IN-SOPT-Joint-Seminar-OLIVEYOUNG · Nov 17, 2022 · 436943b · 436943b
2 parents fcb5a2e + 4033122
commit 436943b
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 69 deletions.
diff --git a/Oliveyoung-iOS/Oliveyoung-iOS.xcodeproj/project.pbxproj b/Oliveyoung-iOS/Oliveyoung-iOS.xcodeproj/project.pbxproj
@@ -13,8 +13,6 @@
 		DD0FC29C2924C3A500ACF342 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0FC29B2924C3A500ACF342 /* HomeViewController.swift */; };
 		DDC28C52292320E0003B87BB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC28C51292320E0003B87BB /* AppDelegate.swift */; };
 		DDC28C54292320E0003B87BB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC28C53292320E0003B87BB /* SceneDelegate.swift */; };
-		DDC28C56292320E0003B87BB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC28C55292320E0003B87BB /* ViewController.swift */; };
-		DDC28C59292320E0003B87BB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DDC28C57292320E0003B87BB /* Main.storyboard */; };
 		DDC28C5B292320E1003B87BB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDC28C5A292320E1003B87BB /* Assets.xcassets */; };
 		DDC28C5E292320E1003B87BB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DDC28C5C292320E1003B87BB /* LaunchScreen.storyboard */; };
 		DDC28C6729232110003B87BB /* Then in Frameworks */ = {isa = PBXBuildFile; productRef = DDC28C6629232110003B87BB /* Then */; };
@@ -40,8 +38,6 @@
 		DDC28C4E292320E0003B87BB /* Oliveyoung-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Oliveyoung-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DDC28C51292320E0003B87BB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		DDC28C53292320E0003B87BB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
-		DDC28C55292320E0003B87BB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
-		DDC28C58292320E0003B87BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		DDC28C5A292320E1003B87BB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		DDC28C5D292320E1003B87BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		DDC28C5F292320E1003B87BB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -92,8 +88,6 @@
 			children = (
 				DDC28C6E29232210003B87BB /* Resource */,
 				DDC28C6F29232220003B87BB /* Source */,
-				DDC28C55292320E0003B87BB /* ViewController.swift */,
-				DDC28C57292320E0003B87BB /* Main.storyboard */,
 				DDC28C5F292320E1003B87BB /* Info.plist */,
 			);
 			path = "Oliveyoung-iOS";
@@ -299,7 +293,6 @@
 				DDC28C5E292320E1003B87BB /* LaunchScreen.storyboard in Resources */,
 				DDC28C742923234D003B87BB /* Colors.xcassets in Resources */,
 				DDC28C5B292320E1003B87BB /* Assets.xcassets in Resources */,
-				DDC28C59292320E0003B87BB /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -317,7 +310,6 @@
 				DDC28C8929232E52003B87BB /* UILabel+.swift in Sources */,
 				DD0FC29C2924C3A500ACF342 /* HomeViewController.swift in Sources */,
 				DDC28C7D29232CD6003B87BB /* UIImageView+.swift in Sources */,
-				DDC28C56292320E0003B87BB /* ViewController.swift in Sources */,
 				DDC28C8329232D75003B87BB /* Identifier.swift in Sources */,
 				DD0FC29A2924C39E00ACF342 /* SearchViewController.swift in Sources */,
 				DDC28C52292320E0003B87BB /* AppDelegate.swift in Sources */,
@@ -331,14 +323,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		DDC28C57292320E0003B87BB /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				DDC28C58292320E0003B87BB /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
 		DDC28C5C292320E1003B87BB /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -476,7 +460,6 @@
 				INFOPLIST_FILE = "Oliveyoung-iOS/Info.plist";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -504,7 +487,6 @@
 				INFOPLIST_FILE = "Oliveyoung-iOS/Info.plist";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				LD_RUNPATH_SEARCH_PATHS = (

diff --git a/...eproj/project.xcworkspace/xcuserdata/jeongkite.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/jeongkite.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...veyoung-iOS.xcodeproj/xcuserdata/jeongkite.xcuserdatad/xcschemes/xcschememanagement.plist b/...veyoung-iOS.xcodeproj/xcuserdata/jeongkite.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Oliveyoung-iOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>SnapKitPlayground (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>SnapKitPlayground (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>SnapKitPlayground (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Oliveyoung-iOS/Oliveyoung-iOS/Base.lproj/Main.storyboard b/Oliveyoung-iOS/Oliveyoung-iOS/Base.lproj/Main.storyboard
diff --git a/Oliveyoung-iOS/Oliveyoung-iOS/Info.plist b/Oliveyoung-iOS/Oliveyoung-iOS/Info.plist
@@ -15,8 +15,6 @@
 					<string>Default Configuration</string>
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
 				</dict>
 			</array>
 		</dict>

diff --git a/Oliveyoung-iOS/Oliveyoung-iOS/Source/Application/SceneDelegate.swift b/Oliveyoung-iOS/Oliveyoung-iOS/Source/Application/SceneDelegate.swift
@@ -23,10 +23,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
             let window = UIWindow(windowScene: windowScene)
             window.overrideUserInterfaceStyle = UIUserInterfaceStyle.light
-            
-            let rootVC = ViewController()
+
+            let rootVC = HomeViewController()
             let navigationController = UINavigationController(rootViewController: rootVC)
-            
+
             window.rootViewController = navigationController
             window.makeKeyAndVisible()
             self.window = window

diff --git a/Oliveyoung-iOS/Oliveyoung-iOS/Source/Presentation/Home/HomeViewController.swift b/Oliveyoung-iOS/Oliveyoung-iOS/Source/Presentation/Home/HomeViewController.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-class HomeViewController: ViewController {
+class HomeViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()

diff --git a/Oliveyoung-iOS/Oliveyoung-iOS/Source/Presentation/Search/SearchViewController.swift b/Oliveyoung-iOS/Oliveyoung-iOS/Source/Presentation/Search/SearchViewController.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-class SearchViewController: ViewController {
+class SearchViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()

diff --git a/...oung-iOS/Oliveyoung-iOS/Source/Presentation/SearchResult/SearchResultViewController.swift b/...oung-iOS/Oliveyoung-iOS/Source/Presentation/SearchResult/SearchResultViewController.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-class SearchResultViewController: ViewController {
+class SearchResultViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()

diff --git a/Oliveyoung-iOS/Oliveyoung-iOS/ViewController.swift b/Oliveyoung-iOS/Oliveyoung-iOS/ViewController.swift