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

[Add] #15 - Color 추가 #18

Merged
merged 2 commits into from
Jul 7, 2022
Merged

[Add] #15 - Color 추가 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1036776
[Add] #15 - Color 추가
0inn Jul 7, 2022
c19e834
Merge branch 'develop' into feature/#15
0inn Jul 7, 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
4 changes: 4 additions & 0 deletions HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
3BCC441E28745FD800661A12 /* SocialLoginVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BCC441D28745FD800661A12 /* SocialLoginVC.swift */; };
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 */; };
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 @@ -105,6 +106,7 @@
3BCC441D28745FD800661A12 /* SocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialLoginVC.swift; sourceTree = "<group>"; };
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>"; };
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 @@ -340,6 +342,7 @@
isa = PBXGroup;
children = (
EBF66A69287227F500DE0ED1 /* Assets.xcassets */,
A9E593CE2876C26900B0F8B5 /* Color.xcassets */,
EBF66A6A287227F500DE0ED1 /* Fonts */,
);
path = Resources;
Expand Down Expand Up @@ -706,6 +709,7 @@
3B0B25562876BBE400950539 /* Pretendard-Regular.otf in Resources */,
EBF66AD0287227F500DE0ED1 /* Assets.xcassets in Resources */,
EBF66AD2287227F500DE0ED1 /* LaunchScreen.storyboard in Resources */,
A9E593CF2876C26900B0F8B5 /* Color.xcassets in Resources */,
EBF66AD1287227F500DE0ED1 /* NotoSansSC-Bold.otf in Resources */,
EBF66AE9287227F500DE0ED1 /* PostDetail.storyboard in Resources */,
3B0B25592876BBE400950539 /* NotoSansCJKkr-Medium.otf in Resources */,
Expand Down
44 changes: 20 additions & 24 deletions HealthFoodMe/HealthFoodMe/Global/Extension/Design/UIColor+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,43 @@ import UIKit

extension UIColor {

@nonobjc class var carrotWhite: UIColor {
return UIColor(white: 1.0, alpha: 1.0)
@nonobjc class var mainRed: UIColor {
return UIColor(red: 255.0 / 255.0, green: 80.0 / 255.0, blue: 80.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotBlack: UIColor {
return UIColor(red: 27.0 / 255.0, green: 26.0 / 255.0, blue: 31.0 / 255.0, alpha: 1.0)
@nonobjc class var mainGreen: UIColor {
return UIColor(red: 167.0 / 255.0, green: 208.0 / 255.0, blue: 0.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotButtonOrange: UIColor {
return UIColor(red: 254.0 / 126.0, green: 126.0 / 255.0, blue: 53.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeBlack: UIColor {
return UIColor(red: 34.0 / 255.0, green: 34.0 / 255.0, blue: 34.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotTextOrange: UIColor {
return UIColor(red: 241.0 / 255.0, green: 132.0 / 255.0, blue: 79.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeGray1: UIColor {
return UIColor(red: 102.0 / 255.0, green: 102.0 / 255.0, blue: 102.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotBlue: UIColor {
return UIColor(red: 21.0 / 255.0, green: 105.0 / 255.0, blue: 184.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeGray2: UIColor {
return UIColor(red: 153.0 / 255.0, green: 153.0 / 255.0, blue: 153.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotDeepGray: UIColor {
return UIColor(red: 49.0 / 255.0, green: 49.0 / 255.0, blue: 49.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeTagGray: UIColor {
return UIColor(red: 206.0 / 255.0, green: 206.0 / 255.0, blue: 206.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotDarkLightGray: UIColor {
return UIColor(red: 132.0 / 255.0, green: 136.0 / 255.0, blue: 146.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeLineGray: UIColor {
return UIColor(red: 227.0 / 255.0, green: 227.0 / 255.0, blue: 227.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotLineGray: UIColor {
return UIColor(red: 169.0 / 255.0, green: 169.0 / 255.0, blue: 169.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeInactiveGray: UIColor {
return UIColor(red: 242.0 / 255.0, green: 242.0 / 255.0, blue: 242.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotSquareGray: UIColor {
return UIColor(red: 226.0 / 255.0, green: 226.0 / 255.0, blue: 228.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeBgGray: UIColor {
return UIColor(red: 246.0 / 255.0, green: 246.0 / 255.0, blue: 246.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotSquareLightGray: UIColor {
return UIColor(red: 227.0 / 255.0, green: 226.0 / 255.0, blue: 231.0 / 255.0, alpha: 1.0)
}

@nonobjc class var carrotLineLightGray: UIColor {
return UIColor(red: 240.0 / 255.0, green: 240.0 / 255.0, blue: 240.0 / 255.0, alpha: 1.0)
@nonobjc class var helfmeWhite: UIColor {
return UIColor(red: 255.0 / 255.0, green: 255.0 / 255.0, blue: 255.0 / 255.0, alpha: 1.0)
}
}
6 changes: 6 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Resources/Color.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...thFoodMe/HealthFoodMe/Global/Resources/Color.xcassets/helfmeBgGray.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "246",
"green" : "246",
"red" : "246"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Resources/Color.xcassets/helfmeBlack.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "34",
"green" : "34",
"red" : "34"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Resources/Color.xcassets/helfmeGray1.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "102",
"green" : "102",
"red" : "102"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions HealthFoodMe/HealthFoodMe/Global/Resources/Color.xcassets/helfmeGray2.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "153",
"green" : "153",
"red" : "153"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...Me/HealthFoodMe/Global/Resources/Color.xcassets/helfmeInactiveGray.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "242",
"green" : "242",
"red" : "242"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...FoodMe/HealthFoodMe/Global/Resources/Color.xcassets/helfmeLineGray.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "227",
"green" : "227",
"red" : "227"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions ...hFoodMe/HealthFoodMe/Global/Resources/Color.xcassets/helfmeTagGray.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "206",
"green" : "206",
"red" : "206"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading