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

Set [#3] design system 구축 #4

Merged
merged 3 commits into from
Dec 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 44 additions & 4 deletions HMH_iOS/HMH_iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
0B8A89B92B369F1C00688BA6 /* D.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B8A89B82B369F1C00688BA6 /* D.swift */; };
0B8A89BC2B369F2D00688BA6 /* UIView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B8A89BB2B369F2D00688BA6 /* UIView+.swift */; };
0B8A89BE2B369F7C00688BA6 /* E.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B8A89BD2B369F7C00688BA6 /* E.swift */; };
0B8A89C22B369F9400688BA6 /* G.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B8A89C12B369F9400688BA6 /* G.swift */; };
0B8A89C42B369FA000688BA6 /* F.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B8A89C32B369FA000688BA6 /* F.swift */; };
0B8A89C62B369FA800688BA6 /* H.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B8A89C52B369FA800688BA6 /* H.swift */; };
36A3D8912B36CF32007EA272 /* Literal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A3D8902B36CF31007EA272 /* Literal.swift */; };
Expand All @@ -45,6 +44,17 @@
36A3D9B82B3EBC3B007EA272 /* UILabel+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A3D9B72B3EBC3B007EA272 /* UILabel+.swift */; };
36A3D9BA2B3EBC65007EA272 /* UIButton+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A3D9B92B3EBC65007EA272 /* UIButton+.swift */; };
36A3D9BC2B3EBD2D007EA272 /* UIScreen+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A3D9BB2B3EBD2D007EA272 /* UIScreen+.swift */; };
36A3D9BE2B409BCC007EA272 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A3D9BD2B409BCC007EA272 /* Color.swift */; };
36A3D9C02B409CBD007EA272 /* Font.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A3D9BF2B409CBD007EA272 /* Font.swift */; };
36A3D9CA2B409D35007EA272 /* Pretendard-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C12B409D34007EA272 /* Pretendard-Black.otf */; };
36A3D9CB2B409D35007EA272 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C22B409D34007EA272 /* Pretendard-Light.otf */; };
36A3D9CC2B409D35007EA272 /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C32B409D34007EA272 /* Pretendard-SemiBold.otf */; };
36A3D9CD2B409D35007EA272 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C42B409D35007EA272 /* Pretendard-Regular.otf */; };
36A3D9CE2B409D35007EA272 /* Pretendard-ExtraBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C52B409D35007EA272 /* Pretendard-ExtraBold.otf */; };
36A3D9CF2B409D35007EA272 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C62B409D35007EA272 /* Pretendard-Medium.otf */; };
36A3D9D02B409D35007EA272 /* Pretendard-ExtraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C72B409D35007EA272 /* Pretendard-ExtraLight.otf */; };
36A3D9D12B409D35007EA272 /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C82B409D35007EA272 /* Pretendard-Bold.otf */; };
36A3D9D22B409D35007EA272 /* Pretendard-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 36A3D9C92B409D35007EA272 /* Pretendard-Thin.otf */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -64,7 +74,6 @@
0B8A89B82B369F1C00688BA6 /* D.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = D.swift; sourceTree = "<group>"; };
0B8A89BB2B369F2D00688BA6 /* UIView+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+.swift"; sourceTree = "<group>"; };
0B8A89BD2B369F7C00688BA6 /* E.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E.swift; sourceTree = "<group>"; };
0B8A89C12B369F9400688BA6 /* G.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = G.swift; sourceTree = "<group>"; };
0B8A89C32B369FA000688BA6 /* F.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = F.swift; sourceTree = "<group>"; };
0B8A89C52B369FA800688BA6 /* H.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = H.swift; sourceTree = "<group>"; };
36A3D8902B36CF31007EA272 /* Literal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Literal.swift; sourceTree = "<group>"; };
Expand All @@ -73,6 +82,17 @@
36A3D9B72B3EBC3B007EA272 /* UILabel+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+.swift"; sourceTree = "<group>"; };
36A3D9B92B3EBC65007EA272 /* UIButton+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+.swift"; sourceTree = "<group>"; };
36A3D9BB2B3EBD2D007EA272 /* UIScreen+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScreen+.swift"; sourceTree = "<group>"; };
36A3D9BD2B409BCC007EA272 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
36A3D9BF2B409CBD007EA272 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
36A3D9C12B409D34007EA272 /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = "<group>"; };
36A3D9C22B409D34007EA272 /* Pretendard-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Light.otf"; sourceTree = "<group>"; };
36A3D9C32B409D34007EA272 /* Pretendard-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-SemiBold.otf"; sourceTree = "<group>"; };
36A3D9C42B409D35007EA272 /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
36A3D9C52B409D35007EA272 /* Pretendard-ExtraBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-ExtraBold.otf"; sourceTree = "<group>"; };
36A3D9C62B409D35007EA272 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
36A3D9C72B409D35007EA272 /* Pretendard-ExtraLight.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-ExtraLight.otf"; sourceTree = "<group>"; };
36A3D9C82B409D35007EA272 /* Pretendard-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Bold.otf"; sourceTree = "<group>"; };
36A3D9C92B409D35007EA272 /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -235,6 +255,8 @@
0B8A899F2B369D6E00688BA6 /* Resources */ = {
isa = PBXGroup;
children = (
36A3D9BD2B409BCC007EA272 /* Color.swift */,
36A3D9BF2B409CBD007EA272 /* Font.swift */,
0B8A89A02B369D7700688BA6 /* Font */,
0B50F9D32B369815000C5046 /* Assets.xcassets */,
);
Expand All @@ -244,7 +266,15 @@
0B8A89A02B369D7700688BA6 /* Font */ = {
isa = PBXGroup;
children = (
0B8A89C12B369F9400688BA6 /* G.swift */,
36A3D9C12B409D34007EA272 /* Pretendard-Black.otf */,
36A3D9C82B409D35007EA272 /* Pretendard-Bold.otf */,
36A3D9C52B409D35007EA272 /* Pretendard-ExtraBold.otf */,
36A3D9C72B409D35007EA272 /* Pretendard-ExtraLight.otf */,
36A3D9C22B409D34007EA272 /* Pretendard-Light.otf */,
36A3D9C62B409D35007EA272 /* Pretendard-Medium.otf */,
36A3D9C42B409D35007EA272 /* Pretendard-Regular.otf */,
36A3D9C32B409D34007EA272 /* Pretendard-SemiBold.otf */,
36A3D9C92B409D35007EA272 /* Pretendard-Thin.otf */,
);
path = Font;
sourceTree = "<group>";
Expand Down Expand Up @@ -412,7 +442,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
36A3D9D02B409D35007EA272 /* Pretendard-ExtraLight.otf in Resources */,
36A3D9D12B409D35007EA272 /* Pretendard-Bold.otf in Resources */,
0B50F9D72B369815000C5046 /* LaunchScreen.storyboard in Resources */,
36A3D9CD2B409D35007EA272 /* Pretendard-Regular.otf in Resources */,
36A3D9CE2B409D35007EA272 /* Pretendard-ExtraBold.otf in Resources */,
36A3D9CF2B409D35007EA272 /* Pretendard-Medium.otf in Resources */,
36A3D9CB2B409D35007EA272 /* Pretendard-Light.otf in Resources */,
36A3D9CC2B409D35007EA272 /* Pretendard-SemiBold.otf in Resources */,
36A3D9CA2B409D35007EA272 /* Pretendard-Black.otf in Resources */,
36A3D9D22B409D35007EA272 /* Pretendard-Thin.otf in Resources */,
0B50F9D42B369815000C5046 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -427,7 +466,7 @@
0B50F9CF2B369813000C5046 /* HomeViewController.swift in Sources */,
0B8A89BC2B369F2D00688BA6 /* UIView+.swift in Sources */,
0B8A89AF2B369E4300688BA6 /* HomeModel.swift in Sources */,
0B8A89C22B369F9400688BA6 /* G.swift in Sources */,
36A3D9C02B409CBD007EA272 /* Font.swift in Sources */,
0B8A89BE2B369F7C00688BA6 /* E.swift in Sources */,
36A3D9B82B3EBC3B007EA272 /* UILabel+.swift in Sources */,
36A3D8912B36CF32007EA272 /* Literal.swift in Sources */,
Expand All @@ -437,6 +476,7 @@
0B8A89B92B369F1C00688BA6 /* D.swift in Sources */,
0B8A89AD2B369E3B00688BA6 /* HomeCell.swift in Sources */,
0B8A89C62B369FA800688BA6 /* H.swift in Sources */,
36A3D9BE2B409BCC007EA272 /* Color.swift in Sources */,
0B8A89B52B369F0100688BA6 /* B.swift in Sources */,
0B8A89B12B369E4C00688BA6 /* HomeView.swift in Sources */,
36A3D9B62B3EBBF7007EA272 /* Adjust+.swift in Sources */,
Expand Down
69 changes: 69 additions & 0 deletions HMH_iOS/HMH_iOS/Global/Resources/Color.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//
// Color.swift
// HMH_iOS
//
// Created by 지희의 MAC on 12/31/23.
//

import UIKit

extension UIColor {

@nonobjc class var background: UIColor {
return UIColor(red: 23.0 / 255.0, green: 23.0 / 255.0, blue: 27.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray7: UIColor {
return UIColor(red: 27.0 / 255.0, green: 27.0 / 255.0, blue: 35.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray6: UIColor {
return UIColor(red: 32.0 / 255.0, green: 32.0 / 255.0, blue: 40.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray5: UIColor {
return UIColor(red: 39.0 / 255.0, green: 41.0 / 255.0, blue: 52.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray4: UIColor {
return UIColor(red: 54.0 / 255.0, green: 57.0 / 255.0, blue: 72.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray3: UIColor {
return UIColor(red: 61.0 / 255.0, green: 63.0 / 255.0, blue: 77.0 / 255.0, alpha: 1.0)
}

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

@nonobjc class var gray1: UIColor {
return UIColor(red: 141.0 / 255.0, green: 141.0 / 255.0, blue: 159.0 / 255.0, alpha: 1.0)
}

@nonobjc class var whiteText: UIColor {
return UIColor(red: 219.0 / 255.0, green: 218.0 / 255.0, blue: 231.0 / 255.0, alpha: 1.0)
}

@nonobjc class var whiteBtn: UIColor {
return UIColor(red: 235.0 / 255.0, green: 236.0 / 255.0, blue: 244.0 / 255.0, alpha: 1.0)
}

@nonobjc class var bluePurpleButton: UIColor {
return UIColor(red: 61.0 / 255.0, green: 23.0 / 255.0, blue: 211.0 / 255.0, alpha: 1.0)
}

@nonobjc class var bluePurpleLine: UIColor {
return UIColor(red: 70.0 / 255.0, green: 30.0 / 255.0, blue: 231.0 / 255.0, alpha: 1.0)
}

@nonobjc class var bluePurpleProgress: UIColor {
return UIColor(red: 68.0 / 255.0, green: 40.0 / 255.0, blue: 236.0 / 255.0, alpha: 1.0)
}

@nonobjc class var bluePurpleActive: UIColor {
return UIColor(red: 43.0 / 255.0, green: 29.0 / 255.0, blue: 214.0 / 255.0, alpha: 0.22)
}

}

92 changes: 92 additions & 0 deletions HMH_iOS/HMH_iOS/Global/Resources/Font.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
//
// Font.swift
// HMH_iOS
//
// Created by 지희의 MAC on 12/31/23.
//

import UIKit

extension UIFont {

class var iosTitle1Semibold22: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 22.0)!
}

class var iosText1Medium22: UIFont {
return UIFont(name: "Pretendard-Medium", size: 22.0)!
}

class var androidTitle1Semibold21: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 21.0)!
}

class var androidText1Medium21: UIFont {
return UIFont(name: "Pretendard-Medium", size: 21.0)!
}

class var iosTitle2Semibold20: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 20.0)!
}

class var iosText2Medium20: UIFont {
return UIFont(name: "Pretendard-Medium", size: 20.0)!
}

class var androidTitle2Semibold19: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 19.0)!
}

class var androidText2Medium19: UIFont {
return UIFont(name: "Pretendard-Medium", size: 19.0)!
}

class var iosText3Semibold18: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 18.0)!
}

class var androidText3Semibold17: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 17.0)!
}

class var iosText4Semibold16: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 16.0)!
}

