일부 디자인 디테일 잡기 (#55)

* refactor : Embed padding within dialog component for consistency * refactor : bubble detail * feat : FillBounds -> Crop
Nexters · Feb 4, 2025 · f68f815 · f68f815
1 parent e22f5bf
commit f68f815
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 20 deletions.
diff --git a/...esignsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/Bubble.kt b/...esignsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/Bubble.kt
@@ -124,10 +124,10 @@ private fun Path.drawBubbleTail(
         // 꼬리 오른쪽 부분 그리기
         relativeCubicTo(
             dx1 = -13.dp.toPx(),
-            dy1 = 5.dp.toPx(),
-            dx2 = 7.dp.toPx(),
+            dy1 = 10.dp.toPx(),
+            dx2 = 8.dp.toPx(),
             dy2 = 24.dp.toPx(),
-            dx3 = -11.dp.toPx(),
+            dx3 = -8.dp.toPx(),
             dy3 = tailHeight,
         )
 
@@ -138,9 +138,9 @@ private fun Path.drawBubbleTail(
         // 꼬리 왼쪽 부분 그리기
         cubicTo(
             x1 = x - 14.dp.toPx(),
-            y1 = y - 4.dp.toPx(),
+            y1 = y - 8.dp.toPx(),
             x2 = x - 9.dp.toPx(),
-            y2 = height + 3.dp.toPx(),
+            y2 = height + 2.dp.toPx(),
             x3 = tailStartX,
             y3 = height,
         )

diff --git a/...esignsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/Dialog.kt b/...esignsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/Dialog.kt
@@ -42,7 +42,9 @@ fun DobeDobeDialog(
         properties = properties,
     ) {
         Surface(
-            modifier = modifier,
+            modifier = modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp),
             shape = RoundedCornerShape(16.dp),
             color = DobeDobeTheme.colors.white,
         ) {

diff --git a/...re/dashboard/src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/DashboardScreen.kt b/...re/dashboard/src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/DashboardScreen.kt
@@ -9,7 +9,6 @@ import androidx.compose.animation.core.AnimationVector1D
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.CircularProgressIndicator
@@ -307,9 +306,6 @@ private fun GoalNotificationPermission(
                 notificationsPermissionState.launchPermissionRequest()
                 showGoalNotificationDialog = false
             },
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp),
         )
     }
 }

diff --git a/...rc/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/CollapsedPhotoFrame.kt b/...rc/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/CollapsedPhotoFrame.kt
@@ -94,7 +94,7 @@ private fun SharedTransitionScope.CollapsedPhotoFrame(
                                 .rotate(rotation)
                                 .clip(RoundedCornerShape(24.dp))
                                 .clickable(onClick = onToggleExpansion),
-                            contentScale = ContentScale.FillBounds,
+                            contentScale = ContentScale.Crop,
                             model = uri,
                             contentDescription = null,
                         )

diff --git a/.../src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/DashboardViewMode.kt b/.../src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/DashboardViewMode.kt
@@ -39,7 +39,7 @@ internal fun SharedTransitionScope.DashboardViewMode(
             .fillMaxSize()
             .paint(
                 painterResource(id = R.drawable.rabbit_sheet_content_background),
-                contentScale = ContentScale.FillBounds,
+                contentScale = ContentScale.Crop,
             ),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {

diff --git a/...src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/EditModePhotoFrame.kt b/...src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/EditModePhotoFrame.kt
@@ -58,7 +58,7 @@ internal fun EditModePhotoFrame(
                     modifier = Modifier
                         .fillMaxSize()
                         .clickable(onClick = onDeletePhoto),
-                    contentScale = ContentScale.FillBounds,
+                    contentScale = ContentScale.Crop,
                     model = uri,
                     contentDescription = "photo",
                 )

diff --git a/...src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/ExpandedPhotoFrame.kt b/...src/main/kotlin/com/chipichipi/dobedobe/feature/dashboard/component/ExpandedPhotoFrame.kt
@@ -85,7 +85,7 @@ private fun SharedTransitionScope.ExpandedPhotoFrame(
                             )
                             .rotate(rotation)
                             .clip(RoundedCornerShape(16.dp)),
-                        contentScale = ContentScale.FillBounds,
+                        contentScale = ContentScale.Crop,
                         model = targetState.uri,
                         contentDescription = "expanded photo",
                     )

diff --git a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/DetailGoalScreen.kt
@@ -219,9 +219,6 @@ private fun DetailGoalContent(
         visible = visibleDialog,
         onConfirm = onConfirmDialog,
         onDismiss = onDismissDialog,
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 24.dp),
     )
 }
 
@@ -252,9 +249,6 @@ private fun DeleteDialogPreview() {
             visible = true,
             onConfirm = {},
             onDismiss = {},
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp),
         )
     }
 }