Skip to content

Commit affc4f9

Browse files
cchanmicchanmi
authored
Merge pull request #11 from Nexters/chore/design-system
[CHORE] 디자인 시스템 토큰(Color/Typography/Spacing/Radius) 추가
2 parents b81ed51 + 8cd5ac1 commit affc4f9

47 files changed

Lines changed: 1210 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,6 @@ iOSInjectionProject/
142142

143143
Tools/EmotionModelConversion/.venv/
144144
Tools/EmotionModelConversion/output/
145+
146+
# git-lfs가 core.hooksPath(.githooks)에 로컬로 자동 생성하는 훅 (git lfs install 실행 시 생성, 버전관리 대상 아님)
147+
.githooks/pre-push

‎GAMSS.xcodeproj/project.pbxproj‎

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
BA7748118B0D2759E0F6A207 /* Pods_GAMSSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1CC8FA289575E4B98C41539 /* Pods_GAMSSTests.framework */; };
2626
C63AB33F1424E4237FF76F6B /* DiarySummaryErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162D28B313B7D3B6D79FE039 /* DiarySummaryErrorTests.swift */; };
2727
E3A3BE7330A1CCAB9E144B41 /* DefaultEmotionAnalysisRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B816EE4A02D0B23C50F35FF9 /* DefaultEmotionAnalysisRepositoryTests.swift */; };
28+
F1D4E5A20F2B3C4D5E6F7A8B /* SpacingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2D4E5A30F2B3C4D5E6F7A8C /* SpacingTests.swift */; };
29+
F2D4E5A40F2B3C4D5E6F7A9D /* RadiusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D4E5A50F2B3C4D5E6F7A9E /* RadiusTests.swift */; };
30+
DC1369FEAE93D794107D5373 /* Color_GAMSSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 596EE0F239D37460A7BA389D /* Color_GAMSSTests.swift */; };
31+
CC3333333333333333333333 /* FontWeightTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB2222222222222222222222 /* FontWeightTests.swift */; };
32+
EE5555555555555555555555 /* TypographyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4444444444444444444444 /* TypographyTests.swift */; };
2833
/* End PBXBuildFile section */
2934

3035
/* Begin PBXContainerItemProxy section */
@@ -51,6 +56,11 @@
5156
BAEBF9C5ED345443E4A4BED7 /* DefaultSummarizeDiaryUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultSummarizeDiaryUseCaseTests.swift; sourceTree = "<group>"; };
5257
BECB25622D5F9ADA8FA5E5B6 /* Pods-GAMSS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GAMSS.release.xcconfig"; path = "Target Support Files/Pods-GAMSS/Pods-GAMSS.release.xcconfig"; sourceTree = "<group>"; };
5358
C6E353FF7D86EAC9E125F484 /* DefaultAnalyzeEmotionUseCaseTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DefaultAnalyzeEmotionUseCaseTests.swift; sourceTree = "<group>"; };
59+
C2D4E5A30F2B3C4D5E6F7A8C /* SpacingTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SpacingTests.swift; sourceTree = "<group>"; };
60+
C3D4E5A50F2B3C4D5E6F7A9E /* RadiusTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RadiusTests.swift; sourceTree = "<group>"; };
61+
596EE0F239D37460A7BA389D /* Color_GAMSSTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Color_GAMSSTests.swift; sourceTree = "<group>"; };
62+
BB2222222222222222222222 /* FontWeightTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FontWeightTests.swift; sourceTree = "<group>"; };
63+
DD4444444444444444444444 /* TypographyTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TypographyTests.swift; sourceTree = "<group>"; };
5464
CEB4219C48B0B2A51FA9457C /* EmotionTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = EmotionTests.swift; sourceTree = "<group>"; };
5565
D4BE9D664889F13369325DC9 /* sample_sentences.json */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.json; path = sample_sentences.json; sourceTree = "<group>"; };
5666
E7BE3E28AC7871B572DD4B7E /* Pods-GAMSSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GAMSSTests.release.xcconfig"; path = "Target Support Files/Pods-GAMSSTests/Pods-GAMSSTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -106,6 +116,42 @@
106116
/* End PBXFrameworksBuildPhase section */
107117

