From b2fb06e0cb4288e49fb92ed9eafa00a841e71934 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Wed, 17 Dec 2025 20:44:44 +0900 Subject: [PATCH 1/3] [bug] Remove fixed button height to prevent text clipping with large fonts --- .../daily/dayo/presentation/screen/account/WithdrawScreen.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 657f1a90..d9f8fa5f 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 @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -551,7 +552,7 @@ fun WithdrawHoldBottomSheet( label = stringResource(id = content.cancelButtonTextResId), modifier = Modifier .weight(1f) - .height(52.dp), + .defaultMinSize(minHeight = 52.dp), color = ButtonDefaults.buttonColors( containerColor = PrimaryL3_F2FBF7, contentColor = Primary_23C882 @@ -567,7 +568,7 @@ fun WithdrawHoldBottomSheet( label = stringResource(id = content.confirmButtonTextResId), modifier = Modifier .weight(1f) - .height(52.dp), + .defaultMinSize(minHeight = 52.dp), enabled = !(reason == WithdrawalReason.OTHER && otherReasonText.isBlank()), color = ButtonDefaults.buttonColors( containerColor = Primary_23C882, From d715851f7601cd771f2ffa37ddac111fbbb16300 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Wed, 17 Dec 2025 20:45:10 +0900 Subject: [PATCH 2/3] [bug] Replace Row with FlowRow to support wrapping when text size increases --- .../screen/account/WithdrawScreen.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) 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 d9f8fa5f..b779099d 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 @@ -11,6 +11,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio @@ -815,30 +816,36 @@ private fun WithdrawGuideContentUI( Spacer(modifier = Modifier.height(20.dp)) val guideStrings = words.ifEmpty { emptyList() } - Row( + FlowRow( modifier = Modifier .padding(bottom = 16.dp) - .wrapContentHeight() .fillMaxWidth(), horizontalArrangement = Arrangement.Center, - verticalAlignment = Alignment.CenterVertically, + verticalArrangement = Arrangement.Center ) { guideStrings.forEachIndexed { index, guide -> Text( text = guide, + modifier = Modifier.align(Alignment.CenterVertically), color = Gray1_50545B, textAlign = TextAlign.Center, - style = DayoTheme.typography.caption4 + style = DayoTheme.typography.caption4, ) if (index != guideStrings.lastIndex) { - Spacer(modifier = Modifier.width(6.dp)) + Spacer(modifier = Modifier + .width(6.dp) + .align(Alignment.CenterVertically)) Icon( imageVector = ImageVector.vectorResource(R.drawable.ic_arrow_right), contentDescription = null, + modifier = Modifier + .size(12.dp) + .align(Alignment.CenterVertically), tint = Gray3_9FA5AE, - modifier = Modifier.size(12.dp) ) - Spacer(modifier = Modifier.width(6.dp)) + Spacer(modifier = Modifier + .width(6.dp) + .align(Alignment.CenterVertically)) } } } From 9bfb6f22596937eb5ab54b8387f517d1cfc6b284 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Wed, 17 Dec 2025 20:52:20 +0900 Subject: [PATCH 3/3] [bug] Remove fixed button height to prevent text clipping with large fonts --- .../daily/dayo/presentation/screen/account/WithdrawScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b779099d..77250b29 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 @@ -671,7 +671,7 @@ fun WithdrawButton( FilledRoundedCornerButton( modifier = Modifier .fillMaxWidth() - .height(52.dp), + .defaultMinSize(minHeight = 52.dp), label = stringResource(R.string.withdraw_confirm), color = ButtonDefaults.buttonColors( containerColor = Primary_23C882,