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] #3 - 검색 UI 구현 #27

Merged
merged 15 commits into from
Jul 12, 2022
Merged
72 changes: 72 additions & 0 deletions HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
3BCC442028745FE500661A12 /* SocialLogin.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3BCC441F28745FE500661A12 /* SocialLogin.storyboard */; };
6005A822AEB1A47010D6C01E /* Pods_HealthFoodMe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEDECAEA3BF2AEAD960B4B3C /* Pods_HealthFoodMe.framework */; };
A9E593CF2876C26900B0F8B5 /* Color.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9E593CE2876C26900B0F8B5 /* Color.xcassets */; };
A9525F712873E1750065EB1D /* SearchVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9525F702873E1750065EB1D /* SearchVC.swift */; };
A9E593C42874104200B0F8B5 /* SearchRecentTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E593C32874104200B0F8B5 /* SearchRecentTVC.swift */; };
A9E593C72874266200B0F8B5 /* SearchRecent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E593C62874266200B0F8B5 /* SearchRecent.swift */; };
A9E593CD2875ED7900B0F8B5 /* Search.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9E593CC2875ED7900B0F8B5 /* Search.storyboard */; };
EB6A44C7287366DF00749582 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = EB6A44C6287366DF00749582 /* .swiftlint.yml */; };
EBF66ABC287227F500DE0ED1 /* UserDefaults+.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBF66A51287227F500DE0ED1 /* UserDefaults+.swift */; };
EBF66ABD287227F500DE0ED1 /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBF66A53287227F500DE0ED1 /* UIDevice+.swift */; };
Expand Down Expand Up @@ -107,6 +111,10 @@
3BCC441F28745FE500661A12 /* SocialLogin.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SocialLogin.storyboard; sourceTree = "<group>"; };
75E42041F59816FF5154CDD3 /* Pods-HealthFoodMe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HealthFoodMe.debug.xcconfig"; path = "Target Support Files/Pods-HealthFoodMe/Pods-HealthFoodMe.debug.xcconfig"; sourceTree = "<group>"; };
A9E593CE2876C26900B0F8B5 /* Color.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Color.xcassets; sourceTree = "<group>"; };
A9525F702873E1750065EB1D /* SearchVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchVC.swift; sourceTree = "<group>"; };
A9E593C32874104200B0F8B5 /* SearchRecentTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRecentTVC.swift; sourceTree = "<group>"; };
A9E593C62874266200B0F8B5 /* SearchRecent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchRecent.swift; sourceTree = "<group>"; };
A9E593CC2875ED7900B0F8B5 /* Search.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Search.storyboard; sourceTree = "<group>"; };
DEDECAEA3BF2AEAD960B4B3C /* Pods_HealthFoodMe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HealthFoodMe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
EB085ED628716E1900361837 /* HealthFoodMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HealthFoodMe.app; sourceTree = BUILT_PRODUCTS_DIR; };
EB085EE728716E1B00361837 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -232,6 +240,65 @@
path = VC;
sourceTree = "<group>";
};
A9525F6A2873DCD30065EB1D /* SearchScene */ = {
isa = PBXGroup;
children = (
A9E593C52874263500B0F8B5 /* Object */,
A9525F6B2873DCFE0065EB1D /* VC */,
A9525F6F2873DD1A0065EB1D /* ViewModel */,
A9525F6E2873DD160065EB1D /* Cells */,
A9525F6D2873DD120065EB1D /* Layout */,
A9525F6C2873DD0B0065EB1D /* Views */,
);
path = SearchScene;
sourceTree = "<group>";
};
A9525F6B2873DCFE0065EB1D /* VC */ = {
isa = PBXGroup;
children = (
A9525F702873E1750065EB1D /* SearchVC.swift */,
A9E593CC2875ED7900B0F8B5 /* Search.storyboard */,
);
path = VC;
sourceTree = "<group>";
};
A9525F6C2873DD0B0065EB1D /* Views */ = {
isa = PBXGroup;
children = (
);
path = Views;
sourceTree = "<group>";
};
A9525F6D2873DD120065EB1D /* Layout */ = {
isa = PBXGroup;
children = (
);
path = Layout;
sourceTree = "<group>";
};
A9525F6E2873DD160065EB1D /* Cells */ = {
isa = PBXGroup;
children = (
A9E593C32874104200B0F8B5 /* SearchRecentTVC.swift */,
);
path = Cells;
sourceTree = "<group>";
};
A9525F6F2873DD1A0065EB1D /* ViewModel */ = {
isa = PBXGroup;
children = (
);
path = ViewModel;
sourceTree = "<group>";
};
A9E593C52874263500B0F8B5 /* Object */ = {
isa = PBXGroup;
children = (
A9E593C62874266200B0F8B5 /* SearchRecent.swift */,
);
path = Object;
sourceTree = "<group>";
};
E3F60CBC9B890A7FB4D4AAAF /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -498,6 +565,7 @@
isa = PBXGroup;
children = (
EBF66A92287227F500DE0ED1 /* PostDetailScene */,
A9525F6A2873DCD30065EB1D /* SearchScene */,
);
path = Home;
sourceTree = "<group>";
Expand Down Expand Up @@ -711,6 +779,7 @@
EBF66AD2287227F500DE0ED1 /* LaunchScreen.storyboard in Resources */,
A9E593CF2876C26900B0F8B5 /* Color.xcassets in Resources */,
EBF66AD1287227F500DE0ED1 /* NotoSansSC-Bold.otf in Resources */,
A9E593CD2875ED7900B0F8B5 /* Search.storyboard in Resources */,
EBF66AE9287227F500DE0ED1 /* PostDetail.storyboard in Resources */,
3B0B25592876BBE400950539 /* NotoSansCJKkr-Medium.otf in Resources */,
);
Expand Down Expand Up @@ -831,6 +900,7 @@
EBF66AE3287227F500DE0ED1 /* NetworkResult.swift in Sources */,
EBF66AF5287227F500DE0ED1 /* Logger.swift in Sources */,
EBF66ACB287227F500DE0ED1 /* String+.swift in Sources */,
A9E593C72874266200B0F8B5 /* SearchRecent.swift in Sources */,
EBF66AEA287227F500DE0ED1 /* PostContentCVC.swift in Sources */,
EBF66AF2287227F500DE0ED1 /* buttonPress.swift in Sources */,
EBF66ADF287227F500DE0ED1 /* AuthRouter.swift in Sources */,
Expand All @@ -844,6 +914,7 @@
EBF66AED287227F500DE0ED1 /* PostDetailVC.swift in Sources */,
EBF66AE0287227F500DE0ED1 /* EventLogger.swift in Sources */,
EBF66AC7287227F500DE0ED1 /* UITableView+.swift in Sources */,
A9525F712873E1750065EB1D /* SearchVC.swift in Sources */,
EBF66ACC287227F500DE0ED1 /* BaseNotiList.swift in Sources */,
EBF66AD8287227F500DE0ED1 /* BaseControllable.swift in Sources */,
EBF66ABF287227F500DE0ED1 /* UITabBar+.swift in Sources */,
Expand All @@ -853,6 +924,7 @@
EBF66AEB287227F500DE0ED1 /* PostImageCVC.swift in Sources */,
EBF66B00287227F500DE0ED1 /* Adjusted+.swift in Sources */,
EBF66AE8287227F500DE0ED1 /* PostDetailViewModel.swift in Sources */,
A9E593C42874104200B0F8B5 /* SearchRecentTVC.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
11 changes: 11 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Literals/ImageLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,15 @@ struct ImageLiterals {
struct PostWrite {

}

struct Search {
static let deleteBtn = UIImage(named: "btn_delete")
static let textDeleteBtn = UIImage(named: "btn_textdelete")
static let dietIcon = UIImage(named: "icn_diet")
static let normalIcon = UIImage(named: "icn_normal")
static let star1Icon = UIImage(named: "icn_star_01")
static let star2Icon = UIImage(named: "icn_star_02")
static let star3Icon = UIImage(named: "icn_star_03")
static let beforeIcon = UIImage(named: "icon_before")
}
}
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" : "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" : "btn_textdelete.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "btn_textdelete@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "btn_textdelete@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_diet.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_diet@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_diet@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_normal.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_normal@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_star_01.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_star_01@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_star_01@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_star_02.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_star_02@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_star_02@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_star_03.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icn_star_03@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icn_star_03@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" : "icon_before.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_before@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_before@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