Skip to content

Commit 945bcc6

Browse files
committed
[BOOK-353] feat: 선택 뱃지 추가
1 parent b7e3b0d commit 945bcc6

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/theme/Typography.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ data class ReedTypography(
7575
val label2Regular: TextStyle = style(13, 18, -0.13f, FontWeight.Normal),
7676

7777
// Caption
78+
val caption1Medium: TextStyle = style(12, 16, -0.12f, FontWeight.Medium),
7879
val caption1Regular: TextStyle = style(12, 16, -0.12f, FontWeight.Normal),
7980
val caption2Regular: TextStyle = style(11, 14, -0.11f, FontWeight.Normal),
8081

feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/ImpressionStep.kt

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@ package com.ninecraft.booket.feature.record.step
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Arrangement
5+
import androidx.compose.foundation.layout.Box
56
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.FlowRow
68
import androidx.compose.foundation.layout.Row
79
import androidx.compose.foundation.layout.Spacer
810
import androidx.compose.foundation.layout.fillMaxSize
911
import androidx.compose.foundation.layout.fillMaxWidth
1012
import androidx.compose.foundation.layout.height
1113
import androidx.compose.foundation.layout.imePadding
1214
import androidx.compose.foundation.layout.padding
15+
import androidx.compose.foundation.layout.width
1316
import androidx.compose.foundation.relocation.BringIntoViewRequester
1417
import androidx.compose.foundation.relocation.bringIntoViewRequester
1518
import androidx.compose.foundation.rememberScrollState
19+
import androidx.compose.foundation.shape.RoundedCornerShape
1620
import androidx.compose.foundation.text.KeyboardOptions
1721
import androidx.compose.foundation.verticalScroll
1822
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -28,6 +32,7 @@ import androidx.compose.runtime.rememberCoroutineScope
2832
import androidx.compose.runtime.setValue
2933
import androidx.compose.ui.Alignment
3034
import androidx.compose.ui.Modifier
35+
import androidx.compose.ui.draw.clip
3136
import androidx.compose.ui.focus.FocusRequester
3237
import androidx.compose.ui.focus.focusRequester
3338
import androidx.compose.ui.focus.onFocusChanged
@@ -90,11 +95,34 @@ fun ImpressionStep(
9095
.padding(bottom = 16.dp)
9196
.verticalScroll(scrollState),
9297
) {
93-
Text(
94-
text = stringResource(R.string.impression_step_title),
95-
color = ReedTheme.colors.contentPrimary,
96-
style = ReedTheme.typography.heading1Bold,
97-
)
98+
FlowRow(
99+
itemVerticalAlignment = Alignment.CenterVertically,
100+
modifier = Modifier.fillMaxWidth(),
101+
) {
102+
Text(
103+
text = stringResource(R.string.impression_step_title),
104+
color = ReedTheme.colors.contentPrimary,
105+
style = ReedTheme.typography.heading1Bold,
106+
)
107+
Spacer(modifier = Modifier.width(10.dp))
108+
Box(
109+
modifier = Modifier
110+
.clip(RoundedCornerShape(ReedTheme.radius.xs))
111+
.background(ReedTheme.colors.bgTertiary),
112+
) {
113+
Text(
114+
text = stringResource(R.string.select),
115+
modifier = Modifier.padding(
116+
start = ReedTheme.spacing.spacing2,
117+
top = ReedTheme.spacing.spacing05,
118+
end = ReedTheme.spacing.spacing2,
119+
bottom = ReedTheme.spacing.spacing05,
120+
),
121+
color = ReedTheme.colors.contentBrand,
122+
style = ReedTheme.typography.caption1Regular,
123+
)
124+
}
125+
}
98126
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing1))
99127
Text(
100128
text = stringResource(R.string.impression_step_description),

feature/record/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@
4040
<string name="quote_step_page_input_error">해당 책의 마지막 페이지 수를 초과했습니다</string>
4141
<string name="impression_guide_tooltip_message">예시 문장을 알려드려요</string>
4242
<string name="scan_tooltip_message">스캔으로 빠르게 입력해요</string>
43+
<string name="select">선택</string>
4344
</resources>

0 commit comments

Comments
 (0)