Skip to content

Commit 1d2c998

Browse files
jihee-devjihee-dev
committed
[NDGL-30] chore: NDGL color 시스템 적용
1 parent ef957a0 commit 1d2c998

File tree

2 files changed

+87
-46
lines changed

2 files changed

+87
-46
lines changed

‎core/ui/src/main/java/com/yapp/ndgl/core/ui/theme/Color.kt‎

Lines changed: 77 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,82 @@
11
package com.yapp.ndgl.core.ui.theme
22

3+
import androidx.compose.runtime.Immutable
4+
import androidx.compose.runtime.staticCompositionLocalOf
35
import androidx.compose.ui.graphics.Color
46

5-
val Purple80 = Color(0xFFD0BCFF)
6-
val PurpleGrey80 = Color(0xFFCCC2DC)
7-
val Pink80 = Color(0xFFEFB8C8)
7+
@Immutable
8+
data class NDGLColors(
9+
val white: Color = Color.Unspecified,
810

9-
val Purple40 = Color(0xFF6650a4)
10-
val PurpleGrey40 = Color(0xFF625b71)
11-
val Pink40 = Color(0xFF7D5260)
11+
val primary50: Color = Color.Unspecified,
12+
val primary100: Color = Color.Unspecified,
13+
val primary200: Color = Color.Unspecified,
14+
val primary300: Color = Color.Unspecified,
15+
val primary400: Color = Color.Unspecified,
16+
val primary500: Color = Color.Unspecified,
17+
val primary600: Color = Color.Unspecified,
18+
val primary700: Color = Color.Unspecified,
19+
val primary800: Color = Color.Unspecified,
20+
val primary900: Color = Color.Unspecified,
21+
22+
val secondary50: Color = Color.Unspecified,
23+
val secondary100: Color = Color.Unspecified,
24+
val secondary200: Color = Color.Unspecified,
25+
val secondary300: Color = Color.Unspecified,
26+
val secondary400: Color = Color.Unspecified,
27+
val secondary500: Color = Color.Unspecified,
28+
val secondary600: Color = Color.Unspecified,
29+
val secondary700: Color = Color.Unspecified,
30+
val secondary800: Color = Color.Unspecified,
31+
val secondary900: Color = Color.Unspecified,
32+
33+
val red50: Color = Color.Unspecified,
34+
val red100: Color = Color.Unspecified,
35+
val red200: Color = Color.Unspecified,
36+
val red300: Color = Color.Unspecified,
37+
val red400: Color = Color.Unspecified,
38+
val red500: Color = Color.Unspecified,
39+
val red600: Color = Color.Unspecified,
40+
val red700: Color = Color.Unspecified,
41+
val red800: Color = Color.Unspecified,
42+
val red900: Color = Color.Unspecified,
43+
)
44+
45+
internal val ndglColors = NDGLColors(
46+
white = Color(0xFFFFFFFF),
47+
48+
primary50 = Color(0xFFF0FFF4),
49+
primary100 = Color(0xFFDCFFE4),
50+
primary200 = Color(0xFFBEF5CB),
51+
primary300 = Color(0xFF85E89D),
52+
primary400 = Color(0xFF18B368),
53+
primary500 = Color(0xFF28A745),
54+
primary600 = Color(0xFF22863A),
55+
primary700 = Color(0xFF176F2C),
56+
primary800 = Color(0xFF165C26),
57+
primary900 = Color(0xFF144620),
58+
59+
secondary50 = Color(0xFFF5F5F5),
60+
secondary100 = Color(0xFFE6E6E6),
61+
secondary200 = Color(0xFFD9D9D9),
62+
secondary300 = Color(0xFFB3B3B3),
63+
secondary400 = Color(0xFF757575),
64+
secondary500 = Color(0xFF444444),
65+
secondary600 = Color(0xFF383838),
66+
secondary700 = Color(0xFF2C2C2C),
67+
secondary800 = Color(0xFF1E1E1E),
68+
secondary900 = Color(0xFF111111),
69+
70+
red50 = Color(0xFFFEF2F2),
71+
red100 = Color(0xFFFFE2E2),
72+
red200 = Color(0xFFFFC9C9),
73+
red300 = Color(0xFFFFA2A2),
74+
red400 = Color(0xFFFF6467),
75+
red500 = Color(0xFFFB2C36),
76+
red600 = Color(0xFFE7000B),
77+
red700 = Color(0xFFC10007),
78+
red800 = Color(0xFF9F0712),
79+
red900 = Color(0xFF82181A),
80+
)
81+
82+
val LocalNDGLColors = staticCompositionLocalOf { NDGLColors() }

‎core/ui/src/main/java/com/yapp/ndgl/core/ui/theme/Theme.kt‎

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,26 @@
11
package com.yapp.ndgl.core.ui.theme
22

3-
import android.os.Build
4-
import androidx.compose.foundation.isSystemInDarkTheme
53
import androidx.compose.material3.MaterialTheme
6-
import androidx.compose.material3.darkColorScheme
7-
import androidx.compose.material3.dynamicDarkColorScheme
8-
import androidx.compose.material3.dynamicLightColorScheme
94
import androidx.compose.material3.lightColorScheme
105
import androidx.compose.runtime.Composable
11-
import androidx.compose.ui.platform.LocalContext
6+
import androidx.compose.ui.res.colorResource
7+
import com.yapp.ndgl.core.ui.R
128

13-
private val DarkColorScheme = darkColorScheme(
14-
primary = Purple80,
15-
secondary = PurpleGrey80,
16-
tertiary = Pink80
17-
)
18-
19-
private val LightColorScheme = lightColorScheme(
20-
primary = Purple40,
21-
secondary = PurpleGrey40,
22-
tertiary = Pink40
9+
private val ColorScheme
10+
@Composable get() = lightColorScheme(
11+
primary = colorResource(R.color.primary_500),
12+
secondary = colorResource(R.color.secondary_500),
13+
background = colorResource(R.color.white),
14+
surface = colorResource(R.color.white)
15+
)
2316

24-
/* Other default colors to override
25-
background = Color(0xFFFFFBFE),
26-
surface = Color(0xFFFFFBFE),
27-
onPrimary = Color.White,
28-
onSecondary = Color.White,
29-
onTertiary = Color.White,
30-
onBackground = Color(0xFF1C1B1F),
31-
onSurface = Color(0xFF1C1B1F),
32-
*/
33-
)
3417

3518
@Composable
3619
fun NDGLTheme(
37-
darkTheme: Boolean = isSystemInDarkTheme(),
38-
// Dynamic color is available on Android 12+
39-
dynamicColor: Boolean = true,
4020
content: @Composable () -> Unit
4121
) {
42-
val colorScheme = when {
43-
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
44-
val context = LocalContext.current
45-
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
46-
}
47-
48-
darkTheme -> DarkColorScheme
49-
else -> LightColorScheme
50-
}
51-
5222
MaterialTheme(
53-
colorScheme = colorScheme,
23+
colorScheme = ColorScheme,
5424
content = content
5525
)
5626
}

0 commit comments

Comments
 (0)