Refactor: 수정된 디자인 시스템 반영

choijungp · taipaise · commit d72a635be89e · 2025-08-10T16:37:18.000+09:00
* Chore: Emotion Color Asset 제거

* Refactor: Orange 색상 값 변경

* Fix: Orange25 &lt;-&gt; Orange50 값 변경

* Feat: Cafe24SsurroundAir 폰트 추가
diff --git a/Projects/App/Resources/Font/Cafe24SsurroundAir-Light.otf b/Projects/App/Resources/Font/Cafe24SsurroundAir-Light.otf
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Error/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Error/Contents.json
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Error/Error.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Error/Error.colorset/Contents.json
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Error/Error10.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Error/Error10.colorset/Contents.json
@@ -5,8 +5,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xA1",
-          "green" : "0xC0",
+          "blue" : "0x58",
+          "green" : "0x58",
           "red" : "0xFF"
         }
       },
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Gray/Gray7.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Gray/Gray7.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x10",
-          "green" : "0x0F",
-          "red" : "0x0F"
+          "blue" : "0x15",
+          "green" : "0x14",
+          "red" : "0x14"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Green.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Green.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xAD",
-          "green" : "0xD8",
-          "red" : "0x96"
+          "blue" : "0xC6",
+          "green" : "0xF5",
+          "red" : "0xE6"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange100.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange100.colorset/Contents.json
@@ -5,8 +5,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xB5",
-          "green" : "0xD2",
+          "blue" : "0xBA",
+          "green" : "0xD3",
           "red" : "0xFF"
         }
       },
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange200.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange200.colorset/Contents.json
@@ -5,8 +5,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x91",
-          "green" : "0xBD",
+          "blue" : "0x98",
+          "green" : "0xBE",
           "red" : "0xFF"
         }
       },
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange25.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange25.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xAB",
-          "green" : "0xE0",
-          "red" : "0xFB"
+          "blue" : "0xE9",
+          "green" : "0xF1",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange300.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange300.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x5E",
-          "green" : "0x9F",
-          "red" : "0xFF"
+          "blue" : "0x6A",
+          "green" : "0xA0",
+          "red" : "0xFE"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange400.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange400.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x3F",
-          "green" : "0x8C",
-          "red" : "0xFF"
+          "blue" : "0x4D",
+          "green" : "0x8D",
+          "red" : "0xFE"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange50.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange50.colorset/Contents.json
@@ -5,8 +5,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xE7",
-          "green" : "0xF1",
+          "blue" : "0xE4",
+          "green" : "0xEE",
           "red" : "0xFF"
         }
       },
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange500.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange500.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x0F",
-          "green" : "0x6F",
-          "red" : "0xFF"
+          "blue" : "0x20",
+          "green" : "0x71",
+          "red" : "0xFE"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange600.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange600.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x0E",
-          "green" : "0x65",
-          "red" : "0xE8"
+          "blue" : "0x1D",
+          "green" : "0x67",
+          "red" : "0xE7"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange700.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange700.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x0B",
-          "green" : "0x4F",
-          "red" : "0xB5"
+          "blue" : "0x17",
+          "green" : "0x50",
+          "red" : "0xB4"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange800.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange800.colorset/Contents.json
@@ -5,8 +5,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x08",
-          "green" : "0x3D",
+          "blue" : "0x12",
+          "green" : "0x3E",
           "red" : "0x8C"
         }
       },
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange900.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Orange/Orange900.colorset/Contents.json
@@ -5,7 +5,7 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x06",
+          "blue" : "0x0D",
           "green" : "0x2F",
           "red" : "0x6B"
         }
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Pink.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Pink.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xDE",
-          "green" : "0xC1",
-          "red" : "0xC8"
+          "blue" : "0xE9",
+          "green" : "0xE3",
+          "red" : "0xFE"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Purple.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Purple.colorset/Contents.json
@@ -6,8 +6,8 @@
         "components" : {
           "alpha" : "1.000",
           "blue" : "0xFF",
-          "green" : "0xB9",
-          "red" : "0xA9"
+          "green" : "0xE2",
+          "red" : "0xE6"
         }
       },
       "idiom" : "universal"
