Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#3] 상세보기 뷰 구현 #12

Merged
merged 19 commits into from
Nov 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5ffb0ce
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
joonBaek12 Nov 16, 2022
fcb5a2e
🍀[FEAT] : 컴포넌트 생성
joonBaek12 Nov 16, 2022
436943b
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
joonBaek12 Nov 17, 2022
55985da
😺[CHORE] DetailViewController 수정 (#3)
joonBaek12 Nov 17, 2022
12d827f
😺[CHORE] Stash 추가 및 충돌 해결 (#3)
joonBaek12 Nov 17, 2022
f591738
🍀[FEAT] Cell및 Model파일 추가 (#3)
joonBaek12 Nov 21, 2022
940db9e
😺[CHORE] HomeViewController 수정 (#3)
joonBaek12 Nov 21, 2022
26bc3ee
😺[CHORE] CollectionViewCell (#3)
joonBaek12 Nov 21, 2022
063a23e
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
joonBaek12 Nov 21, 2022
671cd12
Merge branch 'Save_Stash_Joon' into feat/#3-상세보기뷰
joonBaek12 Nov 21, 2022
4294af9
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
joonBaek12 Nov 21, 2022
81637a0
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
joonBaek12 Nov 21, 2022
2ef6d6a
😺[CHORE] 레이아웃 오류 해결 (#3)
joonBaek12 Nov 23, 2022
a7c17d9
🍀[FEAT] TagCollectionView 구현 (#3)
joonBaek12 Nov 23, 2022
d6a7db8
🍀[FEAT] RecommendCollectionView, RelateCollectionView 구현 (#3)
joonBaek12 Nov 23, 2022
f21018f
🍀[FEAT] BottomContainerView 기능 구현 (#3)
joonBaek12 Nov 24, 2022
aeb7ab2
🍀[FEAT] TabbarButton 구현 (#3)
joonBaek12 Nov 24, 2022
3bef2ab
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
joonBaek12 Nov 24, 2022
767d319
😺[CHORE] swiftUI 프리뷰 추가 (#3)
joonBaek12 Nov 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Oliveyoung-iOS/Oliveyoung-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
objects = {

/* Begin PBXBuildFile section */
3709E087292A394300222F3E /* ProductModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3709E086292A394300222F3E /* ProductModel.swift */; };
37A27091292B7CE8008855D0 /* PretendardVariable.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 37A27090292B7CE8008855D0 /* PretendardVariable.ttf */; };
37CB1C46292E2FAA00C94725 /* relateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CB1C45292E2FAA00C94725 /* relateCollectionViewCell.swift */; };
37CB1C48292E730D00C94725 /* EmptyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CB1C47292E730D00C94725 /* EmptyViewController.swift */; };
37E0023329262A1A00283615 /* TagCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E0023229262A1A00283615 /* TagCollectionViewCell.swift */; };
37E0023529262A2800283615 /* recommendCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E0023429262A2800283615 /* recommendCollectionViewCell.swift */; };
DD00B8DF292B9AC90027AA2D /* HomeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD00B8DE292B9AC90027AA2D /* HomeRequest.swift */; };
DD00B8E1292B9AD30027AA2D /* HomeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD00B8E0292B9AD30027AA2D /* HomeResponse.swift */; };
DD00B8E3292B9ADB0027AA2D /* SearchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD00B8E2292B9ADB0027AA2D /* SearchRequest.swift */; };
Expand Down Expand Up @@ -66,6 +72,12 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
3709E086292A394300222F3E /* ProductModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductModel.swift; sourceTree = "<group>"; };
37A27090292B7CE8008855D0 /* PretendardVariable.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = PretendardVariable.ttf; sourceTree = "<group>"; };
37CB1C45292E2FAA00C94725 /* relateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = relateCollectionViewCell.swift; sourceTree = "<group>"; };
37CB1C47292E730D00C94725 /* EmptyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyViewController.swift; sourceTree = "<group>"; };
37E0023229262A1A00283615 /* TagCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagCollectionViewCell.swift; sourceTree = "<group>"; };
37E0023429262A2800283615 /* recommendCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = recommendCollectionViewCell.swift; sourceTree = "<group>"; };
DD00B8DE292B9AC90027AA2D /* HomeRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeRequest.swift; sourceTree = "<group>"; };
DD00B8E0292B9AD30027AA2D /* HomeResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeResponse.swift; sourceTree = "<group>"; };
DD00B8E2292B9ADB0027AA2D /* SearchRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRequest.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -137,6 +149,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
37A2708F292B7CE8008855D0 /* variable */ = {
isa = PBXGroup;
children = (
37A27090292B7CE8008855D0 /* PretendardVariable.ttf */,
);
path = variable;
sourceTree = "<group>";
};
DD00B8CE292B9A0D0027AA2D /* Service */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -250,6 +270,7 @@
DD1C74CB292B56D800E3E7A2 /* Fonts */ = {
isa = PBXGroup;
children = (
37A2708F292B7CE8008855D0 /* variable */,
DD1C74D3292B57B300E3E7A2 /* Pretendard-Black.otf */,
DD1C74CE292B57B300E3E7A2 /* Pretendard-Bold.otf */,
DD1C74D0292B57B300E3E7A2 /* Pretendard-ExtraBold.otf */,
Expand Down Expand Up @@ -447,6 +468,7 @@
DDC28C8D29232F37003B87BB /* SearchResult */ = {
isa = PBXGroup;
children = (
37CB1C47292E730D00C94725 /* EmptyViewController.swift */,
DD0FC2972924C39800ACF342 /* SearchResultViewController.swift */,
);
path = SearchResult;
Expand All @@ -455,6 +477,10 @@
DDC28C8E29232F4C003B87BB /* Detail */ = {
isa = PBXGroup;
children = (
37E0023429262A2800283615 /* recommendCollectionViewCell.swift */,
37CB1C45292E2FAA00C94725 /* relateCollectionViewCell.swift */,
37E0023229262A1A00283615 /* TagCollectionViewCell.swift */,
3709E086292A394300222F3E /* ProductModel.swift */,
DD0FC2952924C38500ACF342 /* DetailViewController.swift */,
);
path = Detail;
Expand Down Expand Up @@ -537,6 +563,7 @@
DD1C74D9292B57B300E3E7A2 /* Pretendard-ExtraBold.otf in Resources */,
DD1C74D8292B57B300E3E7A2 /* Pretendard-SemiBold.otf in Resources */,
DD1C74D6292B57B300E3E7A2 /* Pretendard-Thin.otf in Resources */,
37A27091292B7CE8008855D0 /* PretendardVariable.ttf in Resources */,
DD1C74DD292B57B300E3E7A2 /* Pretendard-Light.otf in Resources */,
DDC28C742923234D003B87BB /* Colors.xcassets in Resources */,
DD1C74DC292B57B300E3E7A2 /* Pretendard-Black.otf in Resources */,
Expand Down Expand Up @@ -565,16 +592,20 @@
DDC28C8129232D47003B87BB /* ViewController.swift in Sources */,
DD1C74DF292B675500E3E7A2 /* UIViewController+.swift in Sources */,
DDC28C8529232D91003B87BB /* Image.swift in Sources */,
3709E087292A394300222F3E /* ProductModel.swift in Sources */,
DD00B8F3292B9B220027AA2D /* SearchResultRouter.swift in Sources */,
DD20A8D2292F396800001411 /* PopularWordCollectionViewCell.swift in Sources */,
DD20A8D0292F396000001411 /* RecentWordCollectionViewCell.swift in Sources */,
DD0FC2962924C38500ACF342 /* DetailViewController.swift in Sources */,
37CB1C48292E730D00C94725 /* EmptyViewController.swift in Sources */,
DD20A8CC292F1C5C00001411 /* SearchSectionView.swift in Sources */,
DDC28C8929232E52003B87BB /* UILabel+.swift in Sources */,
DD0FC29C2924C3A500ACF342 /* HomeViewController.swift in Sources */,
37CB1C46292E2FAA00C94725 /* relateCollectionViewCell.swift in Sources */,
DD00B8E3292B9ADB0027AA2D /* SearchRequest.swift in Sources */,
DDC28C7D29232CD6003B87BB /* UIImageView+.swift in Sources */,
DDC28C8329232D75003B87BB /* Identifier.swift in Sources */,
37E0023329262A1A00283615 /* TagCollectionViewCell.swift in Sources */,
DD20A8CE292F304500001411 /* SearchView.swift in Sources */,
DD0FC29A2924C39E00ACF342 /* SearchViewController.swift in Sources */,
DD00B8F5292B9B290027AA2D /* DetailRouter.swift in Sources */,
Expand All @@ -585,6 +616,7 @@
DDC28C54292320E0003B87BB /* SceneDelegate.swift in Sources */,
DD20A8C0292F0CC900001411 /* SearchSection.swift in Sources */,
DD0FC2982924C39800ACF342 /* SearchResultViewController.swift in Sources */,
37E0023529262A2800283615 /* recommendCollectionViewCell.swift in Sources */,
DDC28C7F29232D27003B87BB /* Const.swift in Sources */,
DD00B8EB292B9AFE0027AA2D /* DetailRequest.swift in Sources */,
DD00B8FB292B9BA70027AA2D /* NetworkConstant.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "kakaoTalkPhoto202211121716211.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Shape.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "searchIcon12X12.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "component14.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Frame 259.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Frame [email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Frame [email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
let window = UIWindow(windowScene: windowScene)
window.overrideUserInterfaceStyle = UIUserInterfaceStyle.light

let rootVC = SearchViewController()
let navigationController = UINavigationController(rootViewController: rootVC)
let rootVC = DetailViewController()
// let navigationController = UINavigationController(rootViewController: rootVC)

window.rootViewController = rootVC
window.makeKeyAndVisible()
Expand Down
Loading