108118
/* Begin PBXGroup section */
119+
01A4E5A70F2B3C4D5E6F7AB0 /* Core */ = {
120+
isa = PBXGroup;
121+
children = (
122+
01D4E5A60F2B3C4D5E6F7AAF /* DesignSystem */,
123+
);
124+
path = Core;
125+
sourceTree = "<group>";
126+
};
127+
01D4E5A60F2B3C4D5E6F7AAF /* DesignSystem */ = {
128+
isa = PBXGroup;
129+
children = (
130+
C2D4E5A30F2B3C4D5E6F7A8C /* SpacingTests.swift */,
131+
C3D4E5A50F2B3C4D5E6F7A9E /* RadiusTests.swift */,
132+
AA3FCF8B76B94F07F0F84F64 /* Colors */,
133+
AA1111111111111111111111 /* Typography */,
134+
);
135+
path = DesignSystem;
136+
sourceTree = "<group>";
137+
};
138+
AA3FCF8B76B94F07F0F84F64 /* Colors */ = {
139+
isa = PBXGroup;
140+
children = (
141+
596EE0F239D37460A7BA389D /* Color_GAMSSTests.swift */,
142+
);
143+
path = Colors;
144+
sourceTree = "<group>";
145+
};
146+
AA1111111111111111111111 /* Typography */ = {
147+
isa = PBXGroup;
148+
children = (
149+
BB2222222222222222222222 /* FontWeightTests.swift */,
150+
DD4444444444444444444444 /* TypographyTests.swift */,
151+
);
152+
path = Typography;
153+
sourceTree = "<group>";
154+
};
109155
01F0B560E9B57E72D3F1E993 /* Sources */ = {
110156
isa = PBXGroup;
111157
children = (
@@ -140,6 +186,7 @@
140186
isa = PBXGroup;
141187
children = (
142188
7674D757C326ABEDB6302AA6 /* GAMSSTests.swift */,
189+
01A4E5A70F2B3C4D5E6F7AB0 /* Core */,
143190
EFFEB6B04B94488D8B385CA9 /* Domain */,
144191
EAEA5FB8FF3DB8F303B34C67 /* Data */,
145192
086A8E92FA56831BF52BA539 /* Fixtures */,
@@ -485,6 +532,11 @@
485532
7171BAFFE141BFB241321110 /* DefaultSummarizeDiaryUseCaseTests.swift in Sources */,
486533
1D8DF6DFC7E7383B9B8C5850 /* DefaultDiarySummaryRepositoryTests.swift in Sources */,
487534
44668B62F14343DDBC28C579 /* SummaryTestViewModelTests.swift in Sources */,
535+
F1D4E5A20F2B3C4D5E6F7A8B /* SpacingTests.swift in Sources */,
536+
F2D4E5A40F2B3C4D5E6F7A9D /* RadiusTests.swift in Sources */,
537+
DC1369FEAE93D794107D5373 /* Color_GAMSSTests.swift in Sources */,
538+
CC3333333333333333333333 /* FontWeightTests.swift in Sources */,
539+
EE5555555555555555555555 /* TypographyTests.swift in Sources */,
488540
);
489541
runOnlyForDeploymentPostprocessing = 0;
490542
};
@@ -504,7 +556,7 @@
504556
isa = XCBuildConfiguration;
505557
buildSettings = {
506558
ALWAYS_SEARCH_USER_PATHS = NO;
507-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
559+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
508560
CLANG_ANALYZER_NONNULL = YES;
509561
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
510562
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -567,7 +619,7 @@
567619
isa = XCBuildConfiguration;
568620
buildSettings = {
569621
ALWAYS_SEARCH_USER_PATHS = NO;
570-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
622+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
571623
CLANG_ANALYZER_NONNULL = YES;
572624
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
573625
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";

‎GAMSS/Info.plist‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,12 @@
44
<dict>
55
<key>FIREBASE_CRASHLYTICS_COLLECTION_ENABLED</key>
66
<string>NO</string>
7+
<key>UIAppFonts</key>
8+
<array>
9+
<string>Pretendard-Regular.otf</string>
10+
<string>Pretendard-Medium.otf</string>
11+
<string>Pretendard-SemiBold.otf</string>
12+
<string>Pretendard-Bold.otf</string>
13+
</array>
714
</dict>
815
</plist>

‎GAMSS/Resources/Assets.xcassets/Colors/Base/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info": {
3+
"author": "xcode",
4+
"version": 1
5+
}
6+
}

‎GAMSS/Resources/Assets.xcassets/Colors/Base/colorBlack.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors": [
3+
{
4+
"color": {
5+
"color-space": "srgb",
6+
"components": {
7+
"alpha": "1.000",
8+
"blue": "0x00",
9+
"green": "0x00",
10+
"red": "0x00"
11+
}
12+
},
13+
"idiom": "universal"
14+
}
15+
],
16+
"info": {
17+
"author": "xcode",
18+
"version": 1
19+
}
20+
}