diff --git a/Projects/Presentation/Resources/Colors.xcassets/Skyblue.colorset/Contents.json b/Projects/Presentation/Resources/Colors.xcassets/Skyblue.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xF1",
+          "red" : "0xDB"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Projects/Presentation/Sources/Common/DesignSystem/BitnagilColor.swift b/Projects/Presentation/Sources/Common/DesignSystem/BitnagilColor.swift
@@ -14,19 +14,7 @@ enum BitnagilColor {
 
     static let kakao = UIColor(named: "Kakao", in: bundle, compatibleWith: nil)
     static let error = UIColor(named: "Error", in: bundle, compatibleWith: nil)
-
-    // MARK: - Gradient
-    static let gradientLeft = UIColor(named: "GradientLeft", in: bundle, compatibleWith: nil)
-    static let gradientRight = UIColor(named: "GradientRight", in: bundle, compatibleWith: nil)
-    static let homeGradientLeft = UIColor(named: "HomeGradientLeft", in: bundle, compatibleWith: nil)
-    static let homeGradientRight = UIColor(named: "HomeGradientRight", in: bundle, compatibleWith: nil)
-
-    // MARK: - Emotion Colors
-    static let happy = UIColor(named: "EmotionHappy", in: bundle, compatibleWith: nil)
-    static let lethargy = UIColor(named: "EmotionLethargy", in: bundle, compatibleWith: nil)
-    static let lonely = UIColor(named: "EmotionLonely", in: bundle, compatibleWith: nil)
-    static let sad = UIColor(named: "EmotionSad", in: bundle, compatibleWith: nil)
-    static let anxiety = UIColor(named: "EmotionAnxiety", in: bundle, compatibleWith: nil)
+    static let error10 = UIColor(named: "Error10", in: bundle, compatibleWith: nil)
 
     // MARK: - Gray Colors
     static let gray5 = UIColor(named: "Gray5", in: bundle, compatibleWith: nil)
@@ -46,6 +34,37 @@ enum BitnagilColor {
     static let gray98 = UIColor(named: "Gray98", in: bundle, compatibleWith: nil)
     static let gray99 = UIColor(named: "Gray99", in: bundle, compatibleWith: nil)
 
+    // MARK: - Green Color
+    static let green = UIColor(named: "Green", in: bundle, compatibleWith: nil)
+
+    // MARK: - Pink Color
+    static let pink = UIColor(named: "Pink", in: bundle, compatibleWith: nil)
+
+    // MARK: - Purple Color
+    static let purple = UIColor(named: "Purple", in: bundle, compatibleWith: nil)
+
+    // MARK: - Skyblue Color
+    static let skyblue = UIColor(named: "Skyblue", in: bundle, compatibleWith: nil)
+
+    // MARK: - Orange Colors
+    static let orange25 = UIColor(named: "Orange25", in: bundle, compatibleWith: nil)
+    static let orange50 = UIColor(named: "Orange50", in: bundle, compatibleWith: nil)
+    static let orange100 = UIColor(named: "Orange100", in: bundle, compatibleWith: nil)
+    static let orange200 = UIColor(named: "Orange200", in: bundle, compatibleWith: nil)
+    static let orange300 = UIColor(named: "Orange300", in: bundle, compatibleWith: nil)
+    static let orange400 = UIColor(named: "Orange400", in: bundle, compatibleWith: nil)
+    static let orange500 = UIColor(named: "Orange500", in: bundle, compatibleWith: nil)
+    static let orange600 = UIColor(named: "Orange600", in: bundle, compatibleWith: nil)
+    static let orange700 = UIColor(named: "Orange700", in: bundle, compatibleWith: nil)
+    static let orange800 = UIColor(named: "Orange800", in: bundle, compatibleWith: nil)
+    static let orange900 = UIColor(named: "Orange900", in: bundle, compatibleWith: nil)
+
+    // MARK: - Gradient
+    static let gradientLeft = UIColor(named: "GradientLeft", in: bundle, compatibleWith: nil)
+    static let gradientRight = UIColor(named: "GradientRight", in: bundle, compatibleWith: nil)
+    static let homeGradientLeft = UIColor(named: "HomeGradientLeft", in: bundle, compatibleWith: nil)
+    static let homeGradientRight = UIColor(named: "HomeGradientRight", in: bundle, compatibleWith: nil)
+
     // MARK: - Navy Colors
     static let navy50 = UIColor(named: "Navy50", in: bundle, compatibleWith: nil)
     static let navy100 = UIColor(named: "Navy100", in: bundle, compatibleWith: nil)
@@ -58,6 +77,10 @@ enum BitnagilColor {
     static let navy800 = UIColor(named: "Navy800", in: bundle, compatibleWith: nil)
     static let navy900 = UIColor(named: "Navy900", in: bundle, compatibleWith: nil)
 
+    // MARK: - Green Color
+
+    // MARK: -
+
     // MARK: - LightBlue Colors
     static let lightBlue50 = UIColor(named: "LightBlue50", in: bundle, compatibleWith: nil)
     static let lightBlue75 = UIColor(named: "LightBlue75", in: bundle, compatibleWith: nil)
@@ -70,16 +93,4 @@ enum BitnagilColor {
     static let lightBlue700 = UIColor(named: "LightBlue700", in: bundle, compatibleWith: nil)
     static let lightBlue800 = UIColor(named: "LightBlue800", in: bundle, compatibleWith: nil)
     static let lightBlue900 = UIColor(named: "LightBlue900", in: bundle, compatibleWith: nil)
-
-    // MARK: - Orange Colors
-    static let orange50 = UIColor(named: "Orange50", in: bundle, compatibleWith: nil)
-    static let orange100 = UIColor(named: "Orange100", in: bundle, compatibleWith: nil)
-    static let orange200 = UIColor(named: "Orange200", in: bundle, compatibleWith: nil)
-    static let orange300 = UIColor(named: "Orange300", in: bundle, compatibleWith: nil)
-    static let orange400 = UIColor(named: "Orange400", in: bundle, compatibleWith: nil)
-    static let orange500 = UIColor(named: "Orange500", in: bundle, compatibleWith: nil)
-    static let orange600 = UIColor(named: "Orange600", in: bundle, compatibleWith: nil)
-    static let orange700 = UIColor(named: "Orange700", in: bundle, compatibleWith: nil)
-    static let orange800 = UIColor(named: "Orange800", in: bundle, compatibleWith: nil)
-    static let orange900 = UIColor(named: "Orange900", in: bundle, compatibleWith: nil)
 }
diff --git a/Projects/Presentation/Sources/Common/DesignSystem/Font/BitnagilFont.swift b/Projects/Presentation/Sources/Common/DesignSystem/Font/BitnagilFont.swift
@@ -8,33 +8,42 @@
 import UIKit
 
 struct BitnagilFont {
+    let family: FontFamily
     let style: FontStyle
     let weight: FontWeight
 
-    init(style: FontStyle, weight: FontWeight) {
+    init(
+        family: FontFamily = .pretendard,
+        style: FontStyle,
+        weight: FontWeight
+    ) {
+        self.family = family
         self.style = style
         self.weight = weight
     }
 
-    init(fontSize: CGFloat,
-         lineHeight: CGFloat,
-         letterSpacing: CGFloat = 0,
-         underline: Bool = false,
-         weight: FontWeight
+    init(
+        family: FontFamily = .pretendard,
+        fontSize: CGFloat,
+        lineHeight: CGFloat,
+        letterSpacing: CGFloat = 0,
+        underline: Bool = false,
+        weight: FontWeight
     ) {
         let attributes = FontAttributes(
             fontSize: fontSize,
             lineHeight: lineHeight,
             letterSpacing: letterSpacing,
             underline: underline)
+        self.family = family
         self.style = .custom(fontAttribute: attributes)
         self.weight = weight
     }
 
     var font: UIFont {
-        guard let font = UIFont(name: weight.fontName, size: style.fontAttributes.fontSize) else {
-            return UIFont.systemFont(ofSize: style.fontAttributes.fontSize)
-        }
+        guard let font = UIFont(name: family.fontName(weight: weight), size: style.fontAttributes.fontSize)
+        else { return UIFont.systemFont(ofSize: style.fontAttributes.fontSize) }
+
         return font
     }
 
diff --git a/Projects/Presentation/Sources/Common/DesignSystem/Font/FontFamily.swift b/Projects/Presentation/Sources/Common/DesignSystem/Font/FontFamily.swift
@@ -0,0 +1,20 @@
+//
+//  FontFamily.swift
+//  Presentation
+//
+//  Created by 최정인 on 8/9/25.
+//
+
+enum FontFamily {
+    case pretendard
+    case cafe24Ssurround
+
+    func fontName(weight: FontWeight) -> String {
+        switch self {
+        case .pretendard:
+            return weight.pretendardFontName
+        case .cafe24Ssurround:
+            return weight.cafe24FontName
+        }
+    }
+}
diff --git a/Projects/Presentation/Sources/Common/DesignSystem/Font/FontStyle.swift b/Projects/Presentation/Sources/Common/DesignSystem/Font/FontStyle.swift
@@ -25,6 +25,8 @@ enum FontStyle {
     case button1
     case button2
 
+    case cafe24Title1
+
     case custom(fontAttribute: FontAttributes)
 
     var fontAttributes: FontAttributes {
@@ -49,6 +51,8 @@ enum FontStyle {
         case .button2: FontAttributes(fontSize: 14, lineHeight: 20)
 
         case .custom(let fontAttribute): fontAttribute
+
+        case .cafe24Title1: FontAttributes(fontSize: 24, lineHeight: 36, letterSpacing: -0.5)
         }
     }
 }
diff --git a/Projects/Presentation/Sources/Common/DesignSystem/Font/FontWeight.swift b/Projects/Presentation/Sources/Common/DesignSystem/Font/FontWeight.swift
diff --git a/Projects/Presentation/Sources/Home/View/HomeView.swift b/Projects/Presentation/Sources/Home/View/HomeView.swift
diff --git a/SupportingFiles/Info.plist b/SupportingFiles/Info.plist
