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.

Sign up for GitHub

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

Jump to bottom

[Design] #36 - 상세페이지 리뷰 UI 구현 #84

Merged
merged 26 commits into from
Jul 15, 2022
Merged

[Design] #36 - 상세페이지 리뷰 UI 구현 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9e5a7e5
[Add] #36 - 상세페이지 리뷰 UI를 위한 뷰컨트롤러와 스토리보드 생성
yungu0010 Jul 12, 2022
2ee2d40
[Merge] upstream develop
yungu0010 Jul 12, 2022
e4f520e
[Add] CVC 파일 생성
yungu0010 Jul 13, 2022
13ce87c
Merge branch 'develop' of https://github.com/Health-Food-Me/Health-Fo…
yungu0010 Jul 13, 2022
9e3dc76
[Merge] branch 'develop' of https://github.com/Health-Food-Me/Health-…
yungu0010 Jul 13, 2022
cc6c318
[Merge] upstream develop
yungu0010 Jul 14, 2022
757f105
[Chore] #36 - ReviewTab 생성에 필요한 파일 생성 및 모듈패토리 세팉
yungu0010 Jul 14, 2022
48a7aa2
[Add] #36 - tagCVC 생성
yungu0010 Jul 14, 2022
b2f5702
[Fix] 블로그리뷰 탭 cell 간격 수정
yungu0010 Jul 14, 2022
990afde
[Fix] 블로그리뷰 페이지 UIColor 수정
yungu0010 Jul 14, 2022
28341a6
[Add] #36 - 필요한 cell 디자인
yungu0010 Jul 14, 2022
f818917
[Add] #36 - 더미데이터 추가
yungu0010 Jul 15, 2022
c363998
[Add] #36 - 내가 쓴 리뷰 작업 중간 커밋
yungu0010 Jul 15, 2022
8fc3d70
[Fix] #36 - 리뷰 탭 레이아웃 수정
yungu0010 Jul 15, 2022
88ea767
[Chore] #36 - 데이터모델 수정
yungu0010 Jul 15, 2022
0cdb1b9
[Add] #36 - lineBreakMode설정
yungu0010 Jul 15, 2022
41d7aca
[Add] #36 - 더보기 기능을 위해 구조체 생성
yungu0010 Jul 15, 2022
b491a67
[Merge] upstream develop
yungu0010 Jul 15, 2022
d02b2fc
[Fix] merge하면서 생긴 오류 해결
yungu0010 Jul 15, 2022
9cd257c
[Chore] sceneDelegate에서 시작 파일 수정
yungu0010 Jul 15, 2022
3739de1
[Chore] 셀 인덱스에 따라 구분선 isHidden 설정
yungu0010 Jul 15, 2022
324edb3
[Chore] 폴더링 작업
yungu0010 Jul 15, 2022
6444750
[Feat] CustomSegment에 따라 셀 전환 구현
yungu0010 Jul 15, 2022
e8e1d90
[Fix] #36 - 레이아웃 수정
yungu0010 Jul 15, 2022
3aac276
[Fix] #36 - 셀 재사용으로 인한 레이아웃 문제 해결
yungu0010 Jul 15, 2022
a9ad762
Merge remote-tracking branch 'upstream/develop' into feature/#36
yungu0010 Jul 15, 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
77 changes: 51 additions & 26 deletions HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@
3B0B25592876BBE400950539 /* NotoSansCJKkr-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B25532876BBE400950539 /* NotoSansCJKkr-Medium.otf */; };
3B18D8AC287AB7CD009AF9E7 /* HamburgerBarVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */; };
3B18D8AE287AB7D8009AF9E7 /* HamburgerBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */; };
3BC01F7F287E9225006C2181 /* BlogReviewTabVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC01F7E287E9225006C2181 /* BlogReviewTabVC.swift */; };
3BC01F81287E923E006C2181 /* BlogReviewTab.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3BC01F80287E923E006C2181 /* BlogReviewTab.storyboard */; };
3B723C8B287FF81800822B7C /* TagCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B723C8A287FF81800822B7C /* TagCVC.swift */; };
3B723C912880037100822B7C /* ReviewPhotoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B723C902880037100822B7C /* ReviewPhotoCVC.swift */; };
3B723C932880074200822B7C /* ReviewDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B723C922880074200822B7C /* ReviewDataModel.swift */; };
3B723CA32881AB8A00822B7C /* ReviewDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B723CA22881AB8A00822B7C /* ReviewDetailVC.swift */; };
3B723CA52881B36F00822B7C /* ReviewDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B723CA42881B36F00822B7C /* ReviewDetail.storyboard */; };
3BC01F7B287E89D2006C2181 /* ReviewCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC01F7A287E89D2006C2181 /* ReviewCVC.swift */; };
3BC01F84287EAE48006C2181 /* BlogReviewCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC01F83287EAE48006C2181 /* BlogReviewCVC.swift */; };
3BC01F87287EBB8E006C2181 /* BlogReviewDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC01F86287EBB8E006C2181 /* BlogReviewDataModel.swift */; };
3BC01F89287F1DFA006C2181 /* ReviewHeaderCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC01F88287F1DFA006C2181 /* ReviewHeaderCVC.swift */; };
Expand Down Expand Up @@ -187,8 +191,12 @@
3B0B25532876BBE400950539 /* NotoSansCJKkr-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NotoSansCJKkr-Medium.otf"; sourceTree = "<group>"; };
3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HamburgerBarVC.swift; sourceTree = "<group>"; };
3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = HamburgerBar.storyboard; sourceTree = "<group>"; };
3BC01F7E287E9225006C2181 /* BlogReviewTabVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogReviewTabVC.swift; sourceTree = "<group>"; };
3BC01F80287E923E006C2181 /* BlogReviewTab.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BlogReviewTab.storyboard; sourceTree = "<group>"; };
3B723C8A287FF81800822B7C /* TagCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagCVC.swift; sourceTree = "<group>"; };
3B723C902880037100822B7C /* ReviewPhotoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewPhotoCVC.swift; sourceTree = "<group>"; };
3B723C922880074200822B7C /* ReviewDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewDataModel.swift; sourceTree = "<group>"; };
3B723CA22881AB8A00822B7C /* ReviewDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewDetailVC.swift; sourceTree = "<group>"; };
3B723CA42881B36F00822B7C /* ReviewDetail.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ReviewDetail.storyboard; sourceTree = "<group>"; };
3BC01F7A287E89D2006C2181 /* ReviewCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewCVC.swift; sourceTree = "<group>"; };
3BC01F83287EAE48006C2181 /* BlogReviewCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogReviewCVC.swift; sourceTree = "<group>"; };
3BC01F86287EBB8E006C2181 /* BlogReviewDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogReviewDataModel.swift; sourceTree = "<group>"; };
3BC01F88287F1DFA006C2181 /* ReviewHeaderCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewHeaderCVC.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -364,49 +372,61 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3B18D8AA287AB7B6009AF9E7 /* HamburgerBarScene */ = {
249B65B6BB21EF77F0C03089 /* Frameworks */ = {
isa = PBXGroup;
children = (
3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */,
3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */,
547BCF0E14A343DF6F4A29EC /* Pods_HealthFoodMe.framework */,
);
path = HamburgerBarScene;
name = Frameworks;
sourceTree = "<group>";
};
3BC01F7C287E91F7006C2181 /* BlogReviewTabScene */ = {
3B089C4C287DDD8900DA80B9 /* ReviewTabScene */ = {
isa = PBXGroup;
children = (
3BC01F7D287E9207006C2181 /* VC */,
3BC01F85287EBABF006C2181 /* ViewModel */,
3BC01F82287E9245006C2181 /* Cells */,
3B723CA72881D43B00822B7C /* VC */,
3B089C52287DDDE300DA80B9 /* ViewModel */,
3BC01F79287E8917006C2181 /* Cells */,
);
path = BlogReviewTabScene;
path = ReviewTabScene;
sourceTree = "<group>";
};
3BC01F7D287E9207006C2181 /* VC */ = {
3B089C52287DDDE300DA80B9 /* ViewModel */ = {
isa = PBXGroup;
children = (
3BC01F7E287E9225006C2181 /* BlogReviewTabVC.swift */,
3BC01F80287E923E006C2181 /* BlogReviewTab.storyboard */,
3BC01F86287EBB8E006C2181 /* BlogReviewDataModel.swift */,
3B723C922880074200822B7C /* ReviewDataModel.swift */,
);
path = VC;
path = ViewModel;
sourceTree = "<group>";
};
3BC01F82287E9245006C2181 /* Cells */ = {
3B18D8AA287AB7B6009AF9E7 /* HamburgerBarScene */ = {
isa = PBXGroup;
children = (
3BC01F83287EAE48006C2181 /* BlogReviewCVC.swift */,
3BC01F88287F1DFA006C2181 /* ReviewHeaderCVC.swift */,
3B18D8AB287AB7CD009AF9E7 /* HamburgerBarVC.swift */,
3B18D8AD287AB7D8009AF9E7 /* HamburgerBar.storyboard */,
);
path = Cells;
path = HamburgerBarScene;
sourceTree = "<group>";
};
3BC01F85287EBABF006C2181 /* ViewModel */ = {
3B723CA72881D43B00822B7C /* VC */ = {
isa = PBXGroup;
children = (
3BC01F86287EBB8E006C2181 /* BlogReviewDataModel.swift */,
3B723CA22881AB8A00822B7C /* ReviewDetailVC.swift */,
3B723CA42881B36F00822B7C /* ReviewDetail.storyboard */,
);
path = ViewModel;
path = VC;
sourceTree = "<group>";
};
3BC01F79287E8917006C2181 /* Cells */ = {
isa = PBXGroup;
children = (
3BC01F83287EAE48006C2181 /* BlogReviewCVC.swift */,
3BC01F88287F1DFA006C2181 /* ReviewHeaderCVC.swift */,
3BC01F7A287E89D2006C2181 /* ReviewCVC.swift */,
3B723C8A287FF81800822B7C /* TagCVC.swift */,
3B723C902880037100822B7C /* ReviewPhotoCVC.swift */,
);
path = Cells;
sourceTree = "<group>";
};
3BCC441A28745FA900661A12 /* Auth */ = {
Expand Down Expand Up @@ -736,6 +756,7 @@
EB6A44C928737C4600749582 /* MainDetailScene */,
3BC01F7C287E91F7006C2181 /* BlogReviewTabScene */,
695758BA287DA4A400E36789 /* ReviewWriteScene */,
3B089C4C287DDD8900DA80B9 /* ReviewTabScene */,
697074FB28737D78001A607F /* MenuTabScene */,
);
path = Detail;
Expand Down Expand Up @@ -1515,7 +1536,6 @@
3B0B25572876BBE400950539 /* Pretendard-Medium.otf in Resources */,
A9325280287DD272001EDF50 /* SearchResult.storyboard in Resources */,
3B0B25552876BBE400950539 /* Pretendard-Bold.otf in Resources */,
3BC01F81287E923E006C2181 /* BlogReviewTab.storyboard in Resources */,
3B18D8AE287AB7D8009AF9E7 /* HamburgerBar.storyboard in Resources */,
A938BB8E287D221200B8DE07 /* Search.storyboard in Resources */,
A93252B7287F3272001EDF50 /* Scrap.storyboard in Resources */,
Expand All @@ -1535,6 +1555,7 @@
EB6A44FD2873BF8800749582 /* MainMap.storyboard in Resources */,
EBF66AD1287227F500DE0ED1 /* NotoSansSC-Bold.otf in Resources */,
3B0B25592876BBE400950539 /* NotoSansCJKkr-Medium.otf in Resources */,
3B723CA52881B36F00822B7C /* ReviewDetail.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1648,6 +1669,7 @@
EBF66AC4287227F500DE0ED1 /* UIButton+.swift in Sources */,
FDA3AEF82880612300D6CCB4 /* UserWithdrawalUseCase.swift in Sources */,
FD58291B287DC39A00CE62E8 /* mapContainerView + Reactive.swift in Sources */,
3B723C8B287FF81800822B7C /* TagCVC.swift in Sources */,
FDA54A3B287DEAB2009D5BCE /* CustomSegementControl.swift in Sources */,
EBF66AF0287227F500DE0ED1 /* BaseVC.swift in Sources */,
EBF66B082872AF5B00DE0ED1 /* SampleEntity.swift in Sources */,
Expand All @@ -1662,20 +1684,22 @@
3BCC441E28745FD800661A12 /* SocialLoginVC.swift in Sources */,
3BC01F84287EAE48006C2181 /* BlogReviewCVC.swift in Sources */,
EBF66ABD287227F500DE0ED1 /* UIDevice+.swift in Sources */,
3BC01F7B287E89D2006C2181 /* ReviewCVC.swift in Sources */,
EBF66AE1287227F500DE0ED1 /* BaseService.swift in Sources */,
EBF66AE2287227F500DE0ED1 /* BaseRouter.swift in Sources */,
3B723C912880037100822B7C /* ReviewPhotoCVC.swift in Sources */,
EBF66AE3287227F500DE0ED1 /* NetworkResult.swift in Sources */,
EB6A45262875C3A000749582 /* TabContainerCVC.swift in Sources */,
A93252B1287F2AF9001EDF50 /* ScrapVC.swift in Sources */,
EBF66AF5287227F500DE0ED1 /* Logger.swift in Sources */,
FD39FAD02880C32B00A01CDA /* NicknameChangeViewModel.swift in Sources */,
EB6A4528287664D600749582 /* ExpandableInfoTVC.swift in Sources */,
FDA3AEFB2880612300D6CCB4 /* UserWithdrawalVC.swift in Sources */,
3B723C932880074200822B7C /* ReviewDataModel.swift in Sources */,
EBF66ACB287227F500DE0ED1 /* String+.swift in Sources */,
695758C8287F1DCF00E36789 /* PhotoDataModel.swift in Sources */,
FD39FAD12880C35000A01CDA /* UpperToastView.swift in Sources */,
69028BA82874675800373984 /* MenuView.swift in Sources */,
3BC01F7F287E9225006C2181 /* BlogReviewTabVC.swift in Sources */,
A9E593C72874266200B0F8B5 /* SearchRecent.swift in Sources */,
EBF66AF2287227F500DE0ED1 /* buttonPress.swift in Sources */,
EBF66ADF287227F500DE0ED1 /* AuthRouter.swift in Sources */,
Expand All @@ -1697,6 +1721,7 @@
EB033E84287B5BE300C48FB9 /* StarRatingView.swift in Sources */,
695758D02880ACF000E36789 /* addToolBar.swift in Sources */,
EB6A451128740CFF00749582 /* MainInfoTVC.swift in Sources */,
3B723CA32881AB8A00822B7C /* ReviewDetailVC.swift in Sources */,
EB6A44F22873BED500749582 /* MainMapViewModel.swift in Sources */,
69028BAC2874681700373984 /* MenuTabVC.swift in Sources */,
EBD19265287DC33900EA053E /* TagCVCFlowLayout.swift in Sources */,
Expand Down
9 changes: 9 additions & 0 deletions HealthFoodMe/HealthFoodMe/Application/ModuleFactory/Factory/ModuleFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ protocol ModuleFactoryProtocol {
// MARK: - Detail
func makeMainDetailVC() -> MainDetailVC
func makeMenuTabVC() -> MenuTabVC
// func makeReviewTabVC() -> ReviewTabVC
func makeReviewDetailVC() -> ReviewDetailVC

// MARK: - Search
func makeSearchVC() -> SearchVC
Expand Down Expand Up @@ -91,6 +93,13 @@ class ModuleFactory: ModuleFactoryProtocol {
return vc
}

func makeReviewDetailVC() -> ReviewDetailVC {
let vc = ReviewDetailVC.controllerFromStoryboard(.reviewDetail)

return vc
}


// MARK: - Search
func makeSearchVC() -> SearchVC {
let vc = SearchVC.controllerFromStoryboard(.search)
Expand Down
2 changes: 1 addition & 1 deletion HealthFoodMe/HealthFoodMe/Application/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
}

guard let windowScene = (scene as? UIWindowScene) else { return }
let rootViewController = ModuleFactory.resolve().makeMainMapVC()
let rootViewController = ModuleFactory.resolve().makeReviewTabVC()
let navigation = UINavigationController(rootViewController: rootViewController)
let window = UIWindow(windowScene: windowScene)
window.rootViewController = navigation
Expand Down
2 changes: 1 addition & 1 deletion HealthFoodMe/HealthFoodMe/Global/Literals/StoryboardLiterals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ enum Storyboards: String {
case reviewWrite = "ReviewWrite"
case socialLogin = "SocialLogin"
case hamburgerBar = "HamburgerBar"
case blogReviewTab = "BlogReviewTab"
case reviewDetail = "ReviewDetail"
case nicknameChange = "NicknameChange"
case userWithdrawal = "UserWithdrawal"
}
Expand Down
2 changes: 0 additions & 2 deletions HealthFoodMe/HealthFoodMe/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>BlogReviewTab</string>
</dict>
</array>
</dict>
Expand Down
130 changes: 0 additions & 130 deletions HealthFoodMe/HealthFoodMe/Presentation/Detail/BlogReviewTabScene/VC/BlogReviewTabVC.swift
View file
Open in desktop

This file was deleted.

Loading