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

.gitignore

@@ -1,11 +1,44 @@
 # Created by https://www.toptal.com/developers/gitignore/api/swift,xcode,macos,swiftpackagemanager,swiftpm
 # Edit at https://www.toptal.com/developers/gitignore?templates=swift,xcode,macos,swiftpackagemanager,swiftpm
 
+# Created by https://www.toptal.com/developers/gitignore/api/macos
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos
+
 ### macOS ###
 # General
 .DS_Store
 .AppleDouble
 .LSOverride
+.xcuserstate
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+# End of https://www.toptal.com/developers/gitignore/api/macos
 
 # Icon must end with two \r
 Icon
@@ -140,4 +173,4 @@ xcuserdata
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
 
-# End of https://www.toptal.com/developers/gitignore/api/swift,xcode,macos,swiftpackagemanager,swiftpm
+# End of https://www.toptal.com/developers/gitignore/api/swift,xcode,macos,swiftpackagemanager,swiftpm

Oliveyoung-iOS/Oliveyoung-iOS.xcodeproj/project.pbxproj

@@ -13,6 +13,15 @@
 		DD0FC2982924C39800ACF342 /* SearchResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0FC2972924C39800ACF342 /* SearchResultViewController.swift */; };
 		DD0FC29A2924C39E00ACF342 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0FC2992924C39E00ACF342 /* SearchViewController.swift */; };
 		DD0FC29C2924C3A500ACF342 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0FC29B2924C3A500ACF342 /* HomeViewController.swift */; };
+		DD1C74D5292B57B300E3E7A2 /* Pretendard-ExtraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74CC292B57B200E3E7A2 /* Pretendard-ExtraLight.otf */; };
+		DD1C74D6292B57B300E3E7A2 /* Pretendard-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74CD292B57B200E3E7A2 /* Pretendard-Thin.otf */; };
+		DD1C74D7292B57B300E3E7A2 /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74CE292B57B300E3E7A2 /* Pretendard-Bold.otf */; };
+		DD1C74D8292B57B300E3E7A2 /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74CF292B57B300E3E7A2 /* Pretendard-SemiBold.otf */; };
+		DD1C74D9292B57B300E3E7A2 /* Pretendard-ExtraBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74D0292B57B300E3E7A2 /* Pretendard-ExtraBold.otf */; };
+		DD1C74DA292B57B300E3E7A2 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74D1292B57B300E3E7A2 /* Pretendard-Medium.otf */; };
+		DD1C74DB292B57B300E3E7A2 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74D2292B57B300E3E7A2 /* Pretendard-Regular.otf */; };
+		DD1C74DC292B57B300E3E7A2 /* Pretendard-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74D3292B57B300E3E7A2 /* Pretendard-Black.otf */; };
+		DD1C74DD292B57B300E3E7A2 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD1C74D4292B57B300E3E7A2 /* Pretendard-Light.otf */; };
 		DDC28C52292320E0003B87BB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC28C51292320E0003B87BB /* AppDelegate.swift */; };
 		DDC28C54292320E0003B87BB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC28C53292320E0003B87BB /* SceneDelegate.swift */; };
 		DDC28C5B292320E1003B87BB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDC28C5A292320E1003B87BB /* Assets.xcassets */; };
