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 : 클라이머스")