Skip to content

Commit 194d574

Browse files
easyhoooneasyhooon
authored
Merge pull request #230 from YAPP-Github/BOOK-473-refactor/#229
refactor: 리컴포지션 최적화를 위한 람다 기반 Modifier 적용
2 parents 7e70487 + f428b99 commit 194d574

File tree

31 files changed

+115
-118
lines changed

31 files changed

+115
-118
lines changed

‎core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/RecordProgressBar.kt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,14 @@ fun RecordProgressBar(
2424
horizontalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing1),
2525
) {
2626
repeat(3) { index ->
27+
val bgColor = if (index <= currentStep.ordinal) ReedTheme.colors.bgPrimary else ReedTheme.colors.bgDisabled
28+
2729
Box(
2830
modifier = Modifier
2931
.weight(1f)
3032
.height(6.dp)
3133
.clip(RoundedCornerShape(ReedTheme.radius.full))
32-
.background(
33-
color = if (index <= currentStep.ordinal) {
34-
ReedTheme.colors.bgPrimary
35-
} else {
36-
ReedTheme.colors.bgDisabled
37-
},
38-
),
34+
.background(bgColor),
3935
)
4036
}
4137
}

‎core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/checkbox/CircleCheckBox.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
1515
import androidx.compose.ui.Alignment
1616
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.draw.clip
1718
import androidx.compose.ui.graphics.Color
1819
import androidx.compose.ui.graphics.vector.ImageVector
1920
import androidx.compose.ui.res.vectorResource
@@ -36,10 +37,8 @@ fun CircleCheckBox(
3637
Box(
3738
modifier = modifier
3839
.size(24.dp)
39-
.background(
40-
color = bgColor,
41-
shape = CircleShape,
42-
)
40+
.clip(CircleShape)
41+
.background(bgColor)
4342
.border(1.dp, borderColor, CircleShape)
4443
.noRippleClickable { onCheckedChange(!checked) }
4544
.padding(2.dp),

‎core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/checkbox/SquareCheckBox.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
1515
import androidx.compose.ui.Alignment
1616
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.draw.clip
1718
import androidx.compose.ui.graphics.Color
1819
import androidx.compose.ui.graphics.vector.ImageVector
1920
import androidx.compose.ui.res.vectorResource
@@ -36,10 +37,8 @@ fun SquareCheckBox(
3637
Box(
3738
modifier = modifier
3839
.size(24.dp)
39-
.background(
40-
color = bgColor,
41-
shape = RoundedCornerShape(ReedTheme.radius.xs),
42-
)
40+
.clip(RoundedCornerShape(ReedTheme.radius.xs))
41+
.background(bgColor)
4342
.border(1.dp, borderColor, RoundedCornerShape(ReedTheme.radius.xs))
4443
.noRippleClickable { onCheckedChange(!checked) }
4544
.padding(2.dp),

‎core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/textfield/ReedRecordTextField.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.runtime.Composable
2626
import androidx.compose.runtime.CompositionLocalProvider
2727
import androidx.compose.ui.Alignment
2828
import androidx.compose.ui.Modifier
29+
import androidx.compose.ui.draw.clip
2930
import androidx.compose.ui.graphics.Color
3031
import androidx.compose.ui.graphics.vector.ImageVector
3132
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -80,7 +81,8 @@ fun ReedRecordTextField(
8081
decorator = { innerTextField ->
8182
Row(
8283
modifier = modifier
83-
.background(color = backgroundColor, shape = cornerShape)
84+
.clip(cornerShape)
85+
.background(backgroundColor)
8486
.border(
8587
border = if (isError) errorBorderStroke else borderStroke,
8688
shape = cornerShape,

‎core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/textfield/ReedSearchTextField.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.runtime.Composable
2525
import androidx.compose.runtime.CompositionLocalProvider
2626
import androidx.compose.ui.Alignment
2727
import androidx.compose.ui.Modifier
28+
import androidx.compose.ui.draw.clip
2829
import androidx.compose.ui.graphics.Color
2930
import androidx.compose.ui.graphics.vector.ImageVector
3031
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -77,7 +78,8 @@ fun ReedTextField(
7778
decorator = { innerTextField ->
7879
Row(
7980
modifier = modifier
80-
.background(color = backgroundColor, shape = cornerShape)
81+
.clip(cornerShape)
82+
.background(backgroundColor)
8183
.then(
8284
if (borderStroke != null) {
8385
Modifier.border(borderStroke, shape = cornerShape)

‎core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/InfinityLazyColumn.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.compose.runtime.remember
3131
import androidx.compose.runtime.setValue
3232
import androidx.compose.ui.Alignment
3333
import androidx.compose.ui.Modifier
34+
import androidx.compose.ui.draw.clip
3435
import androidx.compose.ui.tooling.preview.Preview
3536
import androidx.compose.ui.unit.dp
3637
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
@@ -139,10 +140,8 @@ private fun InfinityLazyColumnPreview() {
139140
modifier = Modifier
140141
.width(68.dp)
141142
.height(100.dp)
142-
.background(
143-
color = ReedTheme.colors.contentTertiary,
144-
shape = RoundedCornerShape(ReedTheme.radius.sm),
145-
),
143+
.clip(RoundedCornerShape(ReedTheme.radius.sm))
144+
.background(color = ReedTheme.colors.contentTertiary),
146145
)
147146
Spacer(Modifier.width(ReedTheme.spacing.spacing4))
148147
Column {

‎core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedDialog.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.material3.Text
1313
import androidx.compose.runtime.Composable
1414
import androidx.compose.ui.Alignment
1515
import androidx.compose.ui.Modifier
16+
import androidx.compose.ui.draw.clip
1617
import androidx.compose.ui.text.style.TextAlign
1718
import androidx.compose.ui.tooling.preview.Preview
1819
import androidx.compose.ui.window.Dialog
@@ -45,12 +46,8 @@ fun ReedDialog(
4546
modifier = modifier
4647
.fillMaxWidth()
4748
.padding(horizontal = ReedTheme.spacing.spacing5)
48-
.background(
49-
color = ReedTheme.colors.basePrimary,
50-
shape = RoundedCornerShape(
51-
ReedTheme.radius.lg,
52-
),
53-
)
49+
.clip(RoundedCornerShape(ReedTheme.radius.lg))
50+
.background(color = ReedTheme.colors.basePrimary)
5451
.padding(
5552
start = ReedTheme.spacing.spacing5,
5653
top = ReedTheme.spacing.spacing8,

‎core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedTopAppBar.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@ fun ReedTopAppBar(
3737
endIconDescription: String = "",
3838
endIconOnClick: () -> Unit = {},
3939
) {
40+
val bgColor = if (isDark) Neutral950 else White
41+
4042
Row(
4143
modifier = modifier
4244
.fillMaxWidth()
4345
.height(60.dp)
44-
.background(color = if (isDark) Neutral950 else White)
46+
.background(bgColor)
4547
.padding(horizontal = ReedTheme.spacing.spacing2),
4648
horizontalArrangement = Arrangement.Start,
4749
verticalAlignment = Alignment.CenterVertically,

‎feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ fun RowScope.BookStatusItem(
131131
onClick: () -> Unit,
132132
modifier: Modifier = Modifier,
133133
) {
134+
val bgColor = if (selected) ReedTheme.colors.bgTertiary else ReedTheme.colors.bgSecondary
135+
134136
Box(
135137
modifier = modifier
136138
.weight(1f)
137139
.clip(RoundedCornerShape(ReedTheme.radius.sm))
138-
.background(if (selected) ReedTheme.colors.bgTertiary else ReedTheme.colors.bgSecondary)
140+
.background(bgColor)
139141
.selectable(
140142
selected = selected,
141143
indication = null,

‎feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/record/component/QuoteItem.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
99
import androidx.compose.material3.Text
1010
import androidx.compose.runtime.Composable
1111
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.draw.clip
1213
import androidx.compose.ui.text.font.FontStyle
1314
import androidx.compose.ui.text.style.TextAlign
1415
import com.ninecraft.booket.core.designsystem.ComponentPreview
@@ -23,10 +24,8 @@ internal fun QuoteItem(
2324
Box(
2425
modifier = modifier
2526
.fillMaxWidth()
26-
.background(
27-
color = ReedTheme.colors.baseSecondary,
28-
shape = RoundedCornerShape(ReedTheme.radius.md),
29-
)
27+
.clip(RoundedCornerShape(ReedTheme.radius.md))
28+
.background(color = ReedTheme.colors.baseSecondary)
3029
.padding(
3130
horizontal = ReedTheme.spacing.spacing5,
3231
vertical = ReedTheme.spacing.spacing4,

0 commit comments

Comments
 (0)