Skip to content

Commit

Permalink
Merge pull request #267 from yourssu/feature/rein/add_darkmode_parameter
Browse files Browse the repository at this point in the history
[YDS-#214] isSystemInDarkTheme() 설정을 위한 YDSTheme에 매개변수 추가
  • Loading branch information
kangyuri1114 authored Mar 24, 2024
2 parents 879078f + 1411186 commit 44f8035
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.ReadOnlyComposable
import com.yourssu.design.system.compose.base.ProvideTextStyle
import com.yourssu.design.system.compose.foundation.LocalYdsContentColor
import com.yourssu.design.system.compose.foundation.LocalYdsColorScheme
import com.yourssu.design.system.compose.foundation.LocalYdsContentColor
import com.yourssu.design.system.compose.foundation.LocalYdsTypography
import com.yourssu.design.system.compose.foundation.YdsColorScheme
import com.yourssu.design.system.compose.foundation.YdsTypography
Expand All @@ -15,10 +15,11 @@ import com.yourssu.design.system.compose.foundation.lightColorScheme

@Composable
fun YdsTheme(
isDarkMode: Boolean = isSystemInDarkTheme(),
typography: YdsTypography = YdsTheme.typography,
content: @Composable () -> Unit
content: @Composable () -> Unit,
) {
val colors = if (isSystemInDarkTheme()) {
val colors = if (isDarkMode) {
darkColorScheme
} else {
lightColorScheme
Expand All @@ -44,4 +45,4 @@ object YdsTheme {
@Composable
@ReadOnlyComposable
get() = LocalYdsTypography.current
}
}
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=2.5.9
versionName=2.5.10
#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다

0 comments on commit 44f8035

Please sign in to comment.