[fix/#841] paddingShape -> shape

sopt-makers · Sep 24, 2024 · 9834a95 · 9834a95
1 parent c6239ad
commit 9834a95
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageButton.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageButton.kt
@@ -34,22 +34,24 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import org.sopt.official.designsystem.Black
 import org.sopt.official.designsystem.Gray300
 import org.sopt.official.designsystem.Gray600
 import org.sopt.official.designsystem.White
 
 @Composable
 fun MyPageButton(
-    paddingShape: Dp,
     style: TextStyle,
     paddingVertical: Dp,
     @StringRes text: Int,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    shape: Shape = RoundedCornerShape(10.dp),
     isEnabled: Boolean = true,
     containerColor: Color = White,
     contentColor: Color = Black
@@ -64,7 +66,7 @@ fun MyPageButton(
             disabledContainerColor = Gray600,
             disabledContentColor = Gray300
         ),
-        shape = RoundedCornerShape(paddingShape),
+        shape = shape,
         onClick = onClick
     ) {
         Text(

diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageDialog.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageDialog.kt
@@ -99,7 +99,6 @@ fun MyPageDialog(
             ) {
                 MyPageButton(
                     modifier = Modifier.weight(1f),
-                    paddingShape = 10.dp,
                     style = SoptTheme.typography.body14M,
                     paddingVertical = 9.dp,
                     text = negativeText,
@@ -110,7 +109,6 @@ fun MyPageDialog(
                 Spacer(modifier = Modifier.width(6.dp))
                 MyPageButton(
                     modifier = Modifier.weight(1f),
-                    paddingShape = 10.dp,
                     style = SoptTheme.typography.body14M,
                     paddingVertical = 9.dp,
                     text = positiveText,

diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageItem.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageItem.kt
@@ -45,14 +45,12 @@ import org.sopt.official.feature.mypage.R
 fun MyPageItem(
     text: String,
     modifier: Modifier = Modifier,
-    onButtonClick: () -> Unit = {}
+    onClick: () -> Unit = {}
 ) {
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .clickable {
-                onButtonClick()
-            },
+            .clickable(onClick = onClick),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
     ) {

diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageSection.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageSection.kt
@@ -65,7 +65,7 @@ fun MyPageSection(items: List<MyPageUiModel>) {
                 is MyPageUiModel.MyPageItem -> {
                     MyPageItem(
                         text = item.title,
-                        onButtonClick = item.onItemClick
+                        onClick = item.onItemClick
                     )
                     Spacer(modifier = Modifier.height(22.dp))
                 }

diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/signOut/SignOutActivity.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/signOut/SignOutActivity.kt
@@ -106,7 +106,6 @@ class SignOutActivity : AppCompatActivity() {
                         MyPageButton(
                             paddingVertical = 16.dp,
                             style = SoptTheme.typography.heading18B,
-                            paddingShape = 10.dp,
                             modifier = Modifier.padding(20.dp),
                             onClick = { viewModel.signOut() },
                             text = R.string.sign_out_button

diff --git a/...src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt b/...src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt
@@ -97,7 +97,6 @@ class AdjustSentenceActivity : AppCompatActivity() {
                         MyPageButton(
                             paddingVertical = 16.dp,
                             style = SoptTheme.typography.heading18B,
-                            paddingShape = 10.dp,
                             modifier = Modifier.padding(20.dp),
                             onClick = { viewModel.adjustSentence() },
                             text = R.string.adjust_sentence_button,