Skip to content

Commit

Permalink
[feat #87] :: 컬러 시스템 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
@parkuiery
parkuiery authored Dec 23, 2024
2 parents cd9c747 + bdfd7d8 commit f9f1dbf
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 129 deletions.
140 changes: 55 additions & 85 deletions ...system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/foundation/DmsColor.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ internal sealed class DmsColor(
val primary600: Color,
val primary700: Color,
val primary800: Color,
val primary900: Color,
val gray50: Color,
val gray100: Color,
val gray200: Color,
Expand All @@ -22,102 +21,73 @@ internal sealed class DmsColor(
val gray600: Color,
val gray700: Color,
val gray800: Color,
val gray900: Color,
val background: Color,
val black: Color,
val white: Color,
val title: Color,
val error50: Color,
val error100: Color,
val error200: Color,
val error300: Color,
val error400: Color,
val error500: Color,
val error600: Color,
val error700: Color,
val error800: Color,
val error900: Color,
val label: Color,
val color: Color,
val symbol: Color,
val sad: Color,
val backgroundPrimary: Color,
val backgroundSecondary: Color,
) {
data object Light : DmsColor(
primary50 = Color(0xFFE4F3FF),
primary100 = Color(0xFFBFE0FF),
primary200 = Color(0xFF95CDFF),
primary300 = Color(0xFF6BB9FF),
primary400 = Color(0xFF4EA9FF),
primary500 = Color(0xFF3B99FF),
primary600 = Color(0xFF3D8BFF),
primary700 = Color(0xFF3C78EA),
primary800 = Color(0xFF3B66D8),
primary900 = Color(0xFF3745B8),
gray50 = Color(0xFFECEEF2),
gray100 = Color(0xFFD0D5DD),
gray200 = Color(0xFFB2B9C5),
gray300 = Color(0xFF949DAE),
gray400 = Color(0xFF7E889B),
gray500 = Color(0xFF68748A),
gray600 = Color(0xFF5A6679),
gray700 = Color(0xFF495363),
gray800 = Color(0xFF3A404D),
gray900 = Color(0xFF272C36),
primary50 = Color(0xFFEDF4FF),
primary100 = Color(0xFFC5DCFF),
primary200 = Color(0xFF9DC4FF),
primary300 = Color(0xFF74ACFF),
primary400 = Color(0xFF4C93FF),
primary500 = Color(0xFF387ADD),
primary600 = Color(0xFF2662BB),
primary700 = Color(0xFF184C99),
primary800 = Color(0xFF0D3777),
gray50 = Color(0xFFF2F2F2),
gray100 = Color(0xFFDEDEDE),
gray200 = Color(0xFFCACACA),
gray300 = Color(0xFFB5B5B5),
gray400 = Color(0xFFA1A1A1),
gray500 = Color(0xFF8C8C8C),
gray600 = Color(0xFF616064),
gray700 = Color(0xFF4C4B4F),
gray800 = Color(0xFF38373B),
background = Color(0xFFFFFFFF),
black = Color(0xFF121212),
error50 = Color(0xFFF5E6EA),
error100 = Color(0xFFE8C1C8),
error200 = Color(0xFFCA878D),
error300 = Color(0xFFB45B63),
error400 = Color(0xFFB45B63),
error500 = Color(0xFFB51F2D),
error600 = Color(0xFFA7172B),
error700 = Color(0xFF970E25),
error800 = Color(0xFF8A071F),
error900 = Color(0xFF7A0017),
label = Color(0xFFFFFFFF),
color = Color(0xFF000000),
symbol = Color(0xFF262626),
sad = Color(0xFF000000),
backgroundPrimary = Color(0xFFF5F5F5),
backgroundSecondary = Color(0xFFFFFFFF),
white = Color(0xFFFFFFFF),
title = Color(0xFF262626),
error50 = Color(0xFFFFF0F0),
error100 = Color(0xFFFFC3C3),
error200 = Color(0xFF991414),
error300 = Color(0xFFDD3232),
error400 = Color(0xFFFF4646),
)

data object Dark : DmsColor(
primary50 = Color(0xFFE4F3FF),
primary100 = Color(0xFFBFE0FF),
primary200 = Color(0xFF95CDFF),
primary300 = Color(0xFF6BB9FF),
primary400 = Color(0xFF4EA9FF),
primary500 = Color(0xFF3B99FF),
primary600 = Color(0xFF3D8BFF),
primary700 = Color(0xFF3C78EA),
primary800 = Color(0xFF3B66D8),
primary900 = Color(0xFF3745B8),
gray50 = Color(0xFF323334),
gray100 = Color(0xFF585B5F),
gray200 = Color(0xFF3A3C40),
gray300 = Color(0xFF585B5F),
gray400 = Color(0xFF6C6E73),
gray500 = Color(0xFF94979B),
gray600 = Color(0xFFB4B6BB),
gray700 = Color(0xFFD8DADF),
gray800 = Color(0xFFF0F3F8),
gray900 = Color(0xFFF7F9FE),
primary50 = Color(0xFF043277),
primary100 = Color(0xFF0D4599),
primary200 = Color(0xFF1A5ABB),
primary300 = Color(0xFF2A71DD),
primary400 = Color(0xFF3D8AFF),
primary500 = Color(0xFF69A4FF),
primary600 = Color(0xFF94BFFF),
primary700 = Color(0xFFC0D9FF),
primary800 = Color(0xFFEBF3FF),
gray50 = Color(0xFF38373B),
gray100 = Color(0xFF4C4B4F),
gray200 = Color(0xFF616064),
gray300 = Color(0xFF8C8C8C),
gray400 = Color(0xFFA1A1A1),
gray500 = Color(0xFFB5B5B5),
gray600 = Color(0xFFCACACA),
gray700 = Color(0xFFDEDEDE),
gray800 = Color(0xFFF2F2F2),
background = Color(0xFF222222),
black = Color(0xFFFFFFFF),
error50 = Color(0xFFF5E6EA),
error100 = Color(0xFFE8C1C8),
error200 = Color(0xFFCA878D),
error300 = Color(0xFFB45B63),
error400 = Color(0xFFB45B63),
error500 = Color(0xFFB51F2D),
error600 = Color(0xFFA7172B),
error700 = Color(0xFF970E25),
error800 = Color(0xFF8A071F),
error900 = Color(0xFF7A0017),
label = Color(0xFFFFFFFF),
color = Color(0xFFFFFFFF),
symbol = Color(0xFFFFFFFF),
sad = Color(0xFF000000),
backgroundPrimary = Color(0xFF242424),
backgroundSecondary = Color(0xFF2C2C2E),
white = Color(0xFF121212),
title = Color(0xFF262626),
error50 = Color(0xFFFFFFFF),
error100 = Color(0xFFFFC7C7),
error200 = Color(0xFFA83C3C),
error300 = Color(0xFFE25F5F),
error400 = Color(0xFFFF7373),
)
}
70 changes: 26 additions & 44 deletions ...gn-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/foundation/Theme.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,24 @@ private val lightColorScheme = lightColorScheme(
onSecondary = DmsColor.Light.primary600,
secondaryContainer = DmsColor.Light.primary700,
onSecondaryContainer = DmsColor.Light.primary800,
tertiary = DmsColor.Light.primary900,
onTertiary = DmsColor.Light.gray50,
tertiaryContainer = DmsColor.Light.gray100,
onTertiaryContainer = DmsColor.Light.gray200,
surface = DmsColor.Light.gray300,
onSurface = DmsColor.Light.gray400,
surfaceVariant = DmsColor.Light.gray500,
onSurfaceVariant = DmsColor.Light.gray600,
surfaceTint = DmsColor.Light.gray700,
inverseSurface = DmsColor.Light.gray800,
inverseOnSurface = DmsColor.Light.gray900,
surface = DmsColor.Light.gray50,
onSurface = DmsColor.Light.gray100,
surfaceVariant = DmsColor.Light.gray200,
onSurfaceVariant = DmsColor.Light.gray300,
inverseSurface = DmsColor.Light.gray400,
inverseOnSurface = DmsColor.Light.gray500,
tertiaryContainer = DmsColor.Light.gray600,
onTertiaryContainer = DmsColor.Light.gray700,
surfaceBright = DmsColor.Light.gray800,
error = DmsColor.Light.error50,
onError = DmsColor.Light.error100,
errorContainer = DmsColor.Light.error200,
onErrorContainer = DmsColor.Light.error300,
outline = DmsColor.Light.error400,
outlineVariant = DmsColor.Light.error500,
scrim = DmsColor.Light.error600,
surfaceBright = DmsColor.Light.error700,
surfaceContainer = DmsColor.Light.error800,
surfaceContainerHigh = DmsColor.Light.error900,
surfaceContainerHighest = DmsColor.Light.label,
surfaceContainerLow = DmsColor.Light.color,
surfaceContainerLowest = DmsColor.Light.symbol,
surfaceDim = DmsColor.Light.sad,
background = DmsColor.Light.backgroundPrimary,
onBackground = DmsColor.Light.backgroundSecondary,
background = DmsColor.Light.background,
onBackground = DmsColor.Light.black,
surfaceTint = DmsColor.Light.white,
scrim = DmsColor.Light.title,
)

private val darkColorScheme = darkColorScheme(
Expand All @@ -56,33 +47,24 @@ private val darkColorScheme = darkColorScheme(
onSecondary = DmsColor.Dark.primary600,
secondaryContainer = DmsColor.Dark.primary700,
onSecondaryContainer = DmsColor.Dark.primary800,
tertiary = DmsColor.Dark.primary900,
onTertiary = DmsColor.Dark.gray50,
tertiaryContainer = DmsColor.Dark.gray100,
onTertiaryContainer = DmsColor.Dark.gray200,
surface = DmsColor.Dark.gray300,
onSurface = DmsColor.Dark.gray400,
surfaceVariant = DmsColor.Dark.gray500,
onSurfaceVariant = DmsColor.Dark.gray600,
surfaceTint = DmsColor.Dark.gray700,
inverseSurface = DmsColor.Dark.gray800,
inverseOnSurface = DmsColor.Dark.gray900,
surface = DmsColor.Dark.gray50,
onSurface = DmsColor.Dark.gray100,
surfaceVariant = DmsColor.Dark.gray200,
onSurfaceVariant = DmsColor.Dark.gray300,
inverseSurface = DmsColor.Dark.gray400,
inverseOnSurface = DmsColor.Dark.gray500,
tertiaryContainer = DmsColor.Dark.gray600,
onTertiaryContainer = DmsColor.Dark.gray700,
surfaceBright = DmsColor.Dark.gray800,
error = DmsColor.Dark.error50,
onError = DmsColor.Dark.error100,
errorContainer = DmsColor.Dark.error200,
onErrorContainer = DmsColor.Dark.error300,
outline = DmsColor.Dark.error400,
outlineVariant = DmsColor.Dark.error500,
scrim = DmsColor.Dark.error600,
surfaceBright = DmsColor.Dark.error700,
surfaceContainer = DmsColor.Dark.error800,
surfaceContainerHigh = DmsColor.Dark.error900,
surfaceContainerHighest = DmsColor.Dark.label,
surfaceContainerLow = DmsColor.Dark.color,
surfaceContainerLowest = DmsColor.Dark.symbol,
surfaceDim = DmsColor.Dark.sad,
background = DmsColor.Dark.backgroundPrimary,
onBackground = DmsColor.Dark.backgroundSecondary,
background = DmsColor.Dark.background,
onBackground = DmsColor.Dark.black,
surfaceTint = DmsColor.Dark.white,
scrim = DmsColor.Dark.title,
)

val LocalColors = staticCompositionLocalOf { lightColorScheme }
Expand Down

0 comments on commit f9f1dbf

Please sign in to comment.