From c8f3666a3ffd0cb3d6e27f5fac91227a81d58e03 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sun, 24 Mar 2024 17:48:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore=20:=20isSystemInDarkTheme()=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=A7=A4?= =?UTF-8?q?=EA=B0=9C=EB=B3=80=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yourssu/design/system/compose/YdsTheme.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/YdsTheme.kt b/compose/src/main/java/com/yourssu/design/system/compose/YdsTheme.kt index f56dee65..b90e90cd 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/YdsTheme.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/YdsTheme.kt @@ -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 @@ -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 @@ -44,4 +45,4 @@ object YdsTheme { @Composable @ReadOnlyComposable get() = LocalYdsTypography.current -} \ No newline at end of file +} From 1411186dfec69502ea9ae6ba238db41d5a840ce7 Mon Sep 17 00:00:00 2001 From: kangyuri1114 Date: Sun, 24 Mar 2024 17:51:46 +0900 Subject: [PATCH 2/2] chore : versionName 2.5.9 -> 2.5.10 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index e631aab9..42988410 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=2.5.9 +versionName=2.5.10 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다