From abc04e673599d47e12f957933f63572628eac67a Mon Sep 17 00:00:00 2001 From: uiel Date: Fri, 29 Nov 2024 23:53:31 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore=20::=20=EB=9D=BC=EC=9D=B4=EB=B8=8C?= =?UTF-8?q?=EB=9F=AC=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 --- feature/application/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/feature/application/build.gradle.kts b/feature/application/build.gradle.kts index 558a1ef..be7bbec 100644 --- a/feature/application/build.gradle.kts +++ b/feature/application/build.gradle.kts @@ -42,6 +42,10 @@ kotlin { implementation(compose.material3) implementation(compose.ui) implementation(libs.navigation.compose) + implementation(compose.components.resources) + + implementation(projects.core.designSystem) + implementation(projects.core.common) } commonTest.dependencies { implementation(libs.kotlin.test) From 8f9767190b35945c0ef07552f0dffa7e3726e0fc Mon Sep 17 00:00:00 2001 From: uiel Date: Sat, 30 Nov 2024 22:10:19 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor=20::=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aliens/dms/kmp/feature/signup/ui/TermsScreen.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt b/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt index e7754aa..226d0e5 100644 --- a/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt +++ b/feature/signup/src/commonMain/kotlin/team/aliens/dms/kmp/feature/signup/ui/TermsScreen.kt @@ -111,16 +111,12 @@ private fun AllAgreeButton( onAllAgreeButtonClick: (Boolean) -> Unit, ) { var isCheck by remember { mutableStateOf(buttonEnabled) } - val background = if (isCheck) { - DmsTheme.colors.onSecondary + val (background, contentColor) = if (isCheck) { + DmsTheme.colors.onSecondary to DmsTheme.colors.surfaceContainerHighest } else { - DmsTheme.colors.onBackground - } - val contentColor = if (isCheck) { - DmsTheme.colors.surfaceContainerHighest - } else { - DmsTheme.colors.onSurface + DmsTheme.colors.onBackground to DmsTheme.colors.onSurface } + Row( modifier = Modifier .fillMaxWidth() From 7759a40ac364fb12de0240f615915af518710d85 Mon Sep 17 00:00:00 2001 From: uiel Date: Sun, 1 Dec 2024 23:58:19 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor=20::=20default=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt index 442a4c1..8832cf7 100644 --- a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt +++ b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/button/DmsIconButton.kt @@ -15,12 +15,13 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.painterResource +import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme @Composable fun DmsIconButton( modifier: Modifier = Modifier, resource: DrawableResource, - tint: Color, + tint: Color = DmsTheme.colors.surfaceContainerLow, enabled: Boolean = true, size: Dp = 24.dp, contentDescription: String? = null, From 27bc533f6468f967408f99f2218cc5339aebf155 Mon Sep 17 00:00:00 2001 From: uiel Date: Mon, 2 Dec 2024 23:04:07 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor=20::=20=EC=98=B5=EC=85=94=EB=84=90?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/designsystem/appbar/DmsTopAppBar.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt index f41c9a3..4523c82 100644 --- a/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt +++ b/core/design-system/src/commonMain/kotlin/team/aliens/dms/kmp/core/designsystem/appbar/DmsTopAppBar.kt @@ -90,16 +90,16 @@ fun DmsLargeTopAppBar( .fillMaxWidth() .background(DmsTheme.colors.background), ) { - Row( - modifier = Modifier - .fillMaxWidth() - .padding( - horizontal = 16.dp, - vertical = 12.dp, - ), - verticalAlignment = Alignment.CenterVertically, - ) { - onBackPressed?.let { + onBackPressed?.let { + Row( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = 16.dp, + vertical = 12.dp, + ), + verticalAlignment = Alignment.CenterVertically, + ) { DmsIconButton( resource = DmsIcon.ArrowBack, tint = DmsTheme.colors.surfaceContainerLow,