diff --git a/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/FixedBottomSheet.kt b/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/FixedBottomSheet.kt index 54612fd..a8653a0 100644 --- a/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/FixedBottomSheet.kt +++ b/app/src/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/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyBasicBottomSheet.kt b/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyBasicBottomSheet.kt index 4cd7a6f..0d92451 100644 --- a/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyBasicBottomSheet.kt +++ b/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyBasicBottomSheet.kt @@ -1,33 +1,24 @@ 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, @@ -35,24 +26,7 @@ fun SpoonyBasicBottomSheet( 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/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyFlexibleBottomSheet.kt b/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyFlexibleBottomSheet.kt index 9d1c7fa..04d3ae6 100644 --- a/app/src/main/java/com/spoony/spoony/core/designsystem/component/bottomsheet/SpoonyFlexibleBottomSheet.kt +++ b/app/src/main/java/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