‎GAMSS/Resources/Assets.xcassets/Colors/Base/colorWhite.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors": [
3+
{
4+
"color": {
5+
"color-space": "srgb",
6+
"components": {
7+
"alpha": "1.000",
8+
"blue": "0xFF",
9+
"green": "0xFF",
10+
"red": "0xFF"
11+
}
12+
},
13+
"idiom": "universal"
14+
}
15+
],
16+
"info": {
17+
"author": "xcode",
18+
"version": 1
19+
}
20+
}

‎GAMSS/Resources/Assets.xcassets/Colors/Chromatic/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info": {
3+
"author": "xcode",
4+
"version": 1
5+
}
6+
}

‎GAMSS/Resources/Assets.xcassets/Colors/Chromatic/colorApricot.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors": [
3+
{
4+
"color": {
5+
"color-space": "srgb",
6+
"components": {
7+
"alpha": "1.000",
8+
"blue": "0x56",
9+
"green": "0x6F",
10+
"red": "0xFB"
11+
}
12+
},
13+
"idiom": "universal"
14+
}
15+
],
16+
"info": {
17+
"author": "xcode",
18+
"version": 1
19+
}
20+
}

‎GAMSS/Resources/Assets.xcassets/Colors/Chromatic/colorGreen.colorset/Contents.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors": [
3+
{
4+
"color": {
5+
"color-space": "srgb",
6+
"components": {
7+
"alpha": "1.000",
8+
"blue": "0x7C",
9+
"green": "0xAF",
10+
"red": "0x36"
11+
}
12+
},
13+
"idiom": "universal"
14+
},
15+
{
16+
"color": {
17+
"color-space": "srgb",
18+
"components": {
19+
"alpha": "1.000",
20+
"blue": "0x98",
21+
"green": "0xDB",
22+
"red": "0x3B"
23+
}
24+
},
25+
"idiom": "universal",
26+
"appearances": [
27+
{
28+
"appearance": "luminosity",
29+
"value": "dark"
30+
}
31+
]
32+
}
33+
],
34+
"info": {
35+
"author": "xcode",
36+
"version": 1
37+
}
38+
}

‎GAMSS/Resources/Assets.xcassets/Colors/Chromatic/colorPink.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors": [
3+
{
4+
"color": {
5+
"color-space": "srgb",
6+
"components": {
7+
"alpha": "1.000",
8+
"blue": "0x9A",
9+
"green": "0x7E",
10+
"red": "0xFF"
11+
}
12+
},
13+
"idiom": "universal"
14+
}
15+
],
16+
"info": {
17+
"author": "xcode",
18+
"version": 1
19+
}
20+
}

0 commit comments

Comments
 (0)