Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2 컬러 업데이트 #81

Open
wants to merge 6 commits into
base: v2
Choose a base branch
from
Open

v2 컬러 업데이트 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ae4dc3
white 22, 30, 50 글로벌 컬러 추가
vvvvvoin Oct 23, 2024
617f92d
green300 에 대한 _45, _30, _15 컬러 업데이트
vvvvvoin Oct 23, 2024
3c41247
black0, white3에 대한 컬러 업데이트
vvvvvoin Oct 23, 2024
a596d83
bgBlackTransparent 펑셔널 컬러 업데이트
vvvvvoin Oct 23, 2024
5b06ff5
bgAbsoluteWhite Black Transparent 컬러 업데이트
vvvvvoin Oct 23, 2024
50d2704
버튼 컬러 업데이트
vvvvvoin Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bezier/src/main/java/io/channel/bezier/compose/color_v2/ColorSchemes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -387,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
Expand Down
11 changes: 10 additions & 1 deletion bezier/src/main/java/io/channel/bezier/compose/color_v2/FunctionalTokens.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -164,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,
Expand Down Expand Up @@ -245,6 +248,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),
Expand Down Expand Up @@ -344,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),
Expand Down Expand Up @@ -425,6 +431,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),
Expand All @@ -441,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),
Expand Down Expand Up @@ -524,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),
Expand Down
11 changes: 8 additions & 3 deletions bezier/src/main/java/io/channel/bezier/compose/color_v2/GlobalTokens.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand All @@ -65,11 +66,15 @@ 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))
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))
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/io/channel/bezier/compose/component/button/properties/BezierButtonColor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
),
),
Expand All @@ -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 },
),
),
Expand All @@ -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 },
),
);
Expand Down