From 220959c65744a5e832bb11f39398ee5254b02250 Mon Sep 17 00:00:00 2001 From: hyeonung Seo Date: Fri, 14 Jun 2024 15:50:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20Font,=20Asset=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets.xcassets/TextColor/Contents.json | 6 +++ .../TextColor/text_0.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_01.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_02.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_03.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_04.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_05.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_06.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_07.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_08.colorset/Contents.json | 38 +++++++++++++++++++ .../TextColor/text_09.colorset/Contents.json | 38 +++++++++++++++++++ Climeet-iOS/Climeet-iOS/Fonts/Font+.swift | 8 ++++ Climeet-iOS/Climeet-iOS/Fonts/test.swift | 4 ++ 13 files changed, 398 insertions(+) create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_0.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_01.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_02.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_03.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_04.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_05.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_06.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_07.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_08.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_09.colorset/Contents.json diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_0.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_0.colorset/Contents.json new file mode 100644 index 0000000..f8ae6a8 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_0.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_01.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_01.colorset/Contents.json new file mode 100644 index 0000000..9045cbc --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_01.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF7", + "green" : "0xF7", + "red" : "0xF7" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_02.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_02.colorset/Contents.json new file mode 100644 index 0000000..9045cbc --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_02.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF7", + "green" : "0xF7", + "red" : "0xF7" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_03.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_03.colorset/Contents.json new file mode 100644 index 0000000..0c30ee1 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_03.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDF", + "green" : "0xDF", + "red" : "0xDF" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_04.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_04.colorset/Contents.json new file mode 100644 index 0000000..1207eca --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_04.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xC1", + "green" : "0xC1", + "red" : "0xC1" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_05.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_05.colorset/Contents.json new file mode 100644 index 0000000..d55076a --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_05.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xA5", + "green" : "0xA5", + "red" : "0xA5" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_06.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_06.colorset/Contents.json new file mode 100644 index 0000000..037542d --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_06.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x8B", + "green" : "0x8B", + "red" : "0x8B" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_07.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_07.colorset/Contents.json new file mode 100644 index 0000000..84ae5bc --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_07.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x6F", + "green" : "0x6F", + "red" : "0x6F" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_08.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_08.colorset/Contents.json new file mode 100644 index 0000000..5bc9d5e --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_08.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x3D", + "green" : "0x3D", + "red" : "0x3D" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_09.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_09.colorset/Contents.json new file mode 100644 index 0000000..2460688 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/TextColor/text_09.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x33", + "green" : "0x33", + "red" : "0x33" + } + }, + "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 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Fonts/Font+.swift b/Climeet-iOS/Climeet-iOS/Fonts/Font+.swift index b44db62..55a1f1b 100644 --- a/Climeet-iOS/Climeet-iOS/Fonts/Font+.swift +++ b/Climeet-iOS/Climeet-iOS/Fonts/Font+.swift @@ -21,10 +21,18 @@ extension Font { Self.custom("Pretendard-Bold", size: 20) } + static func climeetFontTitle3_5() -> Self { + Self.custom("Pretendard-SemiBold", size: 20) + } + static func climeetFontTitle4() -> Self { Self.custom("Pretendard-Bold", size: 18) } + static func climeetFontTitle4_5() -> Self { + Self.custom("Pretendard-SemiBold", size: 18) + } + static func climeetFontParagraph1() -> Self { Self.custom("Pretendard-SemiBold", size: 16) } diff --git a/Climeet-iOS/Climeet-iOS/Fonts/test.swift b/Climeet-iOS/Climeet-iOS/Fonts/test.swift index fee9acf..2b82919 100644 --- a/Climeet-iOS/Climeet-iOS/Fonts/test.swift +++ b/Climeet-iOS/Climeet-iOS/Fonts/test.swift @@ -16,8 +16,12 @@ struct test: View { .font(.climeetFontTitle2()) Text("title3 : 클라이머스") .font(.climeetFontTitle3()) + Text("title3.5 : 클라이머스") + .font(.climeetFontTitle3_5()) Text("title4 : 클라이머스") .font(.climeetFontTitle4()) + Text("title4.5 : 클라이머스") + .font(.climeetFontTitle4_5()) Text("Paragraph1 : 클라이머스") .font(.climeetFontParagraph1()) Text("Paragraph2 : 클라이머스") From 7e9a8185260763dceed18508a976d7dfa7f0ddcd Mon Sep 17 00:00:00 2001 From: hyeonung Seo Date: Fri, 14 Jun 2024 16:09:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EB=8B=A4=ED=81=AC=EB=AA=A8?= =?UTF-8?q?=EB=93=9C=20=EB=8C=80=EC=9D=91=20=EB=B0=8F=20star=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=EC=9D=98=20=EC=83=89=EC=83=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Climeet-iOS/Climeet-iOS/.DS_Store | Bin 6148 -> 6148 bytes .../climeetMainColor.colorset/Contents.json | 6 +-- .../errorTextColor.colorset/Contents.json | 6 +-- .../grayButtonColor.colorset/Contents.json | 6 +-- .../Contents.json | 6 +-- .../levelColor_black.colorset/Contents.json | 6 +-- .../levelColor_blue.colorset/Contents.json | 6 +-- .../levelColor_brown.colorset/Contents.json | 6 +-- .../Contents.json | 6 +-- .../levelColor_gray.colorset/Contents.json | 6 +-- .../levelColor_green.colorset/Contents.json | 6 +-- .../levelColor_orange.colorset/Contents.json | 6 +-- .../levelColor_pink.colorset/Contents.json | 6 +-- .../levelColor_purple.colorset/Contents.json | 6 +-- .../levelColor_red.colorset/Contents.json | 6 +-- .../levelColor_skyblue.colorset/Contents.json | 6 +-- .../levelColor_yellow.colorset/Contents.json | 6 +-- .../TextColor/text_0.colorset/Contents.json | 6 +-- .../TextColor/text_01.colorset/Contents.json | 6 +-- .../TextColor/text_02.colorset/Contents.json | 6 +-- .../TextColor/text_03.colorset/Contents.json | 6 +-- .../TextColor/text_04.colorset/Contents.json | 6 +-- .../TextColor/text_05.colorset/Contents.json | 6 +-- .../TextColor/text_06.colorset/Contents.json | 6 +-- .../TextColor/text_07.colorset/Contents.json | 6 +-- .../TextColor/text_08.colorset/Contents.json | 6 +-- .../TextColor/text_09.colorset/Contents.json | 6 +-- .../Assets.xcassets/starColor/Contents.json | 6 +++ .../star_filled.colorset/Contents.json | 38 ++++++++++++++++++ .../star_filled_eyes.colorset/Contents.json | 38 ++++++++++++++++++ .../star_notfilled.colorset/Contents.json | 38 ++++++++++++++++++ .../Contents.json | 38 ++++++++++++++++++ 32 files changed, 236 insertions(+), 78 deletions(-) create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled_eyes.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled.colorset/Contents.json create mode 100644 Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled_eyes.colorset/Contents.json diff --git a/Climeet-iOS/Climeet-iOS/.DS_Store b/Climeet-iOS/Climeet-iOS/.DS_Store index e6dd84878d6ea06fda3ff1fe0c1421d0c73ecd31..c96c270b7cd9002e292c11ea9f83914d917a4052 100644 GIT binary patch delta 374 zcmZoMXfc=|#>B)qu~2NHo}wrV0|Nsi1A_nqLkUAMgC0W#Lo!3+#)Hcl>p?R7430q2 zVun;?S%gSga8X`PeqK7n3zMJdoO?^5TM|octu9%&w$@oXp}91A}XfOw25- zZ0sED9NZkS!5R7G!6k_$rNvH(MbRK$NPd1!5{#W#pA?pvS{^ST;+&sXl9-v7S_IaS znUV@r6BC}9my%!ZlwX>cQViA{43XgACJzu~2NHo}wrt0|NsP3otOGGUPFoFeCzT=EOqv&Fah#ST-jx&tclk j&cV+C)UY{_`8)Guei2