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

[Design] 외식대처법 UI 구현 #83

Merged
merged 11 commits into from
Jul 16, 2022
73 changes: 68 additions & 5 deletions HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,14 @@
695758C3287DF04400E36789 /* AddPhotoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758C2287DF04400E36789 /* AddPhotoCVC.swift */; };
695758C5287DF08800E36789 /* ListPhotoCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758C4287DF08800E36789 /* ListPhotoCVC.swift */; };
695758C8287F1DCF00E36789 /* PhotoDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758C7287F1DCF00E36789 /* PhotoDataModel.swift */; };
695758CA288057D700E36789 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758C9288057D700E36789 /* Config.swift */; };
695758D02880ACF000E36789 /* addToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758CF2880ACF000E36789 /* addToolBar.swift */; };
695758D52881121900E36789 /* CopingTabVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758D42881121900E36789 /* CopingTabVC.swift */; };
695758D72881122800E36789 /* CopingTab.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 695758D62881122800E36789 /* CopingTab.storyboard */; };
695758DC2881128300E36789 /* ContentTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758DB2881128300E36789 /* ContentTVC.swift */; };
695758DE28811E9D00E36789 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758DD28811E9D00E36789 /* Config.swift */; };
695758E02881228700E36789 /* CopingHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758DF2881228700E36789 /* CopingHeaderView.swift */; };
695758E328812B3100E36789 /* CopingDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758E228812B3100E36789 /* CopingDataModel.swift */; };
695758E52881852F00E36789 /* CopingEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695758E42881852E00E36789 /* CopingEmptyView.swift */; };
75CF9028E2A4677BC9470A70 /* Pods_HealthFoodMe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1D3D3B2D1590CCD44253F6D /* Pods_HealthFoodMe.framework */; };
A9325274287D3065001EDF50 /* SearchResultTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9325273287D3065001EDF50 /* SearchResultTVC.swift */; };
A9325277287D4F10001EDF50 /* SearchResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9325276287D4F10001EDF50 /* SearchResultModel.swift */; };
Expand Down Expand Up @@ -214,9 +220,14 @@
695758C2287DF04400E36789 /* AddPhotoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddPhotoCVC.swift; sourceTree = "<group>"; };
695758C4287DF08800E36789 /* ListPhotoCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPhotoCVC.swift; sourceTree = "<group>"; };
695758C7287F1DCF00E36789 /* PhotoDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoDataModel.swift; sourceTree = "<group>"; };
695758C9288057D700E36789 /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Config.swift; path = ../../../../../../../../Downloads/Config.swift; sourceTree = "<group>"; };
695758CF2880ACF000E36789 /* addToolBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = addToolBar.swift; sourceTree = "<group>"; };
695758C9288057D700E36789 /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
695758D42881121900E36789 /* CopingTabVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopingTabVC.swift; sourceTree = "<group>"; };
695758D62881122800E36789 /* CopingTab.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CopingTab.storyboard; sourceTree = "<group>"; };
695758DB2881128300E36789 /* ContentTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentTVC.swift; sourceTree = "<group>"; };
695758DD28811E9D00E36789 /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
695758DF2881228700E36789 /* CopingHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopingHeaderView.swift; sourceTree = "<group>"; };
695758E228812B3100E36789 /* CopingDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopingDataModel.swift; sourceTree = "<group>"; };
695758E42881852E00E36789 /* CopingEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopingEmptyView.swift; sourceTree = "<group>"; };
6E596B9EBEC8B18D4DE266B6 /* Pods-HealthFoodMe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HealthFoodMe.release.xcconfig"; path = "Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe.release.xcconfig"; sourceTree = "<group>"; };
A9325273287D3065001EDF50 /* SearchResultTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultTVC.swift; sourceTree = "<group>"; };
A9325276287D4F10001EDF50 /* SearchResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -500,6 +511,51 @@
path = ViewModel;
sourceTree = "<group>";
};
695758D12881109600E36789 /* CopingTabScene */ = {
isa = PBXGroup;
children = (
695758D2288111E800E36789 /* VC */,
695758E128812B0D00E36789 /* ViewModel */,
695758D3288111F100E36789 /* Views */,
695758D82881124300E36789 /* Cell */,
);
path = CopingTabScene;
sourceTree = "<group>";
};
695758D2288111E800E36789 /* VC */ = {
isa = PBXGroup;
children = (
695758D42881121900E36789 /* CopingTabVC.swift */,
695758D62881122800E36789 /* CopingTab.storyboard */,
);
path = VC;
sourceTree = "<group>";
};
695758D3288111F100E36789 /* Views */ = {
isa = PBXGroup;
children = (
695758DF2881228700E36789 /* CopingHeaderView.swift */,
695758E42881852E00E36789 /* CopingEmptyView.swift */,
);
path = Views;
sourceTree = "<group>";
};
695758D82881124300E36789 /* Cell */ = {
isa = PBXGroup;
children = (
695758DB2881128300E36789 /* ContentTVC.swift */,
);
path = Cell;
sourceTree = "<group>";
};
695758E128812B0D00E36789 /* ViewModel */ = {
isa = PBXGroup;
children = (
695758E228812B3100E36789 /* CopingDataModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
697074FB28737D78001A607F /* MenuTabScene */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -754,6 +810,7 @@
isa = PBXGroup;
children = (
EB6A44C928737C4600749582 /* MainDetailScene */,
695758D12881109600E36789 /* CopingTabScene */,
3BC01F7C287E91F7006C2181 /* BlogReviewTabScene */,
695758BA287DA4A400E36789 /* ReviewWriteScene */,
3B089C4C287DDD8900DA80B9 /* ReviewTabScene */,
Expand Down Expand Up @@ -1224,7 +1281,7 @@
EBF66A8B287227F500DE0ED1 /* Environment */ = {
isa = PBXGroup;
children = (
695758C9288057D700E36789 /* Config.swift */,
695758DD28811E9D00E36789 /* Config.swift */,
EBF66A8C287227F500DE0ED1 /* NetworkConstants.swift */,
);
path = Environment;
Expand Down Expand Up @@ -1546,6 +1603,7 @@
695758BD287DA4CD00E36789 /* ReviewWrite.storyboard in Resources */,
A93252E22880CBB9001EDF50 /* HelfmeAlert.storyboard in Resources */,
3BCC442028745FE500661A12 /* SocialLogin.storyboard in Resources */,
695758D72881122800E36789 /* CopingTab.storyboard in Resources */,
3B089C4A287D877B00DA80B9 /* GodoB.ttf in Resources */,
3B0B25562876BBE400950539 /* Pretendard-Regular.otf in Resources */,
EBF66AD0287227F500DE0ED1 /* Assets.xcassets in Resources */,
Expand Down Expand Up @@ -1647,6 +1705,7 @@
695758BF287DA50000E36789 /* ReviewWriteVC.swift in Sources */,
EBF66AFE287227F500DE0ED1 /* makeVibrate.swift in Sources */,
FDF2E1FC287EFC710007D4F9 /* StarRatingSlider.swift in Sources */,
695758DE28811E9D00E36789 /* Config.swift in Sources */,
EBD19262287DBC1800EA053E /* MapDetailSummaryView.swift in Sources */,
EBF66B0A2872B21F00DE0ED1 /* StringLiterals.swift in Sources */,
EB6A45172874276B00749582 /* DetailTabTitleHeader.swift in Sources */,
Expand Down Expand Up @@ -1680,6 +1739,7 @@
EBF66ABE287227F500DE0ED1 /* UITextView+.swift in Sources */,
EBF66AD5287227F500DE0ED1 /* ViewModelType.swift in Sources */,
69028BB02874A60E00373984 /* HeaderView.swift in Sources */,
695758D52881121900E36789 /* CopingTabVC.swift in Sources */,
EBF66ADA287227F500DE0ED1 /* controllerFromStoryBoard.swift in Sources */,
3BCC441E28745FD800661A12 /* SocialLoginVC.swift in Sources */,
3BC01F84287EAE48006C2181 /* BlogReviewCVC.swift in Sources */,
Expand All @@ -1701,6 +1761,7 @@
FD39FAD12880C35000A01CDA /* UpperToastView.swift in Sources */,
69028BA82874675800373984 /* MenuView.swift in Sources */,
A9E593C72874266200B0F8B5 /* SearchRecent.swift in Sources */,
695758E328812B3100E36789 /* CopingDataModel.swift in Sources */,
EBF66AF2287227F500DE0ED1 /* buttonPress.swift in Sources */,
EBF66ADF287227F500DE0ED1 /* AuthRouter.swift in Sources */,
EBF66ADC287227F500DE0ED1 /* AppDelegate.swift in Sources */,
Expand All @@ -1721,8 +1782,10 @@
EB033E84287B5BE300C48FB9 /* StarRatingView.swift in Sources */,
695758D02880ACF000E36789 /* addToolBar.swift in Sources */,
EB6A451128740CFF00749582 /* MainInfoTVC.swift in Sources */,
695758DC2881128300E36789 /* ContentTVC.swift in Sources */,
3B723CA32881AB8A00822B7C /* ReviewDetailVC.swift in Sources */,
EB6A44F22873BED500749582 /* MainMapViewModel.swift in Sources */,
695758E52881852F00E36789 /* CopingEmptyView.swift in Sources */,
69028BAC2874681700373984 /* MenuTabVC.swift in Sources */,
EBD19265287DC33900EA053E /* TagCVCFlowLayout.swift in Sources */,
695758C5287DF08800E36789 /* ListPhotoCVC.swift in Sources */,
Expand All @@ -1733,6 +1796,7 @@
A9525F712873E1750065EB1D /* SearchVC.swift in Sources */,
EB6A450C2873D6C500749582 /* DetailSummaryView.swift in Sources */,
A93252AD287F09D0001EDF50 /* SearchEmptyView.swift in Sources */,
695758E02881228700E36789 /* CopingHeaderView.swift in Sources */,
EBF66ACC287227F500DE0ED1 /* BaseNotiList.swift in Sources */,
EBF66AD8287227F500DE0ED1 /* BaseControllable.swift in Sources */,
EBF66ABF287227F500DE0ED1 /* UITabBar+.swift in Sources */,
Expand All @@ -1744,7 +1808,6 @@
FD39FACF2880C31000A01CDA /* CTAButton.swift in Sources */,
EBF66AC0287227F500DE0ED1 /* UIView+.swift in Sources */,
EBF66B02287227F500DE0ED1 /* NoData.swift in Sources */,
695758CA288057D700E36789 /* Config.swift in Sources */,
EB6A44F02873BED500749582 /* MainMapModel.swift in Sources */,
EB6A44EF2873BED500749582 /* MainMapRepository.swift in Sources */,
EBF66AC9287227F500DE0ED1 /* UIColor+.swift in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Literals/ImageLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ struct ImageLiterals {
static let deletePhotoBtn = UIImage(named: "btn_delete")
}

struct Coping {
static let icnTipGreen = UIImage(named: "icn_tip_check_green")
static let icnTipPink = UIImage(named: "icn_tip_check_pink")
static let imageEmpty = UIImage(named: "img_tip_empty")
static let imageRecommend = UIImage(named: "img_tip_recommend")
static let imagetasteIt = UIImage(named: "img_tip_tasteit")
}

struct MenuTab {
static let emptyCard = UIImage(named: "img_empty_card")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ enum Storyboards: String {
case reviewDetail = "ReviewDetail"
case nicknameChange = "NicknameChange"
case userWithdrawal = "UserWithdrawal"
case copingTab = "CopingTab"
}

extension UIStoryboard {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ struct I18N {
static let goScrap = "스크랩하러 가기"
}

struct Coping {
static let recommendHeader = "추천하는 이유!"
static let eatingHeader = "이렇게 드셔보세요!"
static let copingEmpty = "해당되는 카테고리에\n 관련된 외식대처법은 준비중입니다"
static let copingWait = "조금만 기다려 주세요!"
}

struct HelfmeAlert {
static let logout = "정말 로그아웃 하시겠어요?"
static let logoutContent =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_tip_check_green.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_tip_check_green@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_tip_check_green@3x.png",
"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" : "icn_tip_check_pink.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_tip_check_pink@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_tip_check_pink@3x.png",
"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" : "img_tip_Tasteit.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "img_tip_Tasteit@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "img_tip_Tasteit@3x.png",
"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" : "img_tip_empty.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "img_tip_empty@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "img_tip_empty@3x.png",
"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" : "img_tip_recommend.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "img_tip_recommend@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "img_tip_recommend@3x.png",
"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" : "Image.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Image@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Image@3x.png",
"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" : "btn_delete.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "btn_delete@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "btn_delete@3x.png",
"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" : "icn_pick.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_pick@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_pick@3x.png",
"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.
Loading