From 367e1b726c6ae8c6b8e2520a554232c195e8163e Mon Sep 17 00:00:00 2001 From: "hsj._.06" Date: Mon, 24 Jul 2023 19:09:23 +0900 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20Error=20Color=20(Test?= =?UTF-8?q?=EC=9A=A9)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Error 40.colorset/Contents.json | 20 ++++++++++ .../Error 60.colorset/Contents.json | 20 ++++++++++ .../Molla.colorset/Contents.json | 38 ------------------- .../Sources/Color/XErrorColor.swift | 5 ++- 4 files changed, 44 insertions(+), 39 deletions(-) create mode 100644 xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 40.colorset/Contents.json create mode 100644 xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 60.colorset/Contents.json delete mode 100644 xquare-design-system-iOS/Resources/ErrorColor.xcassets/Molla.colorset/Contents.json diff --git a/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 40.colorset/Contents.json b/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 40.colorset/Contents.json new file mode 100644 index 0000000..e780605 --- /dev/null +++ b/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 40.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x1E", + "green" : "0x26", + "red" : "0xB3" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 60.colorset/Contents.json b/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 60.colorset/Contents.json new file mode 100644 index 0000000..c70c24b --- /dev/null +++ b/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Error 60.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x62", + "green" : "0x69", + "red" : "0xE4" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Molla.colorset/Contents.json b/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Molla.colorset/Contents.json deleted file mode 100644 index 2536dc2..0000000 --- a/xquare-design-system-iOS/Resources/ErrorColor.xcassets/Molla.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "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/xquare-design-system-iOS/Sources/Color/XErrorColor.swift b/xquare-design-system-iOS/Sources/Color/XErrorColor.swift index 69097af..e3bc8ae 100644 --- a/xquare-design-system-iOS/Sources/Color/XErrorColor.swift +++ b/xquare-design-system-iOS/Sources/Color/XErrorColor.swift @@ -5,5 +5,8 @@ public extension Color { } public extension Color.Error { - static let error50: Color = Color("Error 50", bundle: Bundle.module) + private static let error40: Color = Color(type: .error, 40) + private static let error60: Color = Color(type: .error, 60) + + static let error: Color = error60.darkModeColor(error40) }