From c2adda3022709dd43e03e6c244cbd0999ad4f93c Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 27 Jul 2023 23:20:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#121=20=EC=B9=B4=EB=93=9C=20=ED=85=8C?= =?UTF-8?q?=EB=91=90=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/droidknights/app2023/feature/setting/SettingScreen.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt b/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt index 2bd8bef9..028a1d8f 100644 --- a/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt +++ b/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt @@ -3,6 +3,7 @@ package com.droidknights.app2023.feature.setting import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatDelegate +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,6 +16,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RadioButton import androidx.compose.material3.RadioButtonDefaults import androidx.compose.material3.Surface @@ -31,6 +33,7 @@ import androidx.compose.ui.unit.dp import com.droidknights.app2023.core.designsystem.component.KnightsCard import com.droidknights.app2023.core.designsystem.theme.KnightsTheme import com.droidknights.app2023.core.designsystem.theme.LocalDarkTheme +import com.droidknights.app2023.core.designsystem.theme.onSecondaryFixed @Composable internal fun SettingScreen(padding: PaddingValues) { @@ -106,6 +109,7 @@ private fun ThemeCard( ) { Surface( shape = RoundedCornerShape(16.dp), + border = BorderStroke(1.dp, MaterialTheme.colorScheme.onSecondaryFixed), onClick = onClick, ) { Image( From f3710a9ba0ad80e1ed107d07fad49dacbb646a9c Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 27 Jul 2023 23:23:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#121=20=ED=85=8C=EB=A7=88=20=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C=20=EC=BB=AC=EB=9F=AC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app2023/feature/setting/SettingScreen.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt b/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt index 028a1d8f..dba1acfc 100644 --- a/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt +++ b/feature/setting/src/main/java/com/droidknights/app2023/feature/setting/SettingScreen.kt @@ -25,7 +25,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -58,13 +57,13 @@ private fun LightDarkThemeCard(darkTheme: Boolean = LocalDarkTheme.current) { AppCompatDelegate.setDefaultNightMode(mode) } - CompositionLocalProvider(LocalContentColor provides Color(0xFF000000)) { + CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onPrimaryContainer) { KnightsCard { Column { Text( text = stringResource(id = R.string.setting), style = KnightsTheme.typography.headlineSmallBL, - modifier = Modifier.padding(top = 24.dp, start = 24.dp) + modifier = Modifier.padding(top = 24.dp, start = 24.dp), ) Spacer(modifier = Modifier.height(40.dp)) @@ -129,8 +128,8 @@ private fun ThemeCard( selected = selected, onClick = onClick, colors = RadioButtonDefaults.colors( - selectedColor = Color(0xFF000000), - unselectedColor = Color(0xFF5E5E5E) + selectedColor = MaterialTheme.colorScheme.onPrimaryContainer, + unselectedColor = MaterialTheme.colorScheme.onSurface, ) ) }