From 29bd090cdad681ed263b75ca5fdc237440d92631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=82=98=EA=B0=B1?=
 <109855280+nagaeng@users.noreply.github.com>
Date: Fri, 13 Sep 2024 15:20:15 +0900
Subject: [PATCH] =?UTF-8?q?[add]=20#123=20color=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/record/designsystem/theme/Color.kt    |  46 +++--
 .../com/record/designsystem/theme/Theme.kt    | 163 +++++++++++++-----
 2 files changed, 150 insertions(+), 59 deletions(-)

diff --git a/core/designsystem/src/main/java/com/record/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/record/designsystem/theme/Color.kt
index 581d8466..3225ae6c 100644
--- a/core/designsystem/src/main/java/com/record/designsystem/theme/Color.kt
+++ b/core/designsystem/src/main/java/com/record/designsystem/theme/Color.kt
@@ -2,27 +2,41 @@ package com.record.designsystem.theme
 
 import androidx.compose.ui.graphics.Color
 
+// Main
+val ViskitYellow500 = Color(0xFFEEDA24)
+val ViskitYellow400 = Color(0xFFF1E150)
+val ViskitYellow300 = Color(0xFFF5E97C)
+val ViskitYellow200 = Color(0xFFF8F0A8)
+val ViskitYellow100 = Color(0xFFFCF8D3)
+val ViskitYellow80 = Color(0xCCF1E150)
+val ViskitYellow60 = Color(0x99F1E150)
+val ViskitYellow40 = Color(0x66F1E150)
+val ViskitYellow20 = Color(0x33F1E150)
+
+// System
+val Alert01 = Color(0xFFC1492F)
+val Alert02 = Color(0xFFFF374F)
+val Kakaoyellow = Color(0xFFFEE500)
+val Kakaobrown = Color(0xFF3C1E1E)
+
 // Gray Scale
-val Gray01 = Color(0xFFE2E5EC)
-val Gray03 = Color(0xFFA5A9B4)
-val Gray04 = Color(0xFF70737D)
-val Gray05 = Color(0xFF41434A)
-val Gray06 = Color(0xFF363942)
-val Gray08 = Color(0xFF1B2129)
-val Gray09 = Color(0xFF12161C)
 val White = Color(0xFFFFFFFF)
+val Gray01 = Color(0xFFEEEEEE)
+val Gray02 = Color(0xFFCDCDCD)
+val Gray03 = Color(0xFFAFAFAF)
+val Gray05 = Color(0xFF70737D)
+val Gray06 = Color (0xFF4D4D4D)
+val Gray07 = Color (0xFF46474E)
+val Gray08 = Color(0xFF434343)
+val Gray09 = Color(0xFF2A292C)
+val Gray10 = Color(0xFF1F1E24)
+val Gray11 = Color(0xFF1B1A20)
 val Black = Color(0xFF000000)
-val Background = Color(0xFF04070E)
 
-// Recordy
-val Main = Color(0xFF9BABFB)
-val Sub01 = Color(0xFF3F4054)
-val Sub02 = Color(0xFF21263C)
-
-// System
-val Alert = Color(0xFFF56A6F)
-val Kakao = Color(0xFFFEE500)
+// Background
+val Background = Color(0xFF131318)
 
+// Opacity
 val Black20 = Color(0x33000000)
 val Black30 = Color(0x77000000)
 val Black50 = Color(0x80000000)
