diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt index 77250b29..a5324dad 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt @@ -455,33 +455,28 @@ fun WithdrawHoldBottomSheet( .fillMaxWidth() .wrapContentHeight() ) { - Column( - modifier = Modifier - .padding(bottom = 8.dp) - ) { - - Text( - text = stringResource(id = content.titleResId), - style = DayoTheme.typography.b1, - color = Dark, - ) + Text( + text = stringResource(id = content.titleResId), + style = DayoTheme.typography.b1, + color = Dark, + ) - val descriptionText = stringResource(id = content.descriptionResId) - if (descriptionText.isNotBlank()) { - Spacer( - modifier = Modifier.height( - if (isOtherReason) 2.dp else 4.dp - ) + val descriptionText = stringResource(id = content.descriptionResId) + if (descriptionText.isNotBlank()) { + Spacer( + modifier = Modifier.height( + if (isOtherReason) 2.dp else 4.dp ) - Text( - text = descriptionText, - style = DayoTheme.typography.caption2.copy( - color = Gray2_767B83, - fontWeight = FontWeight.Medium - ) + ) + Text( + text = descriptionText, + style = DayoTheme.typography.caption2.copy( + color = Gray2_767B83, + fontWeight = FontWeight.Medium ) - } + ) } + Spacer( modifier = Modifier.height( if (isOtherReason || hasWithdrawReasonGuide) 8.dp @@ -622,11 +617,11 @@ fun WithdrawConfirmScreen( fontWeight = FontWeight.SemiBold ), ) - Spacer(modifier = Modifier.height(20.dp)) + Spacer(modifier = Modifier.height(32.dp)) withdrawCheckLists.forEachIndexed { index, text -> WithdrawConfirmCheckItems(checkText = text) if (index != withdrawCheckLists.lastIndex) { - Spacer(modifier = Modifier.height(12.dp)) + Spacer(modifier = Modifier.height(16.dp)) } } } @@ -692,11 +687,13 @@ fun WithdrawConfirmCheckItems( Row( modifier = Modifier .fillMaxWidth() - .wrapContentHeight() + .wrapContentHeight(), + verticalAlignment = Alignment.CenterVertically ) { Icon( painter = painterResource(id = R.drawable.ic_check), contentDescription = null, + modifier = Modifier.size(20.dp), tint = Primary_23C882, ) Spacer(modifier = Modifier.width(4.dp)) @@ -832,9 +829,11 @@ private fun WithdrawGuideContentUI( style = DayoTheme.typography.caption4, ) if (index != guideStrings.lastIndex) { - Spacer(modifier = Modifier - .width(6.dp) - .align(Alignment.CenterVertically)) + Spacer( + modifier = Modifier + .width(6.dp) + .align(Alignment.CenterVertically) + ) Icon( imageVector = ImageVector.vectorResource(R.drawable.ic_arrow_right), contentDescription = null, @@ -843,9 +842,11 @@ private fun WithdrawGuideContentUI( .align(Alignment.CenterVertically), tint = Gray3_9FA5AE, ) - Spacer(modifier = Modifier - .width(6.dp) - .align(Alignment.CenterVertically)) + Spacer( + modifier = Modifier + .width(6.dp) + .align(Alignment.CenterVertically) + ) } } } @@ -933,4 +934,4 @@ data class WithdrawRetentionSheetContent( enum class WithdrawStep(val stepNum: Int) { REASON_SELECT(0), CONFIRM(1), -} \ No newline at end of file +} diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt index 808893d5..6dee5b31 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt @@ -42,8 +42,10 @@ import androidx.compose.ui.graphics.Color.Companion.White import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import daily.dayo.domain.model.Profile @@ -273,14 +275,16 @@ private fun SettingProfile( Text( text = profile?.nickname ?: "", color = Dark, - style = DayoTheme.typography.b2 + textAlign = TextAlign.Center, + style = DayoTheme.typography.b1 ) // email Text( text = profile?.email ?: "", color = Gray3_9FA5AE, - style = DayoTheme.typography.b6 + textAlign = TextAlign.Center, + style = DayoTheme.typography.b6.copy(lineHeight = 21.sp) ) Spacer(modifier = Modifier.height(16.dp)) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Button.kt b/presentation/src/main/java/daily/dayo/presentation/view/Button.kt index f13fa2a1..ed77a75b 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Button.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Button.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.TextAutoSize import androidx.compose.material.IconButton import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add @@ -31,8 +32,10 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import daily.dayo.presentation.theme.Dark import daily.dayo.presentation.theme.DayoTheme import daily.dayo.presentation.theme.Gray2_767B83 @@ -116,7 +119,14 @@ fun FilledRoundedCornerButton( text = label, textAlign = TextAlign.Center, style = textStyle, - modifier = contentModifier ?: Modifier.fillMaxWidth() + modifier = contentModifier ?: Modifier.fillMaxWidth(), + maxLines = 1, + softWrap = false, + overflow = TextOverflow.Clip, + autoSize = TextAutoSize.StepBased( + minFontSize = 12.sp, + maxFontSize = textStyle.fontSize + ) ) } }, @@ -261,4 +271,4 @@ private fun PreviewDayoTextButton() { Text(text = "입니다.", style = DayoTheme.typography.caption3.copy(Gray4_C5CAD2)) } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt index fa24d869..b53629ea 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentSize @@ -152,7 +153,9 @@ fun BottomSheetDialog( Icon( imageVector = rightIcon, contentDescription = "", - modifier = Modifier.align(Alignment.CenterVertically), + modifier = Modifier + .size(24.dp) + .align(Alignment.CenterVertically), tint = Color.Unspecified ) } diff --git a/presentation/src/main/res/drawable/ic_check.xml b/presentation/src/main/res/drawable/ic_check.xml index 5da02f28..94c281d9 100644 --- a/presentation/src/main/res/drawable/ic_check.xml +++ b/presentation/src/main/res/drawable/ic_check.xml @@ -1,10 +1,12 @@ + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20"> + android:strokeLineCap="round" + android:strokeLineJoin="round" /> \ No newline at end of file