diff --git a/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt b/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt index 75f81029..07d0cb4f 100644 --- a/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt +++ b/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt @@ -114,10 +114,6 @@ fun SusuTextFieldFillMaxButton( modifier = Modifier.weight(1f), contentAlignment = Alignment.Center, ) { - if (isSaved.not()) { - innerTextField() - } - /** * Problem : innerTextField 수정 중에 saved가 되면 underline이 생기는 현상. * Solution : saved 상태에서는 Text 컴포저블 함수가 보이게 함. @@ -145,6 +141,10 @@ fun SusuTextFieldFillMaxButton( minLines = minLines, ) } + + if (isSaved.not()) { + innerTextField() + } } InnerButtons( @@ -213,6 +213,18 @@ fun SusuTextFieldWrapContentButton( Box( contentAlignment = Alignment.Center, ) { + if (text.isEmpty()) { + Text( + text = placeholder, + color = color.placeholderColor, + style = textStyle, + textAlign = TextAlign.Center, + overflow = overflow, + maxLines = maxLines, + minLines = minLines, + ) + } + BasicTextField( modifier = Modifier .disabledHorizontalPointerInputScroll() @@ -254,18 +266,6 @@ fun SusuTextFieldWrapContentButton( innerTextField() }, ) - - if (text.isEmpty()) { - Text( - text = placeholder, - color = color.placeholderColor, - style = textStyle, - textAlign = TextAlign.Center, - overflow = overflow, - maxLines = maxLines, - minLines = minLines, - ) - } } InnerButtons( diff --git a/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerAddCard.kt b/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerAddCard.kt index ba1415d7..3413846f 100644 --- a/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerAddCard.kt +++ b/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerAddCard.kt @@ -5,10 +5,12 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.PathEffect import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.platform.LocalDensity @@ -37,6 +39,7 @@ fun LedgerAddCard( Box( modifier = modifier + .clip(RoundedCornerShape(4.dp)) .aspectRatio(1f) .susuClickable(onClick = onClick), ) { diff --git a/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerCard.kt b/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerCard.kt index e56e732f..7bc995ad 100644 --- a/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerCard.kt +++ b/feature/received/src/main/java/com/susu/feature/received/received/component/LedgerCard.kt @@ -6,11 +6,14 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp import com.susu.core.designsystem.component.badge.BadgeColor import com.susu.core.designsystem.component.badge.BadgeStyle import com.susu.core.designsystem.component.badge.SusuBadge @@ -35,6 +38,7 @@ fun LedgerCard( Column( modifier = modifier + .clip(RoundedCornerShape(4.dp)) .aspectRatio(1f) .background(Gray10) .susuClickable(onClick = onClick)