class var iosText5Medium16: UIFont {
return UIFont(name: "Pretendard-Medium", size: 16.0)!
}

class var androidText4Semibold15: UIFont {
return UIFont(name: "Pretendard-SemiBold", size: 15.0)!
}

class var androidText5Medium15: UIFont {
return UIFont(name: "Pretendard-Medium", size: 15.0)!
}

class var iosText6Medium14: UIFont {
return UIFont(name: "Pretendard-Medium", size: 14.0)!
}

class var iosDetail1Regular14: UIFont {
return UIFont(name: "Pretendard-Regular", size: 14.0)!
}

class var androidText6Medium13: UIFont {
return UIFont(name: "Pretendard-Medium", size: 13.0)!
}

class var androidDetailRegular13: UIFont {
return UIFont(name: "Pretendard-Regular", size: 13.0)!
}

class var iosDetail2Medium12: UIFont {
return UIFont(name: "Pretendard-Medium", size: 12.0)!
}

class var androidDetail2Medium11: UIFont {
return UIFont(name: "Pretendard-Medium", size: 11.0)!
}

}
8 changes: 0 additions & 8 deletions HMH_iOS/HMH_iOS/Global/Resources/Font/G.swift

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions HMH_iOS/HMH_iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIAppFonts</key>
<array>
<string>Pretendard-Black.otf</string>
<string>Pretendard-Bold.otf</string>
<string>Pretendard-ExtraBold.otf</string>
<string>Pretendard-ExtraLight.otf</string>
<string>Pretendard-Light.otf</string>
<string>Pretendard-Medium.otf</string>
<string>Pretendard-Regular.otf</string>
<string>Pretendard-SemiBold.otf</string>
<string>Pretendard-Thin.otf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down