Skip to content

Commit 44f8035

Browse files
authored
Merge pull request #267 from yourssu/feature/rein/add_darkmode_parameter
[YDS-#214] isSystemInDarkTheme() 설정을 위한 YDSTheme에 매개변수 추가
2 parents 879078f + 1411186 commit 44f8035

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

compose/src/main/java/com/yourssu/design/system/compose/YdsTheme.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import androidx.compose.runtime.Composable
55
import androidx.compose.runtime.CompositionLocalProvider
66
import androidx.compose.runtime.ReadOnlyComposable
77
import com.yourssu.design.system.compose.base.ProvideTextStyle
8-
import com.yourssu.design.system.compose.foundation.LocalYdsContentColor
98
import com.yourssu.design.system.compose.foundation.LocalYdsColorScheme
9+
import com.yourssu.design.system.compose.foundation.LocalYdsContentColor
1010
import com.yourssu.design.system.compose.foundation.LocalYdsTypography
1111
import com.yourssu.design.system.compose.foundation.YdsColorScheme
1212
import com.yourssu.design.system.compose.foundation.YdsTypography
@@ -15,10 +15,11 @@ import com.yourssu.design.system.compose.foundation.lightColorScheme
1515

1616
@Composable
1717
fun YdsTheme(
18+
isDarkMode: Boolean = isSystemInDarkTheme(),
1819
typography: YdsTypography = YdsTheme.typography,
19-
content: @Composable () -> Unit
20+
content: @Composable () -> Unit,
2021
) {
21-
val colors = if (isSystemInDarkTheme()) {
22+
val colors = if (isDarkMode) {
2223
darkColorScheme
2324
} else {
2425
lightColorScheme
@@ -44,4 +45,4 @@ object YdsTheme {
4445
@Composable
4546
@ReadOnlyComposable
4647
get() = LocalYdsTypography.current
47-
}
48+
}

version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=2.5.9
1+
versionName=2.5.10
22
#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다

0 commit comments

Comments
 (0)