From a9e1ef73845bcd848380472a44cd1515732022e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AA=85=ED=9B=88?= Date: Wed, 5 Feb 2025 01:43:51 +0900 Subject: [PATCH 1/3] :memo: :: Add Param Background Color ExpoEnableButton --- .../design_system/component/button/ExpoButton.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt b/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt index 2accdd21..4663f9b8 100644 --- a/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt +++ b/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt @@ -102,6 +102,7 @@ fun ExpoEnableButton( modifier: Modifier = Modifier, text: String, textColor: Color = Color.Black, + backgroundColor: Color = Color.White, onClick: () -> Unit, ) { ExpoAndroidTheme { colors, typography -> @@ -113,7 +114,7 @@ fun ExpoEnableButton( interactionSource = interactionSource, contentPadding = PaddingValues(vertical = 16.dp), colors = ButtonDefaults.buttonColors( - containerColor = colors.white, + containerColor = backgroundColor, contentColor = colors.white, ), shape = RoundedCornerShape(6.dp), From 6467af7524c3d8b3f26a516f825e684afe1dc0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AA=85=ED=9B=88?= Date: Wed, 5 Feb 2025 01:43:51 +0900 Subject: [PATCH 2/3] :recycle: :: Add Param Background Color ExpoEnableButton --- .../design_system/component/button/ExpoButton.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt b/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt index 2accdd21..4663f9b8 100644 --- a/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt +++ b/core/design-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt @@ -102,6 +102,7 @@ fun ExpoEnableButton( modifier: Modifier = Modifier, text: String, textColor: Color = Color.Black, + backgroundColor: Color = Color.White, onClick: () -> Unit, ) { ExpoAndroidTheme { colors, typography -> @@ -113,7 +114,7 @@ fun ExpoEnableButton( interactionSource = interactionSource, contentPadding = PaddingValues(vertical = 16.dp), colors = ButtonDefaults.buttonColors( - containerColor = colors.white, + containerColor = backgroundColor, contentColor = colors.white, ), shape = RoundedCornerShape(6.dp), From 5cd692a8ebecee791f15c5f6e6fd2656c47e62ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=AA=85=ED=9B=88?= Date: Wed, 5 Feb 2025 01:44:46 +0900 Subject: [PATCH 3/3] :recycle: :: Apply ExpoDetailScreen Buttons Design Change --- .../expo/view/ExpoDetailScreen.kt | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/feature/expo/src/main/java/com/school_of_company/expo/view/ExpoDetailScreen.kt b/feature/expo/src/main/java/com/school_of_company/expo/view/ExpoDetailScreen.kt index f366c457..c33d2621 100644 --- a/feature/expo/src/main/java/com/school_of_company/expo/view/ExpoDetailScreen.kt +++ b/feature/expo/src/main/java/com/school_of_company/expo/view/ExpoDetailScreen.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.hilt.navigation.compose.hiltViewModel @@ -327,26 +328,15 @@ private fun ExpoDetailScreen( ExpoEnableDetailButton( text = "문자 보내기", onClick = { isOpenDialog(true) }, - modifier = Modifier - .fillMaxWidth() - .border( - width = 1.dp, - color = colors.main, - shape = RoundedCornerShape(6.dp) - ) + modifier = Modifier.fillMaxWidth() ) ExpoEnableButton( text = "수정하기", onClick = { onModifyClick(id) }, - textColor = colors.main, - modifier = Modifier - .fillMaxWidth() - .border( - width = 1.dp, - color = colors.main, - shape = RoundedCornerShape(6.dp) - ) + textColor = colors.gray700, + backgroundColor = colors.gray100, + modifier = Modifier.fillMaxWidth() ) } @@ -417,7 +407,7 @@ private fun ExpoDetailScreen( } } -@ExpoPreviews +@Preview @Composable private fun HomeDetailScreenPreview() { ExpoDetailScreen(