[FEAT/#24] basic bottom sheet dragHandle 수정

SOPT-all · Jan 16, 2025 · 5714269 · 5714269
1 parent 2ef7de6
commit 5714269
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 30 deletions.
diff --git a/...c/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/FixedBottomSheet.kt b/...c/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/FixedBottomSheet.kt
@@ -42,7 +42,7 @@ fun FixedBottomSheet(
 private fun FixedBottomSheetPreview() {
     SpoonyAndroidTheme {
         FixedBottomSheet(
-            sheetContent = {},
+            sheetContent = {}
         ) { }
     }
 }
diff --git a/.../java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyBasicBottomSheet.kt b/.../java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyBasicBottomSheet.kt
@@ -1,58 +1,32 @@
 package com.spoony.spoony.core.designsystem.component.bottomsheet
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SpoonyBasicBottomSheet(
-    content: @Composable () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
     sheetState: SheetState = rememberModalBottomSheetState(),
     isBackgroundDimmed: Boolean = true,
     dragHandle: @Composable () -> Unit = {},
+    content: @Composable () -> Unit
 ) {
     ModalBottomSheet(
         onDismissRequest = onDismiss,
         modifier = modifier,
         sheetState = sheetState,
         containerColor = SpoonyAndroidTheme.colors.white,
         scrimColor = if (isBackgroundDimmed) BottomSheetDefaults.ScrimColor else Color.Transparent,
-        dragHandle = {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier
-                    .padding(vertical = 22.dp)
-                    .fillMaxWidth()
-            ) {
-                Box(
-                    modifier = Modifier
-                        .size(
-                            width = 24.dp,
-                            height = Dp.Hairline.plus(2.dp)
-                        )
-                        .background(SpoonyAndroidTheme.colors.gray300),
-                )
-                dragHandle()
-            }
-        }
+        dragHandle = dragHandle
     ) {
         content()
     }

diff --git a/...va/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyFlexibleBottomSheet.kt b/...va/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyFlexibleBottomSheet.kt
@@ -18,7 +18,7 @@ fun SpoonyFlexibleBottomSheet(
     modifier: Modifier = Modifier,
     minHeight: Dp = 50.dp,
     dragHandle: @Composable () -> Unit = {},
-    content: @Composable () -> Unit,
+    content: @Composable () -> Unit
 ) {
     val configuration = LocalConfiguration.current
     val screenHeight = configuration.screenHeightDp.dp