From 9834a95c3451e726cc9f58b4b87a798ba9c6b408 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Tue, 24 Sep 2024 13:57:57 +0900 Subject: [PATCH] [fix/#841] paddingShape -> shape --- .../sopt/official/feature/mypage/component/MyPageButton.kt | 6 ++++-- .../sopt/official/feature/mypage/component/MyPageDialog.kt | 2 -- .../sopt/official/feature/mypage/component/MyPageItem.kt | 6 ++---- .../sopt/official/feature/mypage/component/MyPageSection.kt | 2 +- .../sopt/official/feature/mypage/signOut/SignOutActivity.kt | 1 - .../mypage/soptamp/sentence/AdjustSentenceActivity.kt | 1 - 6 files changed, 7 insertions(+), 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 index f542dceb..0bf0c4c7 100644 --- 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,9 +34,11 @@ 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 @@ -44,12 +46,12 @@ 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 index 7438ae06..ef73b334 100644 --- 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 index b15a7a38..95e38a31 100644 --- 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 index 22038cca..d9d95322 100644 --- 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) { 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 index 9a488d78..36827d75 100644 --- 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/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt index 6e505322..ebc0d14a 100644 --- a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/soptamp/sentence/AdjustSentenceActivity.kt +++ b/feature/mypage/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,