Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[YDS-#214] isSystemInDarkTheme() 설정을 위한 YDSTheme에 매개변수 추가 #267

Merged
merged 2 commits into from
Mar 24, 2024
Merged

[YDS-#214] isSystemInDarkTheme() 설정을 위한 YDSTheme에 매개변수 추가 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f3666
chore : isSystemInDarkTheme() 설정을 위한 매개변수 추가
kangyuri1114 Mar 24, 2024
1411186
chore : versionName 2.5.9 -> 2.5.10
kangyuri1114 Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions compose/src/main/java/com/yourssu/design/system/compose/YdsTheme.kt
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=2.5.9
versionName=2.5.10
#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다
Loading