From 4ae4dc36878996094cc844024ac2dd51887d6a45 Mon Sep 17 00:00:00 2001 From: vvvvvoin Date: Wed, 23 Oct 2024 15:21:07 +0900 Subject: [PATCH 1/6] =?UTF-8?q?white=2022,=2030,=2050=20=EA=B8=80=EB=A1=9C?= =?UTF-8?q?=EB=B2=8C=20=EC=BB=AC=EB=9F=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/channel/bezier/compose/color_v2/GlobalTokens.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt index c5a55e1d..c0182a03 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt @@ -69,7 +69,10 @@ internal object GlobalTokens { internal val white8: BezierColor = GlobalToken(Color(0X14FFFFFF)) internal val white12: BezierColor = GlobalToken(Color(0X1FFFFFFF)) internal val white20: BezierColor = GlobalToken(Color(0X33FFFFFF)) + internal val white22: BezierColor = GlobalToken(Color(0X38FFFFFF)) + internal val white30: BezierColor = GlobalToken(Color(0X4DFFFFFF)) internal val white40: BezierColor = GlobalToken(Color(0X66FFFFFF)) + internal val white50: BezierColor = GlobalToken(Color(0X80FFFFFF)) internal val white60: BezierColor = GlobalToken(Color(0X99FFFFFF)) internal val white80: BezierColor = GlobalToken(Color(0XCCFFFFFF)) internal val white90: BezierColor = GlobalToken(Color(0XE6FFFFFF)) From 617f92d2d268b5eca56ba043fde83a423b4f8666 Mon Sep 17 00:00:00 2001 From: vvvvvoin Date: Wed, 23 Oct 2024 15:25:52 +0900 Subject: [PATCH 2/6] =?UTF-8?q?green300=20=EC=97=90=20=EB=8C=80=ED=95=9C?= =?UTF-8?q?=20=5F45,=20=5F30,=20=5F15=20=EC=BB=AC=EB=9F=AC=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/channel/bezier/compose/color_v2/GlobalTokens.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt index c0182a03..658cd331 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt @@ -36,9 +36,9 @@ internal object GlobalTokens { internal val green400_30: BezierColor = GlobalToken(Color(0X4D40AD67)) internal val green400_20: BezierColor = GlobalToken(Color(0X3340AD67)) internal val green400_10: BezierColor = GlobalToken(Color(0X1A40AD67)) - internal val green300_45: BezierColor = GlobalToken(Color(0X737AD890)) - internal val green300_30: BezierColor = GlobalToken(Color(0X4D7AD890)) - internal val green300_15: BezierColor = GlobalToken(Color(0X267AD890)) + internal val green300_45: BezierColor = GlobalToken(Color(0X736AD081)) + internal val green300_30: BezierColor = GlobalToken(Color(0X4D6AD081)) + internal val green300_15: BezierColor = GlobalToken(Color(0X266AD081)) internal val red100: BezierColor = GlobalToken(Color(0XFFFFB8B8)) internal val red200: BezierColor = GlobalToken(Color(0XFFFFA6A6)) internal val red300: BezierColor = GlobalToken(Color(0XFFFF8C8C)) From 3c41247ec71974431a5fb2d57a8eadeacaf1e3ea Mon Sep 17 00:00:00 2001 From: vvvvvoin Date: Wed, 23 Oct 2024 15:28:00 +0900 Subject: [PATCH 3/6] =?UTF-8?q?black0,=20white3=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20=EC=BB=AC=EB=9F=AC=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/channel/bezier/compose/color_v2/GlobalTokens.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt index 658cd331..3e5b8923 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt @@ -51,6 +51,7 @@ internal object GlobalTokens { internal val red300_45: BezierColor = GlobalToken(Color(0X73FF8C8C)) internal val red300_30: BezierColor = GlobalToken(Color(0X4DFF8C8C)) internal val red300_15: BezierColor = GlobalToken(Color(0X26FF8C8C)) + internal val black0: BezierColor = GlobalToken(Color(0X00000000)) internal val black3: BezierColor = GlobalToken(Color(0X08000000)) internal val black5: BezierColor = GlobalToken(Color(0X0D000000)) internal val black8: BezierColor = GlobalToken(Color(0X14000000)) @@ -65,6 +66,7 @@ internal object GlobalTokens { internal val black85: BezierColor = GlobalToken(Color(0XD9000000)) internal val black100: BezierColor = GlobalToken(Color(0XFF000000)) internal val white0: BezierColor = GlobalToken(Color(0X00FFFFFF)) + internal val white3: BezierColor = GlobalToken(Color(0X08FFFFFF)) internal val white5: BezierColor = GlobalToken(Color(0X0DFFFFFF)) internal val white8: BezierColor = GlobalToken(Color(0X14FFFFFF)) internal val white12: BezierColor = GlobalToken(Color(0X1FFFFFFF)) From a596d837ee66ed4feda2a3556ffebf94ecbe160a Mon Sep 17 00:00:00 2001 From: vvvvvoin Date: Wed, 23 Oct 2024 16:17:41 +0900 Subject: [PATCH 4/6] =?UTF-8?q?bgBlackTransparent=20=ED=8E=91=EC=85=94?= =?UTF-8?q?=EB=84=90=20=EC=BB=AC=EB=9F=AC=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/channel/bezier/compose/color_v2/ColorSchemes.kt | 1 + .../io/channel/bezier/compose/color_v2/FunctionalTokens.kt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt index 12e437d1..52e734c8 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt @@ -288,6 +288,7 @@ class ColorSchemes internal constructor( val bgBlackLight: BezierColor = functionalTokens.bgBlackLight val bgBlackLighter: BezierColor = functionalTokens.bgBlackLighter val bgBlackLightest: BezierColor = functionalTokens.bgBlackLightest + val bgBlackTransparent: BezierColor = functionalTokens.bgBlackTransparent val bgGreyDarkest: BezierColor = functionalTokens.bgGreyDarkest val bgGreyDark: BezierColor = functionalTokens.bgGreyDark val bgGreyLight: BezierColor = functionalTokens.bgGreyLight diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt index 0f4d673b..df676d81 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt @@ -65,6 +65,7 @@ internal data class FunctionalTokens( val bgBlackLight: BezierColor, val bgBlackLighter: BezierColor, val bgBlackLightest: BezierColor, + val bgBlackTransparent: BezierColor, val bgGreyDarkest: BezierColor, val bgGreyDark: BezierColor, val bgGreyLight: BezierColor, @@ -245,6 +246,7 @@ internal fun lightFunctionalTokens() = FunctionalTokens( bgBlackLight = FunctionalToken(GlobalTokens.black8), bgBlackLighter = FunctionalToken(GlobalTokens.black5), bgBlackLightest = FunctionalToken(GlobalTokens.black3), + bgBlackTransparent = FunctionalToken(GlobalTokens.black0), bgGreyDarkest = FunctionalToken(GlobalTokens.grey900), bgGreyDark = FunctionalToken(GlobalTokens.grey500), bgGreyLight = FunctionalToken(GlobalTokens.grey200), @@ -425,6 +427,7 @@ internal fun darkFunctionalTokens() = FunctionalTokens( bgBlackLight = FunctionalToken(GlobalTokens.white12), bgBlackLighter = FunctionalToken(GlobalTokens.white8), bgBlackLightest = FunctionalToken(GlobalTokens.white5), + bgBlackTransparent = FunctionalToken(GlobalTokens.white0), bgGreyDarkest = FunctionalToken(GlobalTokens.white100), bgGreyDark = FunctionalToken(GlobalTokens.grey500), bgGreyLight = FunctionalToken(GlobalTokens.grey700), From 5b06ff5bf45d66d1570e26b1016a45d4b6f8acf5 Mon Sep 17 00:00:00 2001 From: vvvvvoin Date: Wed, 23 Oct 2024 16:18:16 +0900 Subject: [PATCH 5/6] =?UTF-8?q?bgAbsoluteWhite=20Black=20Transparent=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=AC=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/channel/bezier/compose/color_v2/ColorSchemes.kt | 2 ++ .../channel/bezier/compose/color_v2/FunctionalTokens.kt | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt index 52e734c8..28956119 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt @@ -388,11 +388,13 @@ class ColorSchemes internal constructor( val bgAbsoluteBlackLight: BezierColor = functionalTokens.bgAbsoluteBlackLight val bgAbsoluteBlackLighter: BezierColor = functionalTokens.bgAbsoluteBlackLighter val bgAbsoluteBlackLightest: BezierColor = functionalTokens.bgAbsoluteBlackLightest + val bgAbsoluteBlackTransparent: BezierColor = functionalTokens.bgAbsoluteBlackTransparent val bgAbsoluteWhiteDark: BezierColor = functionalTokens.bgAbsoluteWhiteDark val bgAbsoluteWhiteNormal: BezierColor = functionalTokens.bgAbsoluteWhiteNormal val bgAbsoluteWhiteLight: BezierColor = functionalTokens.bgAbsoluteWhiteLight val bgAbsoluteWhiteLighter: BezierColor = functionalTokens.bgAbsoluteWhiteLighter val bgAbsoluteWhiteLightest: BezierColor = functionalTokens.bgAbsoluteWhiteLightest + val bgAbsoluteWhiteTransparent: BezierColor = functionalTokens.bgAbsoluteWhiteTransparent val surfaceLowest: BezierColor = functionalTokens.surfaceLowest val surfaceLower: BezierColor = functionalTokens.surfaceLower val surfaceNormal: BezierColor = functionalTokens.surfaceNormal diff --git a/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt b/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt index df676d81..3cc09ac0 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt @@ -165,11 +165,13 @@ internal data class FunctionalTokens( val bgAbsoluteBlackLight: BezierColor, val bgAbsoluteBlackLighter: BezierColor, val bgAbsoluteBlackLightest: BezierColor, + val bgAbsoluteBlackTransparent: BezierColor, val bgAbsoluteWhiteDark: BezierColor, val bgAbsoluteWhiteNormal: BezierColor, val bgAbsoluteWhiteLight: BezierColor, val bgAbsoluteWhiteLighter: BezierColor, val bgAbsoluteWhiteLightest: BezierColor, + val bgAbsoluteWhiteTransparent: BezierColor, val surfaceLowest: BezierColor, val surfaceLower: BezierColor, val surfaceNormal: BezierColor, @@ -346,11 +348,13 @@ internal fun lightFunctionalTokens() = FunctionalTokens( bgAbsoluteBlackLight = FunctionalToken(GlobalTokens.black60), bgAbsoluteBlackLighter = FunctionalToken(GlobalTokens.black40), bgAbsoluteBlackLightest = FunctionalToken(GlobalTokens.black20), + bgAbsoluteBlackTransparent = FunctionalToken(GlobalTokens.black0), bgAbsoluteWhiteDark = FunctionalToken(GlobalTokens.white100), bgAbsoluteWhiteNormal = FunctionalToken(GlobalTokens.white90), bgAbsoluteWhiteLight = FunctionalToken(GlobalTokens.white60), bgAbsoluteWhiteLighter = FunctionalToken(GlobalTokens.white40), bgAbsoluteWhiteLightest = FunctionalToken(GlobalTokens.white20), + bgAbsoluteWhiteTransparent = FunctionalToken(GlobalTokens.white0), surfaceLowest = FunctionalToken(GlobalTokens.grey100), surfaceLower = FunctionalToken(GlobalTokens.grey50), surfaceNormal = FunctionalToken(GlobalTokens.white100), @@ -444,7 +448,7 @@ internal fun darkFunctionalTokens() = FunctionalTokens( bgWhiteWhiteAlphaLightest = FunctionalToken(GlobalTokens.greyAlpha800_80), bgWhiteWhiteAlphaLighter = FunctionalToken(GlobalTokens.black60), bgWhiteWhiteAlphaLight = FunctionalToken(GlobalTokens.black20), - bgWhiteWhiteAlphaTransparent = FunctionalToken(GlobalTokens.white0), + bgWhiteWhiteAlphaTransparent = FunctionalToken(GlobalTokens.black0), bgBlueNormal = FunctionalToken(GlobalTokens.blue300), bgBlueLight = FunctionalToken(GlobalTokens.blue300_45), bgBlueLighter = FunctionalToken(GlobalTokens.blue300_30), @@ -527,11 +531,13 @@ internal fun darkFunctionalTokens() = FunctionalTokens( bgAbsoluteBlackLight = FunctionalToken(GlobalTokens.black60), bgAbsoluteBlackLighter = FunctionalToken(GlobalTokens.black40), bgAbsoluteBlackLightest = FunctionalToken(GlobalTokens.black20), + bgAbsoluteBlackTransparent = FunctionalToken(GlobalTokens.black0), bgAbsoluteWhiteDark = FunctionalToken(GlobalTokens.white100), bgAbsoluteWhiteNormal = FunctionalToken(GlobalTokens.white90), bgAbsoluteWhiteLight = FunctionalToken(GlobalTokens.white60), bgAbsoluteWhiteLighter = FunctionalToken(GlobalTokens.white40), bgAbsoluteWhiteLightest = FunctionalToken(GlobalTokens.white20), + bgAbsoluteWhiteTransparent = FunctionalToken(GlobalTokens.white0), surfaceLowest = FunctionalToken(GlobalTokens.grey800), surfaceLower = FunctionalToken(GlobalTokens.grey850), surfaceNormal = FunctionalToken(GlobalTokens.grey900), From 50d27049576970e965f1afe0fa9fbd3e3a494020 Mon Sep 17 00:00:00 2001 From: vvvvvoin Date: Wed, 23 Oct 2024 16:21:18 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=BB=AC=EB=9F=AC=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/button/properties/BezierButtonColor.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bezier/src/main/java/io/channel/bezier/compose/component/button/properties/BezierButtonColor.kt b/bezier/src/main/java/io/channel/bezier/compose/component/button/properties/BezierButtonColor.kt index 7fe14b1c..9217cc5b 100644 --- a/bezier/src/main/java/io/channel/bezier/compose/component/button/properties/BezierButtonColor.kt +++ b/bezier/src/main/java/io/channel/bezier/compose/component/button/properties/BezierButtonColor.kt @@ -117,7 +117,7 @@ enum class BezierButtonColor( contentColor = { BezierTheme.colorSchemes.fgBlackDarkest }, ), tertiaryColorSchemes = BezierButtonColorSchemes( - backgroundColor = { BezierTheme.colorSchemes.bgWhiteWhiteAlphaTransparent }, + backgroundColor = { BezierTheme.colorSchemes.bgBlackTransparent }, contentColor = { BezierTheme.colorSchemes.fgBlackDarkest }, ), ), @@ -131,7 +131,7 @@ enum class BezierButtonColor( contentColor = { BezierTheme.colorSchemes.fgBlackDarker }, ), tertiaryColorSchemes = BezierButtonColorSchemes( - backgroundColor = { BezierTheme.colorSchemes.bgWhiteWhiteAlphaTransparent }, + backgroundColor = { BezierTheme.colorSchemes.bgBlackTransparent }, contentColor = { BezierTheme.colorSchemes.fgBlackDarker }, ), ), @@ -145,7 +145,7 @@ enum class BezierButtonColor( contentColor = { BezierTheme.colorSchemes.bgAbsoluteWhiteNormal }, ), tertiaryColorSchemes = BezierButtonColorSchemes( - backgroundColor = { BezierTheme.colorSchemes.bgWhiteWhiteAlphaTransparent }, + backgroundColor = { BezierTheme.colorSchemes.bgAbsoluteWhiteTransparent }, contentColor = { BezierTheme.colorSchemes.bgAbsoluteWhiteNormal }, ), );