Skip to content

Commit 5786f67

Browse files
committed
[BOOK-206] feat: 감상평 가이드 버튼 종류 1개로 변경
1 parent f82420f commit 5786f67

2 files changed

Lines changed: 15 additions & 25 deletions

File tree

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/button/ButtonColorStyle.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import com.ninecraft.booket.core.designsystem.theme.Kakao
77
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
88

99
enum class ReedButtonColorStyle {
10-
PRIMARY, PRIMARY_INVERSE_TEXT, SECONDARY, TERTIARY, STROKE, KAKAO;
10+
PRIMARY, SECONDARY, TERTIARY, STROKE, KAKAO;
1111

1212
@Composable
1313
fun containerColor(isPressed: Boolean) = when (this) {
1414
PRIMARY -> if (isPressed) ReedTheme.colors.bgPrimaryPressed else ReedTheme.colors.bgPrimary
15-
PRIMARY_INVERSE_TEXT -> if (isPressed) ReedTheme.colors.bgPrimaryPressed else ReedTheme.colors.bgPrimary
1615
SECONDARY -> if (isPressed) ReedTheme.colors.bgSecondaryPressed else ReedTheme.colors.bgSecondary
1716
TERTIARY -> if (isPressed) ReedTheme.colors.bgTertiaryPressed else ReedTheme.colors.bgTertiary
1817
STROKE -> if (isPressed) ReedTheme.colors.basePrimary else ReedTheme.colors.basePrimary
@@ -22,7 +21,6 @@ enum class ReedButtonColorStyle {
2221
@Composable
2322
fun contentColor() = when (this) {
2423
PRIMARY -> ReedTheme.colors.contentInverse
25-
PRIMARY_INVERSE_TEXT -> ReedTheme.colors.contentInverse
2624
SECONDARY -> ReedTheme.colors.contentPrimary
2725
TERTIARY -> ReedTheme.colors.contentBrand
2826
STROKE -> ReedTheme.colors.contentBrand
@@ -33,7 +31,7 @@ enum class ReedButtonColorStyle {
3331
fun disabledContainerColor() = ReedTheme.colors.bgDisabled
3432

3533
@Composable
36-
fun disabledContentColor() = if (this == PRIMARY_INVERSE_TEXT) ReedTheme.colors.contentInverse else ReedTheme.colors.contentDisabled
34+
fun disabledContentColor() = ReedTheme.colors.contentDisabled
3735

3836
@Composable
3937
fun borderStroke() = when (this) {

feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/component/ImpressionGuideBottomSheet.kt

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -102,29 +102,21 @@ fun ImpressionGuideBottomSheet(
102102
}
103103
}
104104
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
105-
if (impressionState.text.isEmpty()) {
106-
ReedButton(
107-
onClick = {
108-
onSelectionConfirmButtonClick()
109-
},
110-
sizeStyle = largeButtonStyle,
111-
colorStyle = ReedButtonColorStyle.PRIMARY,
112-
modifier = Modifier.fillMaxWidth(),
113-
enabled = selectedImpressionGuide.isNotEmpty(),
114-
text = stringResource(R.string.impression_guide_selection_done),
115-
)
105+
val isButtonEnabled = if (impressionState.text.isEmpty()) {
106+
selectedImpressionGuide.isNotEmpty()
116107
} else {
117-
ReedButton(
118-
onClick = {
119-
onSelectionConfirmButtonClick()
120-
},
121-
sizeStyle = largeButtonStyle,
122-
colorStyle = ReedButtonColorStyle.PRIMARY_INVERSE_TEXT,
123-
modifier = Modifier.fillMaxWidth(),
124-
enabled = beforeSelectedImpressionGuide != selectedImpressionGuide,
125-
text = stringResource(R.string.impression_guide_change_done),
126-
)
108+
beforeSelectedImpressionGuide != selectedImpressionGuide
127109
}
110+
ReedButton(
111+
onClick = {
112+
onSelectionConfirmButtonClick()
113+
},
114+
sizeStyle = largeButtonStyle,
115+
colorStyle = ReedButtonColorStyle.PRIMARY,
116+
modifier = Modifier.fillMaxWidth(),
117+
enabled = isButtonEnabled,
118+
text = stringResource(R.string.impression_guide_selection_done),
119+
)
128120
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
129121
}
130122
}

0 commit comments

Comments
 (0)