diff --git a/Climeet-iOS/Climeet-iOS/.DS_Store b/Climeet-iOS/Climeet-iOS/.DS_Store index e6dd848..c96c270 100644 Binary files a/Climeet-iOS/Climeet-iOS/.DS_Store and b/Climeet-iOS/Climeet-iOS/.DS_Store differ diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/climeetMainColor.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/climeetMainColor.colorset/Contents.json index 0121a31..63c2771 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/climeetMainColor.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/climeetMainColor.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFE" + "blue" : "0x22", + "green" : "0xDF", + "red" : "0xBE" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/errorTextColor.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/errorTextColor.colorset/Contents.json index 0c815c8..9d22dcf 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/errorTextColor.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/errorTextColor.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFE" + "blue" : "0x46", + "green" : "0x46", + "red" : "0xE6" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/grayButtonColor.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/grayButtonColor.colorset/Contents.json index 83491ad..ff1bea2 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/grayButtonColor.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/grayButtonColor.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFE" + "blue" : "0x64", + "green" : "0x64", + "red" : "0x64" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/textSpaceHolderColor.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/textSpaceHolderColor.colorset/Contents.json index daef8e3..9cf8a51 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/textSpaceHolderColor.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/CommonColor/textSpaceHolderColor.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFE" + "blue" : "0xC1", + "green" : "0xC1", + "red" : "0xC1" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_black.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_black.colorset/Contents.json index 202a1c0..be9d677 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_black.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_black.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_blue.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_blue.colorset/Contents.json index 6ac2cfb..44017bf 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_blue.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_blue.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0xFF", + "green" : "0x94", + "red" : "0x00" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_brown.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_brown.colorset/Contents.json index 91b5ee5..d5efaa1 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_brown.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_brown.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFE" + "blue" : "0x41", + "green" : "0x4C", + "red" : "0x6E" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_darkBlue.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_darkBlue.colorset/Contents.json index 83ec769..9f5b6b6 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_darkBlue.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_darkBlue.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0xD6", + "green" : "0x3F", + "red" : "0x39" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_gray.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_gray.colorset/Contents.json index 037542d..5b5786d 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_gray.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_gray.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x8B", + "green" : "0x8B", + "red" : "0x8B" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_green.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_green.colorset/Contents.json index fc7c8d7..a997633 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_green.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_green.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x5D", + "green" : "0xB7", + "red" : "0x63" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_orange.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_orange.colorset/Contents.json index 94a3ba5..0b5ad94 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_orange.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_orange.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x00", + "green" : "0x90", + "red" : "0xFF" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_pink.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_pink.colorset/Contents.json index 6551148..0b727fd 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_pink.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_pink.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0xE9", + "green" : "0x74", + "red" : "0xFF" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_purple.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_purple.colorset/Contents.json index 606d3a2..7774464 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_purple.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_purple.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0xFF", + "green" : "0x59", + "red" : "0xA2" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_red.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_red.colorset/Contents.json index 3aafb41..31e65a5 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_red.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_red.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x40", + "green" : "0x40", + "red" : "0xF3" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_skyblue.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_skyblue.colorset/Contents.json index 08ed77d..0202773 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_skyblue.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_skyblue.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0xFF", + "green" : "0xD5", + "red" : "0x74" } }, "idiom" : "universal" diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_yellow.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_yellow.colorset/Contents.json index dff32f2..f317666 100644 --- a/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_yellow.colorset/Contents.json +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/LevelColor/levelColor_yellow.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x16", + "green" : "0xDA", + "red" : "0xFD" } }, "idiom" : "universal" 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..2536dc2 --- /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" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "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..e1ce072 --- /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" : "0xF7", + "green" : "0xF7", + "red" : "0xF7" + } + }, + "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..e1ce072 --- /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" : "0xF7", + "green" : "0xF7", + "red" : "0xF7" + } + }, + "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..550be12 --- /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" : "0xDF", + "green" : "0xDF", + "red" : "0xDF" + } + }, + "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..9cf8a51 --- /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" : "0xC1", + "green" : "0xC1", + "red" : "0xC1" + } + }, + "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..be1e66f --- /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" : "0xA5", + "green" : "0xA5", + "red" : "0xA5" + } + }, + "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..5b5786d --- /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" : "0x8B", + "green" : "0x8B", + "red" : "0x8B" + } + }, + "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..66e6a52 --- /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" : "0x6F", + "green" : "0x6F", + "red" : "0x6F" + } + }, + "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..1257da3 --- /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" : "0x3D", + "green" : "0x3D", + "red" : "0x3D" + } + }, + "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..d0a3f32 --- /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" : "0x33", + "green" : "0x33", + "red" : "0x33" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled.colorset/Contents.json new file mode 100644 index 0000000..4041c67 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x35", + "green" : "0xBF", + "red" : "0xFA" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x35", + "green" : "0xBF", + "red" : "0xFA" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled_eyes.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled_eyes.colorset/Contents.json new file mode 100644 index 0000000..3b97417 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_filled_eyes.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x83", + "red" : "0xBB" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x83", + "red" : "0xBB" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled.colorset/Contents.json new file mode 100644 index 0000000..143937d --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xE8", + "green" : "0xE8", + "red" : "0xE8" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xE8", + "green" : "0xE8", + "red" : "0xE8" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled_eyes.colorset/Contents.json b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled_eyes.colorset/Contents.json new file mode 100644 index 0000000..02e1f88 --- /dev/null +++ b/Climeet-iOS/Climeet-iOS/Assets.xcassets/starColor/star_notfilled_eyes.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xC6", + "green" : "0xC6", + "red" : "0xC6" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xC6", + "green" : "0xC6", + "red" : "0xC6" + } + }, + "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 : 클라이머스")