From 8ed0a543f03bf1d28037f085f4ae4af32da0695f Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:08:30 +0900 Subject: [PATCH 1/7] [chore] #17 Typography --- .../java/org/sopt/dateroad/ui/theme/Type.kt | 266 +++++++++--------- 1 file changed, 131 insertions(+), 135 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt index 89aa6181..94c5f893 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt @@ -1,147 +1,143 @@ package org.sopt.dateroad.ui.theme -import androidx.compose.material3.Typography +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import org.sopt.dateroad.R -// Set of Material typography styles to start with -val Typography = Typography( - bodyLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ -) - -// Title -val titleExtra24 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_extrabold)), - fontSize = 24.sp, - lineHeight = 24.sp * 1.3 -) - -val titleExtra20 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_extrabold)), - fontSize = 20.sp, - lineHeight = 20.sp * 1.4 -) - -val titleBold20 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 20.sp, - lineHeight = 20.sp * 1.4 -) - -val titleBold18 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 18.sp, - lineHeight = 18.sp * 1.4 -) - -val titleMed18 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_medium)), - fontSize = 18.sp, - lineHeight = 18.sp * 1.4 -) - -// Body -val bodyBold17 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 17.sp, - lineHeight = 17.sp * 1.4 -) - -val bodySemi17 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_semibold)), - fontSize = 17.sp, - lineHeight = 17.sp * 1.4 -) - -val bodyMed17 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_medium)), - fontSize = 17.sp, - lineHeight = 17.sp * 1.4 -) - -val bodyBold15 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 15.sp, - lineHeight = 15.sp * 1.4 -) - -val bodyBold15Course = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 15.sp, - lineHeight = 15.sp * 1.3 -) - -val bodySemi15 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_semibold)), - fontSize = 15.sp, - lineHeight = 15.sp * 1.4 -) - -val bodyMed15 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_medium)), - fontSize = 15.sp, - lineHeight = 15.sp * 1.4 -) - -val bodyBold13 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 13.sp, - lineHeight = 13.sp * 1.4 -) - -val bodySemi13 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_semibold)), - fontSize = 13.sp, - lineHeight = 13.sp * 1.4 -) - -val bodyMed13 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_medium)), - fontSize = 13.sp, - lineHeight = 13.sp * 1.4 -) +val SuitBold = FontFamily(Font(R.font.suit_bold)) +val SuitExtraBold = FontFamily(Font(R.font.suit_extrabold)) +val SuitExtraLight = FontFamily(Font(R.font.suit_extralight)) +val SuitMedium = FontFamily(Font(R.font.suit_medium)) +val SuitRegular = FontFamily(Font(R.font.suit_regular)) +val SuitSemiBold = FontFamily(Font(R.font.suit_semibold)) + +@Immutable +data class DateRoadTypography( + // Title + val titleExtra24: TextStyle, + val titleExtra20: TextStyle, + val titleBold20: TextStyle, + val titleBold18: TextStyle, + val titleMed18: TextStyle, + + // Body + val bodyBold17: TextStyle, + val bodySemi17: TextStyle, + val bodyMed17: TextStyle, + val bodyBold15: TextStyle, + val bodyBold15Course: TextStyle, + val bodySemi15: TextStyle, + val bodyMed15: TextStyle, + val bodyBold13: TextStyle, + val bodySemi13: TextStyle, + val bodyMed13: TextStyle, + val bodyMed13Context: TextStyle, + + // Caption + val capBold11: TextStyle, + val capReg11: TextStyle, +) + +val defaultDateRoadTypography = DateRoadTypography( + // Title + titleExtra24 = TextStyle( + fontFamily = SuitExtraBold, + fontSize = 24.sp, + lineHeight = 24.sp * 1.3 + ), + titleExtra20 = TextStyle( + fontFamily = SuitExtraBold, + fontSize = 20.sp, + lineHeight = 20.sp * 1.4 + ), + titleBold20 = TextStyle( + fontFamily = SuitBold, + fontSize = 20.sp, + lineHeight = 20.sp * 1.4 + ), + titleBold18 = TextStyle( + fontFamily = SuitBold, + fontSize = 18.sp, + lineHeight = 18.sp * 1.4 + ), + titleMed18 = TextStyle( + fontFamily = SuitMedium, + fontSize = 18.sp, + lineHeight = 18.sp * 1.4 + ), -val bodyMed13Context = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_medium)), - fontSize = 13.sp, - lineHeight = 13.sp * 1.5 -) + // Body + bodyBold17 = TextStyle( + fontFamily = SuitBold, + fontSize = 17.sp, + lineHeight = 17.sp * 1.4 + ), + bodySemi17 = TextStyle( + fontFamily = SuitSemiBold, + fontSize = 17.sp, + lineHeight = 17.sp * 1.4 + ), + bodyMed17 = TextStyle( + fontFamily = SuitMedium, + fontSize = 17.sp, + lineHeight = 17.sp * 1.4 + ), + bodyBold15 = TextStyle( + fontFamily = SuitBold, + fontSize = 15.sp, + lineHeight = 15.sp * 1.4 + ), + bodyBold15Course = TextStyle( + fontFamily = SuitBold, + fontSize = 15.sp, + lineHeight = 15.sp * 1.3 + ), + bodySemi15 = TextStyle( + fontFamily = SuitSemiBold, + fontSize = 15.sp, + lineHeight = 15.sp * 1.4 + ), + bodyMed15 = TextStyle( + fontFamily = SuitMedium, + fontSize = 15.sp, + lineHeight = 15.sp * 1.4 + ), + bodyBold13 = TextStyle( + fontFamily = SuitBold, + fontSize = 13.sp, + lineHeight = 13.sp * 1.4 + ), + bodySemi13 = TextStyle( + fontFamily = SuitSemiBold, + fontSize = 13.sp, + lineHeight = 13.sp * 1.4 + ), + bodyMed13 = TextStyle( + fontFamily = SuitMedium, + fontSize = 13.sp, + lineHeight = 13.sp * 1.4 + ), + bodyMed13Context = TextStyle( + fontFamily = SuitMedium, + fontSize = 13.sp, + lineHeight = 13.sp * 1.5 + ), -// Caption -val capBold11 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_bold)), - fontSize = 11.sp, - lineHeight = 11.sp * 1.4 + // Caption + capBold11 = TextStyle( + fontFamily = SuitBold, + fontSize = 11.sp, + lineHeight = 11.sp * 1.4 + ), + capReg11 = TextStyle( + fontFamily = SuitRegular, + fontSize = 11.sp, + lineHeight = 11.sp * 1.4 + ) ) -val capReg11 = TextStyle( - fontFamily = FontFamily(Font(R.font.suit_regular)), - fontSize = 11.sp, - lineHeight = 11.sp * 1.4 -) +val localDateRoadTypography = staticCompositionLocalOf { defaultDateRoadTypography } From e01dec5e9fc8595a85420a4b3a3bff05055555b3 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:15:54 +0900 Subject: [PATCH 2/7] [chore] #17 color --- .../java/org/sopt/dateroad/ui/theme/Color.kt | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt index ea50b73e..b96ef915 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt @@ -1,5 +1,7 @@ package org.sopt.dateroad.ui.theme +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color // Main @@ -24,3 +26,56 @@ val White = Color(0xFFFFFFFF) // Notif val AlertRed = Color(0xFFFF0000) + +@Immutable +data class DateRoadColors( + // Main + val deepPurple: Color, + val mediumPurple: Color, + val lightPurple: Color, + val lilac: Color, + val lightPink: Color, + val pink: Color, + val lime: Color, + val lightLime: Color, + + // GrayScale + val black: Color, + val gray600: Color, + val gray500: Color, + val gray400: Color, + val gray300: Color, + val gray200: Color, + val gray100: Color, + val white: Color, + + // Notif + val alertRed: Color +) + +val defaultDateRoadColors = DateRoadColors( + // Main + deepPurple = DeepPurple, + mediumPurple = MediumPurple, + lightPurple = LightPurple, + lilac = Lilac, + lightPink = LightPink, + pink = Pink, + lime = Lime, + lightLime = LightLime, + + // GrayScale + black = Black, + gray600 = Gray600, + gray500 = Gray500, + gray400 = Gray400, + gray300 = Gray300, + gray200 = Gray200, + gray100 = Gray100, + white = White, + + // Notif + alertRed = AlertRed +) + +val localDateRoadColors = staticCompositionLocalOf { defaultDateRoadColors } From 9b8c997ac72f8e42106b83cd428f914581bc9025 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:25:34 +0900 Subject: [PATCH 3/7] [feat] #17 Theme --- .../java/org/sopt/dateroad/ui/theme/Color.kt | 2 +- .../java/org/sopt/dateroad/ui/theme/Theme.kt | 76 ++++++++++--------- .../java/org/sopt/dateroad/ui/theme/Type.kt | 2 +- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt index b96ef915..d114dca5 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt @@ -78,4 +78,4 @@ val defaultDateRoadColors = DateRoadColors( alertRed = AlertRed ) -val localDateRoadColors = staticCompositionLocalOf { defaultDateRoadColors } +val LocalDateRoadColors = staticCompositionLocalOf { defaultDateRoadColors } diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt index b847ab4d..51dcbe88 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt @@ -1,57 +1,59 @@ package org.sopt.dateroad.ui.theme +import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme -import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.ReadOnlyComposable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat -private val DarkColorScheme = darkColorScheme( - primary = Pink, - secondary = MediumPurple, - tertiary = Lilac -) +object DateRoadTheme { + val colors: DateRoadColors + @Composable + @ReadOnlyComposable + get() = LocalDateRoadColors.current -private val LightColorScheme = lightColorScheme( - primary = Pink, - secondary = MediumPurple, - tertiary = Lilac + val typography: DateRoadTypography + @Composable + @ReadOnlyComposable + get() = LocalDateRoadTypography.current +} - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ -) +@Composable +fun provideDateRoadColorsAndTypography( + colors: DateRoadColors, + typography: DateRoadTypography, + content: @Composable () -> Unit, +) { + CompositionLocalProvider( + LocalDateRoadColors provides colors, + LocalDateRoadTypography provides typography, + content = content + ) +} @Composable fun DATEROADTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, content: @Composable () -> Unit ) { - val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + provideDateRoadColorsAndTypography(colors = defaultDateRoadColors, typography = defaultDateRoadTypography) { + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = Color.Transparent.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = true + } } - - darkTheme -> DarkColorScheme - else -> LightColorScheme + MaterialTheme(content = content) } - - MaterialTheme( - colorScheme = colorScheme, - typography = Typography, - content = content - ) } diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt index 94c5f893..f0b2ad03 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt @@ -140,4 +140,4 @@ val defaultDateRoadTypography = DateRoadTypography( ) ) -val localDateRoadTypography = staticCompositionLocalOf { defaultDateRoadTypography } +val LocalDateRoadTypography = staticCompositionLocalOf { defaultDateRoadTypography } From e7da9114eeb6d77125a245a9a4ae887b2101d815 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:28:34 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[feat]=20#17=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/dateroad/ui/theme/Theme.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt index 51dcbe88..09cd9b48 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt @@ -1,18 +1,15 @@ package org.sopt.dateroad.ui.theme import android.app.Activity -import android.os.Build -import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.background import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.SideEffect +import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat @@ -29,7 +26,7 @@ object DateRoadTheme { } @Composable -fun provideDateRoadColorsAndTypography( +fun ProvideDateRoadColorsAndTypography( colors: DateRoadColors, typography: DateRoadTypography, content: @Composable () -> Unit, @@ -43,9 +40,10 @@ fun provideDateRoadColorsAndTypography( @Composable fun DATEROADTheme( + backgroundColor: Color = defaultDateRoadColors.white, content: @Composable () -> Unit ) { - provideDateRoadColorsAndTypography(colors = defaultDateRoadColors, typography = defaultDateRoadTypography) { + ProvideDateRoadColorsAndTypography(colors = defaultDateRoadColors, typography = defaultDateRoadTypography) { val view = LocalView.current if (!view.isInEditMode) { SideEffect { @@ -54,6 +52,11 @@ fun DATEROADTheme( WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = true } } - MaterialTheme(content = content) + + androidx.compose.material3.Surface( + modifier = Modifier.background(backgroundColor) + ) { + MaterialTheme(content = content) + } } } From 18b7708628f7e6bf24a6b597e6caff60f020a0ab Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:37:35 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[feat]=20#17=20=EC=98=88=EC=8B=9C=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dateroad/presentation/type/PointBoxType.kt | 15 +++++++++------ .../dateroad/presentation/ui/dummy/DummyScreen.kt | 7 +++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt index f014a315..3875ad82 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt @@ -2,9 +2,12 @@ package org.sopt.dateroad.presentation.type import androidx.compose.ui.graphics.Color import org.sopt.dateroad.ui.theme.Black +import org.sopt.dateroad.ui.theme.DateRoadColors +import org.sopt.dateroad.ui.theme.DateRoadTheme import org.sopt.dateroad.ui.theme.DeepPurple import org.sopt.dateroad.ui.theme.Gray400 import org.sopt.dateroad.ui.theme.White +import org.sopt.dateroad.ui.theme.defaultDateRoadColors enum class PointBoxType( backgroundColor: Color, @@ -12,13 +15,13 @@ enum class PointBoxType( pointTextColor: Color ) { POINT_HISTORY( - backgroundColor = DeepPurple, - titleTextColor = White, - pointTextColor = White + backgroundColor = defaultDateRoadColors.deepPurple, + titleTextColor = defaultDateRoadColors.white, + pointTextColor = defaultDateRoadColors.white ), MY_PAGE( - backgroundColor = White, - titleTextColor = Gray400, - pointTextColor = Black + backgroundColor = defaultDateRoadColors.white, + titleTextColor = defaultDateRoadColors.gray400, + pointTextColor = defaultDateRoadColors.black ) } diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/dummy/DummyScreen.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/dummy/DummyScreen.kt index e30bf330..69002d82 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/dummy/DummyScreen.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/dummy/DummyScreen.kt @@ -13,10 +13,8 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.font.FontWeight.Companion.Bold import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -25,6 +23,7 @@ import org.sopt.dateroad.presentation.util.context.showToast import org.sopt.dateroad.presentation.util.modifier.noRippleClickable import org.sopt.dateroad.presentation.util.view.UiState import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.dateroad.ui.theme.DateRoadTheme @Composable fun DummyRoute( @@ -82,8 +81,8 @@ fun DummyScreen( ) { Text( text = email, - fontSize = 30.sp, - fontWeight = Bold + color = DateRoadTheme.colors.deepPurple, + style = DateRoadTheme.typography.titleExtra24 ) } } From 9dd21a9865a18bf692407cdc1818a1a913cdb5b1 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:55:30 +0900 Subject: [PATCH 6/7] [feat] #17 StatusBar Color --- .../java/org/sopt/dateroad/ui/theme/Theme.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt index 09cd9b48..21a52b08 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt @@ -1,13 +1,12 @@ package org.sopt.dateroad.ui.theme import android.app.Activity -import androidx.compose.foundation.background import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.runtime.SideEffect -import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalView @@ -47,16 +46,15 @@ fun DATEROADTheme( val view = LocalView.current if (!view.isInEditMode) { SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = Color.Transparent.toArgb() - WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = true + (view.context as Activity).window.run { + statusBarColor = backgroundColor.toArgb() + WindowCompat.getInsetsController(this, view).isAppearanceLightStatusBars = true + } } } - androidx.compose.material3.Surface( - modifier = Modifier.background(backgroundColor) - ) { - MaterialTheme(content = content) - } + MaterialTheme( + content = content + ) } } From 903684c8346064e056bc0d4b89e0a179d7e92a6b Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Sat, 6 Jul 2024 03:57:18 +0900 Subject: [PATCH 7/7] [chore] #17 ktlintFormat --- .../org/sopt/dateroad/presentation/type/PointBoxType.kt | 6 ------ app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt | 3 +-- app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt index 3875ad82..9475bb87 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/type/PointBoxType.kt @@ -1,12 +1,6 @@ package org.sopt.dateroad.presentation.type import androidx.compose.ui.graphics.Color -import org.sopt.dateroad.ui.theme.Black -import org.sopt.dateroad.ui.theme.DateRoadColors -import org.sopt.dateroad.ui.theme.DateRoadTheme -import org.sopt.dateroad.ui.theme.DeepPurple -import org.sopt.dateroad.ui.theme.Gray400 -import org.sopt.dateroad.ui.theme.White import org.sopt.dateroad.ui.theme.defaultDateRoadColors enum class PointBoxType( diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt index 21a52b08..29fadb18 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt @@ -2,7 +2,6 @@ package org.sopt.dateroad.ui.theme import android.app.Activity import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ReadOnlyComposable @@ -28,7 +27,7 @@ object DateRoadTheme { fun ProvideDateRoadColorsAndTypography( colors: DateRoadColors, typography: DateRoadTypography, - content: @Composable () -> Unit, + content: @Composable () -> Unit ) { CompositionLocalProvider( LocalDateRoadColors provides colors, diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt b/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt index f0b2ad03..160ca124 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt +++ b/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt @@ -39,7 +39,7 @@ data class DateRoadTypography( // Caption val capBold11: TextStyle, - val capReg11: TextStyle, + val capReg11: TextStyle ) val defaultDateRoadTypography = DateRoadTypography(