Skip to content

Commit 5b9d1e7

Browse files
committed
[NDGL-30] chore: NDGLTheme 적용
1 parent e068702 commit 5b9d1e7

1 file changed

Lines changed: 27 additions & 13 deletions

File tree

  • core/ui/src/main/java/com/yapp/ndgl/core/ui/theme

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

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,38 @@ package com.yapp.ndgl.core.ui.theme
33
import androidx.compose.material3.MaterialTheme
44
import androidx.compose.material3.lightColorScheme
55
import androidx.compose.runtime.Composable
6-
import androidx.compose.ui.res.colorResource
7-
import com.yapp.ndgl.core.ui.R
6+
import androidx.compose.runtime.CompositionLocalProvider
7+
import androidx.compose.runtime.ReadOnlyComposable
88

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-
)
9+
object NDGLTheme {
10+
val colors: NDGLColors
11+
@Composable
12+
@ReadOnlyComposable
13+
get() = LocalNDGLColors.current
1614

15+
val typography: NDGLTypography
16+
@Composable
17+
@ReadOnlyComposable
18+
get() = LocalNDGLTypography.current
19+
}
1720

1821
@Composable
1922
fun NDGLTheme(
2023
content: @Composable () -> Unit
2124
) {
22-
MaterialTheme(
23-
colorScheme = ColorScheme,
24-
content = content
25-
)
25+
CompositionLocalProvider(
26+
LocalNDGLColors provides ndglColors(),
27+
) {
28+
val colorScheme = lightColorScheme(
29+
primary = NDGLTheme.colors.primary500,
30+
secondary = NDGLTheme.colors.secondary500,
31+
background = NDGLTheme.colors.white,
32+
surface = NDGLTheme.colors.white
33+
)
34+
35+
MaterialTheme(
36+
colorScheme = colorScheme,
37+
content = content
38+
)
39+
}
2640
}

0 commit comments

Comments
 (0)