diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_bottom_sheet/CustomBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_bottom_sheet/CustomBottomSheet.kt index cbdddffb..426c0496 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_bottom_sheet/CustomBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_bottom_sheet/CustomBottomSheet.kt @@ -2,11 +2,8 @@ package ua.acclorite.book_story.presentation.core.components.custom_bottom_sheet import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ColumnScope -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBars import androidx.compose.material3.BottomSheetDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme @@ -17,7 +14,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shape -import androidx.compose.ui.unit.Dp /** * Custom Bottom Sheet. Fixes bugs with [ModalBottomSheet]. @@ -29,7 +25,7 @@ import androidx.compose.ui.unit.Dp * @param containerColor Container color. * @param onDismissRequest OnDismiss callback. * @param dragHandle Drag Handle, pass null to disable. - * @param content Content inside [ModalBottomSheet]. Provides you navigation bar padding. + * @param content Content inside [ModalBottomSheet]. */ @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -41,11 +37,8 @@ fun CustomBottomSheet( containerColor: Color = MaterialTheme.colorScheme.surfaceContainerLow, onDismissRequest: () -> Unit, dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() }, - content: @Composable ColumnScope.(navigationBarPadding: Dp) -> Unit + content: @Composable ColumnScope.() -> Unit ) { - val navigationBarPadding = - WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() - Box(Modifier.fillMaxSize()) { ModalBottomSheet( scrimColor = scrimColor, @@ -62,10 +55,9 @@ fun CustomBottomSheet( }, shape = shape, sheetState = rememberModalBottomSheetState(true), - contentWindowInsets = { WindowInsets(0, 0, 0, 0) }, containerColor = containerColor ) { - content(navigationBarPadding) + content() } } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt index a3d7428e..28f82783 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt @@ -67,7 +67,7 @@ fun BookInfoChangeCoverBottomSheet() { onDismissRequest = { onEvent(BookInfoEvent.OnShowHideChangeCoverBottomSheet) } - ) { padding -> + ) { LazyColumn(Modifier.fillMaxWidth()) { if (state.value.canResetCover) { item { @@ -125,11 +125,7 @@ fun BookInfoChangeCoverBottomSheet() { } item { - Spacer( - modifier = Modifier.height( - 8.dp + padding - ) - ) + Spacer(modifier = Modifier.height(8.dp)) } } } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt index ce5672d7..fa7ae712 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt @@ -124,10 +124,6 @@ fun BookInfoDetailsBottomSheet() { } } - Spacer( - modifier = Modifier.height( - 8.dp + it - ) - ) + Spacer(modifier = Modifier.height(8.dp)) } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt index 7da6f06b..7b1a3df7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt @@ -60,7 +60,7 @@ fun BrowseFilterBottomSheet() { showTitle = false, showDivider = false, topPadding = 16.dp, - bottomPadding = 8.dp + it + bottomPadding = 8.dp ) } } @@ -71,7 +71,7 @@ fun BrowseFilterBottomSheet() { showTitle = false, showDivider = false, topPadding = 16.dp, - bottomPadding = 8.dp + it + bottomPadding = 8.dp ) } } @@ -82,7 +82,7 @@ fun BrowseFilterBottomSheet() { showTitle = false, showDivider = false, topPadding = 16.dp, - bottomPadding = 8.dp + it + bottomPadding = 8.dp ) } } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt index 12768ed8..b6b1f6bd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt @@ -109,7 +109,7 @@ fun ReaderSettingsBottomSheet() { titleColor = { MaterialTheme.colorScheme.onSurface }, showDivider = false, topPadding = 22.dp, - bottomPadding = 8.dp + it + bottomPadding = 8.dp ) } } @@ -130,7 +130,7 @@ fun ReaderSettingsBottomSheet() { titleColor = { MaterialTheme.colorScheme.onSurface }, showDivider = false, topPadding = 22.dp, - bottomPadding = 8.dp + it + bottomPadding = 8.dp ) } } @@ -142,7 +142,7 @@ fun ReaderSettingsBottomSheet() { showDivider = false, backgroundColor = { MaterialTheme.colorScheme.surfaceContainer }, topPadding = 16.dp, - bottomPadding = 8.dp + it + bottomPadding = 8.dp ) } }