Merge pull request #412 from School-of-Company/refactor/411-apply-exp…

…o-detail-screen-design-change 🔀 :: (#411) - 박람회 자세히 보기 화면의 버튼 디자인이 변경되어 이를 수정하였습니다.
School-of-Company · Feb 5, 2025 · adb1368 · adb1368
2 parents 031a0e1 + 5cd692a
commit adb1368
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/...n-system/src/main/java/com/school_of_company/design_system/component/button/ExpoButton.kt b/...n-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),

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
@@ -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(