Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qa/12 13 ledger card radius cursor layer #134

Merged
merged 2 commits into from
Feb 9, 2024
Merged

Qa/12 13 ledger card radius cursor layer #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f3e53e
design: ์žฅ๋ถ€ ์นด๋“œ radius ์ ์šฉ
jinukeu Feb 8, 2024
836dc10
design: SusuTextFieldButton ์ปค์„œ ๋ ˆ์ด์–ด ์ด๋™
jinukeu Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions ...src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ fun SusuTextFieldFillMaxButton(
modifier = Modifier.weight(1f),
contentAlignment = Alignment.Center,
) {
if (isSaved.not()) {
innerTextField()
}

/**
* Problem : innerTextField ์ˆ˜์ • ์ค‘์— saved๊ฐ€ ๋˜๋ฉด underline์ด ์ƒ๊ธฐ๋Š” ํ˜„์ƒ.
* Solution : saved ์ƒํƒœ์—์„œ๋Š” Text ์ปดํฌ์ €๋ธ” ํ•จ์ˆ˜๊ฐ€ ๋ณด์ด๊ฒŒ ํ•จ.
Expand Down Expand Up @@ -145,6 +141,10 @@ fun SusuTextFieldFillMaxButton(
minLines = minLines,
)
}

if (isSaved.not()) {
innerTextField()
}
}

InnerButtons(
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 3 additions & 0 deletions feature/received/src/main/java/com/susu/feature/received/received/component/LedgerAddCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -37,6 +39,7 @@ fun LedgerAddCard(

Box(
modifier = modifier
.clip(RoundedCornerShape(4.dp))
.aspectRatio(1f)
.susuClickable(onClick = onClick),
) {
Expand Down
4 changes: 4 additions & 0 deletions feature/received/src/main/java/com/susu/feature/received/received/component/LedgerCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,6 +38,7 @@ fun LedgerCard(

Column(
modifier = modifier
.clip(RoundedCornerShape(4.dp))
.aspectRatio(1f)
.background(Gray10)
.susuClickable(onClick = onClick)
Expand Down
Loading