@@ -39,6 +48,15 @@
 		DD0FC2972924C39800ACF342 /* SearchResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultViewController.swift; sourceTree = "<group>"; };
 		DD0FC2992924C39E00ACF342 /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
 		DD0FC29B2924C3A500ACF342 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
+		DD1C74CC292B57B200E3E7A2 /* Pretendard-ExtraLight.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-ExtraLight.otf"; sourceTree = "<group>"; };
+		DD1C74CD292B57B200E3E7A2 /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = "<group>"; };
+		DD1C74CE292B57B300E3E7A2 /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
+		DD1C74CF292B57B300E3E7A2 /* Pretendard-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-SemiBold.otf"; sourceTree = "<group>"; };
+		DD1C74D0292B57B300E3E7A2 /* Pretendard-ExtraBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-ExtraBold.otf"; sourceTree = "<group>"; };
+		DD1C74D1292B57B300E3E7A2 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
+		DD1C74D2292B57B300E3E7A2 /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
+		DD1C74D3292B57B300E3E7A2 /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = "<group>"; };
+		DD1C74D4292B57B300E3E7A2 /* Pretendard-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Light.otf"; sourceTree = "<group>"; };
 		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>"; };
@@ -71,6 +89,22 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		DD1C74CB292B56D800E3E7A2 /* Fonts */ = {
+			isa = PBXGroup;
+			children = (
+				DD1C74D3292B57B300E3E7A2 /* Pretendard-Black.otf */,
+				DD1C74CE292B57B300E3E7A2 /* Pretendard-Bold.otf */,
+				DD1C74D0292B57B300E3E7A2 /* Pretendard-ExtraBold.otf */,
+				DD1C74CC292B57B200E3E7A2 /* Pretendard-ExtraLight.otf */,
+				DD1C74D4292B57B300E3E7A2 /* Pretendard-Light.otf */,
+				DD1C74D1292B57B300E3E7A2 /* Pretendard-Medium.otf */,
+				DD1C74D2292B57B300E3E7A2 /* Pretendard-Regular.otf */,
+				DD1C74CF292B57B300E3E7A2 /* Pretendard-SemiBold.otf */,
+				DD1C74CD292B57B200E3E7A2 /* Pretendard-Thin.otf */,
+			);
+			path = Fonts;
+			sourceTree = "<group>";
+		};
 		DDC28C45292320E0003B87BB = {
 			isa = PBXGroup;
 			children = (
@@ -100,6 +134,7 @@
 		DDC28C6E29232210003B87BB /* Resource */ = {
 			isa = PBXGroup;
 			children = (
+				DD1C74CB292B56D800E3E7A2 /* Fonts */,
 				DDC28C7229232320003B87BB /* Colors */,
 				DDC28C71292322DF003B87BB /* Assets */,
 				DDC28C70292322D4003B87BB /* Storyboards */,
@@ -297,8 +332,17 @@
 			buildActionMask = 2147483647;
 			files = (
 				DDC28C5E292320E1003B87BB /* LaunchScreen.storyboard in Resources */,
+				DD1C74D7292B57B300E3E7A2 /* Pretendard-Bold.otf in Resources */,
+				DD1C74D9292B57B300E3E7A2 /* Pretendard-ExtraBold.otf in Resources */,
+				DD1C74D8292B57B300E3E7A2 /* Pretendard-SemiBold.otf in Resources */,
+				DD1C74D6292B57B300E3E7A2 /* Pretendard-Thin.otf in Resources */,
+				DD1C74DD292B57B300E3E7A2 /* Pretendard-Light.otf in Resources */,
 				DDC28C742923234D003B87BB /* Colors.xcassets in Resources */,
+				DD1C74DC292B57B300E3E7A2 /* Pretendard-Black.otf in Resources */,
+				DD1C74D5292B57B300E3E7A2 /* Pretendard-ExtraLight.otf in Resources */,
+				DD1C74DB292B57B300E3E7A2 /* Pretendard-Regular.otf in Resources */,
 				DDC28C5B292320E1003B87BB /* Assets.xcassets in Resources */,
+				DD1C74DA292B57B300E3E7A2 /* Pretendard-Medium.otf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Oliveyoung-iOS/Oliveyoung-iOS/Info.plist

@@ -2,6 +2,18 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Pretendard-SemiBold</string>
+		<string>Pretendard-Thin</string>
+		<string>Pretendard-ExtraLight</string>
+		<string>Pretendard-Light</string>
+		<string>Pretendard-Medium</string>
+		<string>Pretendard-Regular</string>
+		<string>Pretendard-Black</string>
+		<string>Pretendard-Bold</string>
+		<string>Pretendard-ExtraBold</string>
+	</array>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

Oliveyoung-iOS/Oliveyoung-iOS/Resource/Assets/Assets.xcassets/back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "back.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Oliveyoung-iOS/Oliveyoung-iOS/Source/Common/Const/Image.swift

@@ -14,6 +14,7 @@ extension Const {
         /// 종류? ex. icon, button, image
         static let arrowIcon18X18 = UIImage(named: "arrowIcon18X18")
         static let categoryIcon = UIImage(named: "categoryIcon")
+        static let back = UIImage(named: "back")
         static let checkedbox = UIImage(named: "checkedbox")
         static let error = UIImage(named: "error")
         static let facebook = UIImage(named: "facebook")

Oliveyoung-iOS/Oliveyoung-iOS/Source/Common/Extensions/UIView+.swift

@@ -8,11 +8,8 @@
 import UIKit.UIView
 
 extension UIView {
-    func addSubviews(_ views: [UIView]) {
-        views.forEach {
-            self.addSubview($0)
-            $0.translatesAutoresizingMaskIntoConstraints = false
-        }
+    func addSubviews(_ views: UIView...) {
+        views.forEach { self.addSubview($0) }
     }
 
     var cornerRadius: CGFloat {

Oliveyoung-iOS/Oliveyoung-iOS/Source/Common/Extensions/UIViewController+.swift

@@ -0,0 +1,35 @@
+//
+//  UIViewController+.swift
+//  Oliveyoung-iOS
+//
+//  Created by 양정연 on 2022/11/21.
+//
+
+import Foundation
+import SwiftUI
+
+/// SwiftUI를 이용한 프리뷰 표시
+#if DEBUG
+extension UIViewController {
+    private struct Preview: UIViewControllerRepresentable {
+            let viewController: UIViewController
+
+            func makeUIViewController(context: Context) -> UIViewController {
+                return viewController
+            }
+
+            func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+            }
+        }
+
+        func toPreview() -> some View {
+            Preview(viewController: self)
+        }
+}
+#endif
+// 아래 코드를 원하는 뷰컨 맨 아래에 넣고 swiftUI 임포트해주기
+//struct ViewControllerPreView:PreviewProvider {
+//  static var previews: some View {
+//    뷰컨 이름().toPreview()
+//  }
+//}