Merge pull request #125 from OMZigak/setting/#123-extensionChange

[setting] 스타일 가이드 수정사항 반영
OMZigak · Jul 6, 2024 · 8d463c9 · 8d463c9
2 parents a06e2e4 + ed75cb4
commit 8d463c9
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 136 deletions.
diff --git a/KkuMulKum/Resource/Color.xcassets/gray1.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray1.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.937",
-          "green" : "0.937",
-          "red" : "0.937"
+          "blue" : "0xEF",
+          "green" : "0xEF",
+          "red" : "0xEF"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray2.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray2.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.875",
-          "green" : "0.875",
-          "red" : "0.875"
+          "blue" : "0xDF",
+          "green" : "0xDF",
+          "red" : "0xDF"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray3.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray3.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.757",
-          "green" : "0.757",
-          "red" : "0.757"
+          "blue" : "0xC1",
+          "green" : "0xC1",
+          "red" : "0xC1"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray4.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray4.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.647",
-          "green" : "0.647",
-          "red" : "0.647"
+          "blue" : "0xA5",
+          "green" : "0xA5",
+          "red" : "0xA5"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray5.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray5.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.545",
-          "green" : "0.545",
-          "red" : "0.545"
+          "blue" : "0x8B",
+          "green" : "0x8B",
+          "red" : "0x8B"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray6.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray6.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.435",
-          "green" : "0.435",
-          "red" : "0.435"
+          "blue" : "0x6F",
+          "green" : "0x6F",
+          "red" : "0x6F"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray7.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray7.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.239",
-          "green" : "0.239",
-          "red" : "0.239"
+          "blue" : "0x3D",
+          "green" : "0x3D",
+          "red" : "0x3D"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray8.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray8.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.141",
-          "green" : "0.141",
-          "red" : "0.141"
+          "blue" : "0x24",
+          "green" : "0x24",
+          "red" : "0x24"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/gray9.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/gray9.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.090",
-          "green" : "0.090",
-          "red" : "0.090"
+          "blue" : "0x17",
+          "green" : "0x17",
+          "red" : "0x17"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/green1.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/green1.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.925",
-          "green" : "0.973",
-          "red" : "0.859"
+          "blue" : "0xF5",
+          "green" : "0xFC",
+          "red" : "0xEC"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/green2.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/green2.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.827",
-          "green" : "0.965",
-          "red" : "0.631"
+          "blue" : "0xE8",
+          "green" : "0xF7",
+          "red" : "0xD4"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/green3.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/green3.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.749",
-          "green" : "0.922",
-          "red" : "0.357"
+          "blue" : "0x75",
+          "green" : "0xA7",
+          "red" : "0x00"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/green6.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/green6.colorset/Contents.json
diff --git a/KkuMulKum/Resource/Color.xcassets/lightGreen.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/lightGreen.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.227",
-          "green" : "0.953",
-          "red" : "0.831"
+          "blue" : "0x84",
+          "green" : "0xFF",
+          "red" : "0xEA"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/maincolor.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/maincolor.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.502",
-          "green" : "0.827",
-          "red" : "0.059"
+          "blue" : "0x80",
+          "green" : "0xD3",
+          "red" : "0x0F"
         }
       },
       "idiom" : "universal"

diff --git a/...or.xcassets/green4.colorset/Contents.json → ...or.xcassets/orange.colorset/Contents.json b/...or.xcassets/green4.colorset/Contents.json → ...or.xcassets/orange.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.663",
-          "green" : "0.855",
-          "red" : "0.212"
+          "blue" : "0x30",
+          "green" : "0x7B",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Color.xcassets/orange1.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/orange1.colorset/Contents.json
diff --git a/KkuMulKum/Resource/Color.xcassets/orange2.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/orange2.colorset/Contents.json
diff --git a/KkuMulKum/Resource/Color.xcassets/orange3.colorset/Contents.json b/KkuMulKum/Resource/Color.xcassets/orange3.colorset/Contents.json
diff --git a/...or.xcassets/green5.colorset/Contents.json → ...Color.xcassets/red.colorset/Contents.json b/...or.xcassets/green5.colorset/Contents.json → ...Color.xcassets/red.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.545",
-          "green" : "0.780",
-          "red" : "0.000"
+          "blue" : "0x2E",
+          "green" : "0x2E",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

diff --git a/KkuMulKum/Resource/Extension/UIFont+.swift b/KkuMulKum/Resource/Extension/UIFont+.swift
@@ -13,33 +13,42 @@ extension UIFont {
     }
 
     enum Pretendard {
-        case title01, title02
+        case title00, title01, title02
         case head01, head02
         case body01, body02, body03, body04, body05, body06
         case caption01, caption02
-        case label01, label02
+        case label00, label01, label02
 
         var weight: String {
             switch self {
-            case .title01, .head01, .body01, .body03, .body05, .caption01, .label01: "Pretendard-SemiBold"
-            case .title02, .head02, .body02, .body04, .body06, .caption02, .label02: "Pretendard-Regular"
+            case .title00:
+                "Pretendard-Bold"
+            case .title01, .head01, .body01, .body03, .body05, .caption01, .label01:
+                "Pretendard-SemiBold"
+            case .title02, .head02, .body02, .body04, .body06, .caption02, .label00, .label02:
+                "Pretendard-Regular"
             }
         }
 
         var size: CGFloat {
             switch self {
-            case .title01, .title02: 24
+            case .title00, .title01, .title02: 24
             case .head01, .head02: 22
             case .body01, .body02: 18
             case .body03, .body04: 16
             case .body05, .body06: 14
-            case .caption01, .caption02: 12
+            case .caption01, .caption02, .label00: 12
             case .label01, .label02: 10
             }
         }
 
         var tracking: CGFloat { CGFloat(-2) / 100 * size }
 
-        var leading: CGFloat { (1.6 - 1) * size }
+        var leading: CGFloat {
+            switch self {
+            case .label00: (1.38 - 1) * size
+            default: (1.6 - 1) * size
+            }
+        }
     }
 }
diff --git a/KkuMulKum/Resource/Extension/UILabel+.swift b/KkuMulKum/Resource/Extension/UILabel+.swift
@@ -8,7 +8,7 @@
 import UIKit
 
 extension UILabel {
-    func setText(_ text: String, style: UIFont.Pretendard, color: UIColor) {
+    func setText(_ text: String, style: UIFont.Pretendard, color: UIColor = .black) {
         attributedText = .pretendardString(text, style: style)
         textColor = color
         numberOfLines = 0