From 34007f1358dba51a094b68fe617e8921144f0703 Mon Sep 17 00:00:00 2001 From: hyeonseo Date: Thu, 24 Aug 2023 18:12:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:lipstick:=20::=20Text=20color=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gymi_components/component/item/GYMINoticeItem.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/GYMI-components/src/main/java/com/mpersand/gymi_components/component/item/GYMINoticeItem.kt b/GYMI-components/src/main/java/com/mpersand/gymi_components/component/item/GYMINoticeItem.kt index 8e03a98..eae5b87 100644 --- a/GYMI-components/src/main/java/com/mpersand/gymi_components/component/item/GYMINoticeItem.kt +++ b/GYMI-components/src/main/java/com/mpersand/gymi_components/component/item/GYMINoticeItem.kt @@ -35,18 +35,21 @@ fun GYMINoticeItem( Row { Text( text = title, - style = GYMITheme.typography.h5 + style = GYMITheme.typography.h5, + color = GYMITheme.colors.bw ) Spacer(modifier = Modifier.weight(1f)) Text( text = date, - style = GYMITheme.typography.body3 + style = GYMITheme.typography.body3, + color = GYMITheme.colors.bw ) } Spacer(modifier = Modifier.height(14.dp)) Text( text = content, - style = GYMITheme.typography.subtitle4 + style = GYMITheme.typography.subtitle4, + color = GYMITheme.colors.bw ) } } From 2f75791b9d11270c2d329d142370114fb30450f8 Mon Sep 17 00:00:00 2001 From: hyeonseo Date: Thu, 24 Aug 2023 18:13:05 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:sparkles:=20::=20GYMITheme=20=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C=20=EC=83=89=EC=83=81=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mpersand/gymi_components/theme/GYMITheme.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GYMI-components/src/main/java/com/mpersand/gymi_components/theme/GYMITheme.kt b/GYMI-components/src/main/java/com/mpersand/gymi_components/theme/GYMITheme.kt index f41bf38..21aed8a 100644 --- a/GYMI-components/src/main/java/com/mpersand/gymi_components/theme/GYMITheme.kt +++ b/GYMI-components/src/main/java/com/mpersand/gymi_components/theme/GYMITheme.kt @@ -1,5 +1,6 @@ package com.mpersand.gymi_components.theme +import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue @@ -59,7 +60,7 @@ private fun GYMIThemeLocalProvider( } private val Theme.colors: GYMIColor - get() = when(this) { + get() = when (this) { Theme.DARK -> GYMIDarkColors Theme.LIGHT -> GYMILightColors } @@ -86,6 +87,8 @@ fun GYMITheme( typography: GYMITypography = GYMITheme.typography, content: @Composable () -> Unit ) { + GYMITheme.gymiTheme = if (isSystemInDarkTheme()) Theme.DARK else Theme.LIGHT + GYMIThemeLocalProvider( colors = gymiTheme.colors, typography = typography,