[BOOK-473] chore: 고정 컬러값 및 if else 컬러 분기처리 다시 background Modifier로 원복

easyhooon · easyhooon · commit 5abda2974f66 · 2025-12-09T16:49:17.000+09:00
diff --git a/app/src/main/kotlin/com/ninecraft/booket/di/CircuitGraph.kt b/app/src/main/kotlin/com/ninecraft/booket/di/CircuitGraph.kt
@@ -43,7 +43,7 @@ interface CircuitGraph {
                       All uiFactories: ${circuit?.newBuilder()?.uiFactories}
                       """
                         .trimIndent(),
-                    modifier = modifier.drawBehind { drawRect(Color.Red) },
+                    modifier = modifier.background(Color.Red),
                     style = TextStyle(color = Color.Yellow),
                 )
             }
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/RecordProgressBar.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/RecordProgressBar.kt
@@ -31,7 +31,7 @@ fun RecordProgressBar(
                     .weight(1f)
                     .height(6.dp)
                     .clip(RoundedCornerShape(ReedTheme.radius.full))
-                    .drawBehind { drawRect(bgColor) },
+                    .background(bgColor),
             )
         }
     }
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/checkbox/CircleCheckBox.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/checkbox/CircleCheckBox.kt
@@ -38,7 +38,7 @@ fun CircleCheckBox(
         modifier = modifier
             .size(24.dp)
             .clip(CircleShape)
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .border(1.dp, borderColor, CircleShape)
             .noRippleClickable { onCheckedChange(!checked) }
             .padding(2.dp),
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/checkbox/SquareCheckBox.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/checkbox/SquareCheckBox.kt
@@ -38,7 +38,7 @@ fun SquareCheckBox(
         modifier = modifier
             .size(24.dp)
             .clip(RoundedCornerShape(ReedTheme.radius.xs))
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .border(1.dp, borderColor, RoundedCornerShape(ReedTheme.radius.xs))
             .noRippleClickable { onCheckedChange(!checked) }
             .padding(2.dp),
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/textfield/ReedRecordTextField.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/textfield/ReedRecordTextField.kt
@@ -82,7 +82,7 @@ fun ReedRecordTextField(
                     Row(
                         modifier = modifier
                             .clip(cornerShape)
-                            .drawBehind { drawRect(backgroundColor) }
+                            .background(backgroundColor)
                             .border(
                                 border = if (isError) errorBorderStroke else borderStroke,
                                 shape = cornerShape,
diff --git a/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/textfield/ReedSearchTextField.kt b/core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/textfield/ReedSearchTextField.kt
@@ -79,7 +79,7 @@ fun ReedTextField(
                 Row(
                     modifier = modifier
                         .clip(cornerShape)
-                        .drawBehind { drawRect(backgroundColor) }
+                        .background(backgroundColor)
                         .then(
                             if (borderStroke != null) {
                                 Modifier.border(borderStroke, shape = cornerShape)
diff --git a/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedFullScreen.kt b/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedFullScreen.kt
@@ -31,7 +31,7 @@ fun ReedFullScreen(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
             .systemBarsPadding()
             .clickable(
                 indication = null,
diff --git a/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedTopAppBar.kt b/core/ui/src/main/kotlin/com/ninecraft/booket/core/ui/component/ReedTopAppBar.kt
@@ -43,7 +43,7 @@ fun ReedTopAppBar(
         modifier = modifier
             .fillMaxWidth()
             .height(60.dp)
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .padding(horizontal = ReedTheme.spacing.spacing2),
         horizontalArrangement = Arrangement.Start,
         verticalAlignment = Alignment.CenterVertically,
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt
@@ -137,7 +137,7 @@ fun RowScope.BookStatusItem(
         modifier = modifier
             .weight(1f)
             .clip(RoundedCornerShape(ReedTheme.radius.sm))
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .selectable(
                 selected = selected,
                 indication = null,
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/SeedItem.kt
@@ -43,7 +43,7 @@ internal fun SeedItem(
         Box(
             modifier = Modifier
                 .clip(RoundedCornerShape(ReedTheme.radius.full))
-                .drawBehind { drawRect(emotion.name.bgColor) }
+                .background(emotion.name.bgColor)
                 .padding(
                     horizontal = ReedTheme.spacing.spacing2,
                     vertical = ReedTheme.spacing.spacing1,
diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt
@@ -101,7 +101,7 @@ internal fun HomeUi(
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .drawBehind { drawRect(color = HomeBg) }
+                .background(color = HomeBg)
                 .padding(innerPadding),
         ) {
             HomeHeader(
@@ -220,7 +220,7 @@ internal fun HomeContent(
                                             .size(12.dp)
                                             .padding(3.dp)
                                             .clip(CircleShape)
-                                            .drawBehind { drawRect(color) },
+                                            .background(color),
                                     )
                                 }
                             }
diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeBanner.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeBanner.kt
@@ -49,7 +49,7 @@ fun HomeBanner(
         modifier = modifier
             .fillMaxWidth()
             .height(160.dp)
-            .drawBehind { drawRect(HomeBg) }
+            .background(HomeBg)
             .padding(end = ReedTheme.spacing.spacing5),
     ) {
         Column(
diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeHeader.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/component/HomeHeader.kt
@@ -30,7 +30,7 @@ fun HomeHeader(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .drawBehind { drawRect(color = HomeBg) }
+            .background(color = HomeBg)
             .height(60.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/FilterChip.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/FilterChip.kt
@@ -39,7 +39,7 @@ fun FilterChip(
     Box(
         modifier = modifier
             .clip(shape = RoundedCornerShape(ReedTheme.radius.full))
-            .drawBehind { drawRect(chipColor) }
+            .background(chipColor)
             .noRippleClickable {
                 onChipClick(option)
             }
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/LibraryHeader.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/component/LibraryHeader.kt
@@ -31,7 +31,7 @@ fun LibraryHeader(
         modifier = modifier
             .fillMaxWidth()
             .height(60.dp)
-            .drawBehind { drawRect(color = White) },
+            .background(color = White),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing5))
diff --git a/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt b/feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginUi.kt
@@ -55,7 +55,7 @@ internal fun LoginUi(
         Column(
             modifier = modifier
                 .fillMaxSize()
-                .drawBehind { drawRect(White) }
+                .background(White)
                 .padding(innerPadding),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
diff --git a/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/PagerIndicator.kt b/feature/onboarding/src/main/kotlin/com/ninecraft/booket/feature/onboarding/component/PagerIndicator.kt
@@ -42,7 +42,7 @@ internal fun PagerIndicator(
                     modifier = Modifier
                         .padding(horizontal = 4.dp)
                         .clip(CircleShape)
-                        .drawBehind { drawRect(color) }
+                        .background(color)
                         .size(8.dp),
                 )
             }
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/component/ImpressionGuideBox.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/component/ImpressionGuideBox.kt
@@ -37,7 +37,7 @@ fun ImpressionGuideBox(
         modifier = modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(ReedTheme.radius.sm))
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .border(
                 width = 1.dp,
                 color = borderColor,
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt
@@ -192,7 +192,7 @@ private fun CameraPreview(
         ) {
             ReedCloseTopAppBar(
                 modifier = Modifier
-                    .drawBehind { drawRect(color = Color.Black) }
+                    .background(color = Color.Black)
                     .align(Alignment.TopCenter),
                 isDark = true,
                 onClose = {
@@ -218,7 +218,7 @@ private fun CameraPreview(
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .drawBehind { drawRect(color = White) }
+                        .background(color = White)
                         .height(200.dp)
                         .align(Alignment.Center),
                 ) {
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/CameraFrame.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/CameraFrame.kt
@@ -25,7 +25,6 @@ fun CameraFrame(modifier: Modifier = Modifier) {
         modifier = modifier
             .fillMaxWidth()
             .height(200.dp)
-            .drawBehind { drawRect(Color.Transparent) }
             .border(
                 width = ReedTheme.spacing.spacing5,
                 color = Neutral800.copy(alpha = 0.6f),
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/SentenceBox.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/component/SentenceBox.kt
@@ -33,7 +33,7 @@ fun SentenceBox(
         modifier = modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(ReedTheme.radius.sm))
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .border(
                 width = 1.dp,
                 color = borderColor,
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/EmotionStep.kt
@@ -51,7 +51,7 @@ fun EmotionStep(
     Box(
         modifier = modifier
             .fillMaxSize()
-            .drawBehind { drawRect(color = White) },
+            .background(color = White),
     ) {
         LazyColumn(
             modifier = Modifier
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/ImpressionStep.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/ImpressionStep.kt
@@ -87,7 +87,7 @@ fun ImpressionStep(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .drawBehind { drawRect(color = White) }
+            .background(color = White)
             .imePadding(),
     ) {
         Column(
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/QuoteStep.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/step/QuoteStep.kt
@@ -75,7 +75,7 @@ internal fun QuoteStep(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .drawBehind { drawRect(color = White) }
+            .background(color = White)
             .imePadding(),
     ) {
         Column(
diff --git a/feature/screens/src/main/kotlin/com/ninecraft/booket/feature/screens/component/MainBottomBar.kt b/feature/screens/src/main/kotlin/com/ninecraft/booket/feature/screens/component/MainBottomBar.kt
@@ -65,7 +65,7 @@ fun MainBottomBar(
                     topEnd = ReedTheme.spacing.spacing3,
                 ),
             )
-            .drawBehind { drawRect(color = White) },
+            .background(color = White),
     ) {
         Row(
             modifier = Modifier
diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookItem.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookItem.kt
@@ -51,7 +51,7 @@ fun BookItem(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .then(
                 if (enabled) Modifier.clickable { onBookClick(book) } else Modifier,
             )
diff --git a/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt b/feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/book/component/BookRegisterBottomSheet.kt
@@ -135,7 +135,7 @@ fun RowScope.BookStatusItem(
         modifier = modifier
             .weight(1f)
             .clip(RoundedCornerShape(ReedTheme.radius.sm))
-            .drawBehind { drawRect(bgColor) }
+            .background(bgColor)
             .selectable(
                 selected = selected,
                 indication = null,
diff --git a/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsUi.kt b/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/SettingsUi.kt
@@ -71,7 +71,7 @@ internal fun SettingsUi(
     ReedScaffold(
         modifier = modifier
             .fillMaxSize()
-            .drawBehind { drawRect(color = White) },
+            .background(color = White),
         containerColor = White,
     ) { innerPadding ->
         Column(

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ interface CircuitGraph {`
`43`	`43`	`All uiFactories: ${circuit?.newBuilder()?.uiFactories}`
`44`	`44`	`"""`
`45`	`45`	`.trimIndent(),`
`46`		`- modifier = modifier.drawBehind { drawRect(Color.Red) },`
	`46`	`+ modifier = modifier.background(Color.Red),`
`47`	`47`	`style = TextStyle(color = Color.Yellow),`
`48`	`48`	`)`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ fun RecordProgressBar(`
`31`	`31`	`.weight(1f)`
`32`	`32`	`.height(6.dp)`
`33`	`33`	`.clip(RoundedCornerShape(ReedTheme.radius.full))`
`34`		`- .drawBehind { drawRect(bgColor) },`
	`34`	`+ .background(bgColor),`
`35`	`35`	`)`
`36`	`36`	`}`
`37`	`37`	`}`