diff --git a/core/designsystem/src/main/java/com/record/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/record/designsystem/theme/Theme.kt
index 2515a9bd..9c42fcae 100644
--- a/core/designsystem/src/main/java/com/record/designsystem/theme/Theme.kt
+++ b/core/designsystem/src/main/java/com/record/designsystem/theme/Theme.kt
@@ -14,19 +14,30 @@ import androidx.compose.ui.graphics.Color
 
 @Stable
 class RecordyColors(
-    main: Color,
-    sub01: Color,
-    sub02: Color,
-    alert: Color,
-    kakao: Color,
+    ViskitYellow500: Color,
+    ViskitYellow400: Color,
+    ViskitYellow300: Color,
+    ViskitYellow200: Color,
+    ViskitYellow100: Color,
+    ViskitYellow80: Color,
+    ViskitYellow60: Color,
+    ViskitYellow40: Color,
+    ViskitYellow20: Color,
+    alert01: Color,
+    alert02: Color,
+    kakaoyellow: Color,
+    kakaobrown: Color,
+    white: Color,
     gray01: Color,
+    gray02: Color,
     gray03: Color,
-    gray04: Color,
     gray05: Color,
     gray06: Color,
+    gray07: Color,
     gray08: Color,
     gray09: Color,
-    white: Color,
+    gray10: Color,
+    gray11: Color,
     black: Color,
     background: Color,
     black20: Color,
@@ -34,31 +45,53 @@ class RecordyColors(
     black50: Color,
     black70: Color,
 ) {
-    var main by mutableStateOf(main)
+    var ViskitYellow500 by mutableStateOf(ViskitYellow500)
+        private set
+    var ViskitYellow400 by mutableStateOf(ViskitYellow400)
+        private set
+    var ViskitYellow300 by mutableStateOf(ViskitYellow300)
+        private set
+    var ViskitYellow200 by mutableStateOf(ViskitYellow200)
+        private set
+    var ViskitYellow100 by mutableStateOf(ViskitYellow100)
+        private set
+    var ViskitYellow80 by mutableStateOf(ViskitYellow80)
         private set
-    var sub01 by mutableStateOf(sub01)
+    var ViskitYellow60 by mutableStateOf(ViskitYellow60)
         private set
-    var sub02 by mutableStateOf(sub02)
+    var ViskitYellow40 by mutableStateOf(ViskitYellow40)
         private set
-    var alert by mutableStateOf(alert)
+    var ViskitYellow20 by mutableStateOf(ViskitYellow20)
         private set
-    var kakao by mutableStateOf(kakao)
+    var alert01 by mutableStateOf(alert01)
+        private set
+    var alert02 by mutableStateOf(alert02)
+        private set
+    var kakaoyellow by mutableStateOf(kakaoyellow)
+        private set
+    var kakaobrown by mutableStateOf(kakaobrown)
+        private set
+    var white by mutableStateOf(white)
         private set
     var gray01 by mutableStateOf(gray01)
         private set
-    var gray03 by mutableStateOf(gray03)
+    var gray02 by mutableStateOf(gray02)
         private set
-    var gray04 by mutableStateOf(gray04)
+    var gray03 by mutableStateOf(gray03)
         private set
     var gray05 by mutableStateOf(gray05)
         private set
     var gray06 by mutableStateOf(gray06)
         private set
+    var gray07 by mutableStateOf(gray07)
+        private set
     var gray08 by mutableStateOf(gray08)
         private set
     var gray09 by mutableStateOf(gray09)
         private set
-    var white by mutableStateOf(white)
+    var gray10 by mutableStateOf(gray10)
+        private set
+    var gray11 by mutableStateOf(gray11)
         private set
     var black by mutableStateOf(black)
         private set
@@ -74,19 +107,30 @@ class RecordyColors(
         private set
 
     fun copy(): RecordyColors = RecordyColors(
-        main,
-        sub01,
-        sub02,
-        alert,
-        kakao,
+        ViskitYellow500,
+        ViskitYellow400,
+        ViskitYellow300,
+        ViskitYellow200,
+        ViskitYellow100,
+        ViskitYellow80,
+        ViskitYellow60,
+        ViskitYellow40,
+        ViskitYellow20,
+        alert01,
+        alert02,
+        kakaoyellow,
+        kakaobrown,
+        white,
         gray01,
+        gray02,
         gray03,
-        gray04,
         gray05,
         gray06,
+        gray07,
         gray08,
         gray09,
-        white,
+        gray10,
+        gray11,
         black,
         background,
         black20,
@@ -96,19 +140,30 @@ class RecordyColors(
     )
 
     fun update(other: RecordyColors) {
-        main = other.main
-        sub01 = other.sub01
-        sub02 = other.sub02
-        alert = other.alert
-        kakao = other.kakao
+        ViskitYellow500 = other.ViskitYellow500
+        ViskitYellow400 = other.ViskitYellow400
+        ViskitYellow300 = other.ViskitYellow300
+        ViskitYellow200 = other.ViskitYellow200
+        ViskitYellow100 = other.ViskitYellow100
+        ViskitYellow80 = other.ViskitYellow80
+        ViskitYellow60 = other.ViskitYellow60
+        ViskitYellow40 = other.ViskitYellow40
+        ViskitYellow20 = other.ViskitYellow20
+        alert01 = other.alert01
+        alert02 = other.alert02
+        kakaoyellow = other.kakaoyellow
+        kakaobrown = other.kakaobrown
+        white = other.white
         gray01 = other.gray01
+        gray02 = other.gray02
         gray03 = other.gray03
-        gray04 = other.gray04
         gray05 = other.gray05
         gray06 = other.gray06
+        gray07 = other.gray07
         gray08 = other.gray08
         gray09 = other.gray09
-        white = other.white
+        gray10 = other.gray10
+        gray11 = other.gray11
         black = other.black
         background = other.background
         black20 = other.black20
@@ -119,19 +174,30 @@ class RecordyColors(
 }
 
 fun RecordyDarkColor(
-    main: Color = Main,
-    sub01: Color = Sub01,
-    sub02: Color = Sub02,
-    alert: Color = Alert,
-    kakao: Color = Kakao,
+    viskitYellow500: Color = ViskitYellow500,
+    viskitYellow400: Color = ViskitYellow400,
+    viskitYellow300: Color = ViskitYellow300,
+    viskitYellow200: Color = ViskitYellow200,
+    viskitYellow100: Color = ViskitYellow100,
+    viskitYellow80: Color = ViskitYellow80,
+    viskitYellow60: Color = ViskitYellow60,
+    viskitYellow40: Color = ViskitYellow40,
+    viskitYellow20: Color = ViskitYellow20,
+    alert01: Color = Alert01,
+    alert02: Color = Alert02,
+    kakaoyellow: Color = Kakaoyellow,
+    kakaobrown: Color = Kakaobrown,
+    white: Color = White,
     gray01: Color = Gray01,
+    gray02: Color = Gray02,
     gray03: Color = Gray03,
-    gray04: Color = Gray04,
     gray05: Color = Gray05,
     gray06: Color = Gray06,
+    gray07: Color = Gray07,
     gray08: Color = Gray08,
     gray09: Color = Gray09,
-    white: Color = White,
+    gray10: Color = Gray10,
+    gray11: Color = Gray11,
     black: Color = Black,
     background: Color = Background,
     black20: Color = Black20,
@@ -139,19 +205,30 @@ fun RecordyDarkColor(
     black50: Color = Black50,
     black70: Color = Black70,
 ) = RecordyColors(
-    main,
-    sub01,
-    sub02,
-    alert,
-    kakao,
+    viskitYellow500,
+    viskitYellow400,
+    viskitYellow300,
+    viskitYellow200,
+    viskitYellow100,
+    viskitYellow80,
+    viskitYellow60,
+    viskitYellow40,
+    viskitYellow20,
+    alert01,
+    alert02,
+    white,
+    kakaoyellow,
+    kakaobrown,
     gray01,
+    gray02,
     gray03,
-    gray04,
     gray05,
     gray06,
+    gray07,
     gray08,
     gray09,
-    white,
+    gray10,
+    gray11,
     black,
     background,
     black20,