[BOOK-473] refactor: 람다 기반 modifier 적용

easyhooon · easyhooon · commit 8bd032923b00 · 2025-12-03T13:45:59.000+09:00
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
@@ -14,6 +14,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
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
@@ -6,7 +6,6 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -28,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -100,7 +100,7 @@ internal fun HomeUi(
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .background(HomeBg)
+                .drawBehind { drawRect(color = HomeBg) }
                 .padding(innerPadding),
         ) {
             HomeHeader(
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
@@ -15,6 +15,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -48,7 +49,7 @@ fun HomeBanner(
         modifier = modifier
             .fillMaxWidth()
             .height(160.dp)
-            .background(HomeBg)
+            .drawBehind { drawRect(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
@@ -1,7 +1,6 @@
 package com.ninecraft.booket.feature.home.component
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -12,6 +11,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.vectorResource
@@ -30,7 +30,7 @@ fun HomeHeader(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .background(HomeBg)
+            .drawBehind { drawRect(color = HomeBg) }
             .height(60.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
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
@@ -1,6 +1,5 @@
 package com.ninecraft.booket.feature.library.component
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -12,6 +11,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -31,7 +31,7 @@ fun LibraryHeader(
         modifier = modifier
             .fillMaxWidth()
             .height(60.dp)
-            .background(White),
+            .drawBehind { drawRect(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
@@ -15,6 +15,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
@@ -55,7 +56,7 @@ internal fun LoginUi(
         Column(
             modifier = modifier
                 .fillMaxSize()
-                .background(White)
+                .drawBehind { drawRect(White) }
                 .padding(innerPadding),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/component/CustomTooltipBox.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/component/CustomTooltipBox.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.ComponentPreview
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
@@ -47,9 +48,12 @@ internal fun CustomTooltipBox(
             Modifier
                 .padding(start = 2.dp)
                 .size(ReedTheme.spacing.spacing3)
-                .offset(
-                    x = (-10).dp,
-                )
+                .offset {
+                    IntOffset(
+                        x = (-10).dp.roundToPx(),
+                        y = 0,
+                    )
+                }
                 .graphicsLayer {
                     rotationZ = 45f
                     shadowElevation = 8.dp.toPx()
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
@@ -1,5 +1,6 @@
 package com.ninecraft.booket.feature.record.ocr
 
+import android.R.attr.x
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
@@ -41,12 +42,14 @@ import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.ContextCompat
@@ -191,7 +194,7 @@ private fun CameraPreview(
         ) {
             ReedCloseTopAppBar(
                 modifier = Modifier
-                    .background(color = Color.Black)
+                    .drawBehind { drawRect(color = Color.Black) }
                     .align(Alignment.TopCenter),
                 isDark = true,
                 onClose = {
@@ -202,7 +205,12 @@ private fun CameraPreview(
                 text = stringResource(R.string.ocr_guide),
                 modifier = Modifier
                     .align(Alignment.Center)
-                    .offset(y = (-164).dp),
+                    .offset {
+                        IntOffset(
+                            x = 0,
+                            y = (-164).dp.roundToPx(),
+                        )
+                    },
                 color = ReedTheme.colors.contentInverse,
                 textAlign = TextAlign.Center,
                 style = ReedTheme.typography.headline2Medium,
@@ -212,7 +220,7 @@ private fun CameraPreview(
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .background(White)
+                        .drawBehind { drawRect(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
@@ -10,8 +10,8 @@ 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.scale
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.ComponentPreview
@@ -47,8 +47,11 @@ fun CameraFrame(modifier: Modifier = Modifier) {
             painter = painterResource(R.drawable.img_frame_marker),
             contentDescription = "Frame Marker",
             modifier = Modifier
-                .scale(scaleX = -1f, scaleY = 1f)
                 .align(Alignment.TopEnd)
+                .graphicsLayer {
+                    scaleX = -1f
+                    scaleY = 1f
+                }
                 .padding(
                     start = ReedTheme.spacing.spacing5,
                     top = ReedTheme.spacing.spacing5,
@@ -59,8 +62,11 @@ fun CameraFrame(modifier: Modifier = Modifier) {
             painter = painterResource(R.drawable.img_frame_marker),
             contentDescription = "Frame Marker",
             modifier = Modifier
-                .scale(scaleX = 1f, scaleY = -1f)
                 .align(Alignment.BottomStart)
+                .graphicsLayer {
+                    scaleX = 1f
+                    scaleY = -1f
+                }
                 .padding(
                     start = ReedTheme.spacing.spacing5,
                     top = ReedTheme.spacing.spacing5,
@@ -71,8 +77,11 @@ fun CameraFrame(modifier: Modifier = Modifier) {
             painter = painterResource(R.drawable.img_frame_marker),
             contentDescription = "Frame Marker",
             modifier = Modifier
-                .scale(scaleX = -1f, scaleY = -1f)
                 .align(Alignment.BottomEnd)
+                .graphicsLayer {
+                    scaleX = -1f
+                    scaleY = -1f
+                }
                 .padding(
                     start = ReedTheme.spacing.spacing5,
                     top = ReedTheme.spacing.spacing5,
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
@@ -20,6 +20,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -50,7 +51,7 @@ fun EmotionStep(
     Box(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .drawBehind { drawRect(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
@@ -33,6 +33,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
@@ -86,7 +87,7 @@ fun ImpressionStep(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White)
+            .drawBehind { drawRect(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
@@ -1,6 +1,5 @@
 package com.ninecraft.booket.feature.record.step
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -26,6 +25,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -75,7 +75,7 @@ internal fun QuoteStep(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White)
+            .drawBehind { drawRect(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
@@ -1,6 +1,5 @@
 package com.ninecraft.booket.feature.screens.component
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
@@ -21,6 +20,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
@@ -65,7 +65,7 @@ fun MainBottomBar(
                     topEnd = ReedTheme.spacing.spacing3,
                 ),
             )
-            .background(White),
+            .drawBehind { drawRect(color = White) },
     ) {
         Row(
             modifier = Modifier
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
@@ -1,6 +1,5 @@
 package com.ninecraft.booket.feature.settings
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -18,6 +17,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
@@ -71,7 +71,7 @@ internal fun SettingsUi(
     ReedScaffold(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .drawBehind { drawRect(color = White) },
         containerColor = White,
     ) { innerPadding ->
         Column(
diff --git a/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/component/ReedSwitch.kt b/feature/settings/src/main/kotlin/com/ninecraft/booket/feature/settings/component/ReedSwitch.kt
@@ -1,5 +1,6 @@
 package com.ninecraft.booket.feature.settings.component
 
+import android.R.attr.x
 import android.annotation.SuppressLint
 import androidx.compose.animation.animateColor
 import androidx.compose.animation.core.animateDp
@@ -22,6 +23,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.common.extensions.noRippleClickable
 import com.ninecraft.booket.core.designsystem.DevicePreview
@@ -57,7 +59,12 @@ internal fun ReedSwitch(
     ) {
         Box(
             modifier = Modifier
-                .offset(x = thumbOffset)
+                .offset {
+                    IntOffset(
+                        x = thumbOffset.roundToPx(),
+                        y = 0,
+                    )
+                }
                 .size(27.dp)
                 .shadow(elevation = 1.dp, shape = CircleShape)
                 .clip(CircleShape)
