From 1f0c6de78d813cc681c2629a0d23607fad3b1aff Mon Sep 17 00:00:00 2001 From: Thomas Andres Gomez Date: Fri, 7 Apr 2023 16:14:18 +0200 Subject: [PATCH] Apply Handle + shape to all bottomsheet --- .../ui/composable/scaffold/FilterBottomSheet.kt | 2 +- .../biblib/ui/composable/scaffold/SortBottomSheet.kt | 11 ++++++----- .../biblib/ui/screen/home/detail/DetailScreen.kt | 2 ++ .../ui/screen/home/detail/DetailScreenSendOption.kt | 8 +++++++- .../biblib/ui/screen/home/sort/BookSortPage.kt | 5 +++++ .../pixelized/biblib/ui/theme/shape/BibLibShape.kt | 2 +- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/FilterBottomSheet.kt b/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/FilterBottomSheet.kt index 0e156c2..a29dd8c 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/FilterBottomSheet.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/FilterBottomSheet.kt @@ -104,7 +104,7 @@ fun FilterBottomSheet( skipHalfExpanded = true, ), sheetState: FilterBottomSheetState = rememberFilterBottomSheetState(), - sheetShape: Shape = MaterialTheme.bibLib.shapes.filterSheet, + sheetShape: Shape = MaterialTheme.bibLib.shapes.sheet, content: @Composable () -> Unit, ) { CompositionLocalProvider( diff --git a/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/SortBottomSheet.kt b/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/SortBottomSheet.kt index 1e6bd09..d5b7ee8 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/SortBottomSheet.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/composable/scaffold/SortBottomSheet.kt @@ -1,16 +1,15 @@ package com.pixelized.biblib.ui.composable.scaffold import androidx.activity.compose.BackHandler -import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material.ModalBottomSheetLayout -import androidx.compose.material.ModalBottomSheetState +import androidx.compose.material.* import androidx.compose.material.ModalBottomSheetValue.Hidden -import androidx.compose.material.rememberModalBottomSheetState import androidx.compose.runtime.* import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape import com.pixelized.biblib.model.search.SortType import com.pixelized.biblib.model.search.SortValue import com.pixelized.biblib.ui.screen.home.sort.BookSortPage +import com.pixelized.biblib.utils.extention.bibLib import kotlinx.coroutines.CancellableContinuation import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.sync.Mutex @@ -82,6 +81,7 @@ fun SortBottomSheet( initialValue = Hidden, skipHalfExpanded = true, ), + sheetShape: Shape = MaterialTheme.bibLib.shapes.sheet, sheetState: SortBottomSheetState = rememberSortBottomSheetState(), content: @Composable () -> Unit, ) { @@ -98,7 +98,7 @@ fun SortBottomSheet( ) // Check the state of the bottomSheetState and call for dismiss if needed. HandleBottomSheetDismiss( - bottomSheetState =bottomSheetState, + bottomSheetState = bottomSheetState, onDismiss = { currentBottomSheetData?.dismiss() } ) // Handle back event. @@ -110,6 +110,7 @@ fun SortBottomSheet( ModalBottomSheetLayout( sheetState = bottomSheetState, content = content, + sheetShape = sheetShape, scrimColor = Color.Transparent, sheetContent = { BookSortPage( diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreen.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreen.kt index 52611c5..1e02b9c 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreen.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreen.kt @@ -18,6 +18,7 @@ import com.pixelized.biblib.ui.composable.scaffold.LocalDetailBottomSheetState import com.pixelized.biblib.ui.screen.home.profile.ProfileViewModel import com.pixelized.biblib.ui.screen.home.profile.UserUio import com.pixelized.biblib.ui.theme.color.ShadowPalette +import com.pixelized.biblib.utils.extention.bibLib import kotlinx.coroutines.launch @Stable @@ -73,6 +74,7 @@ fun DetailScreen( ModalBottomSheetLayout( modifier = Modifier.fillMaxSize(), sheetState = emailSheetState, + sheetShape = MaterialTheme.bibLib.shapes.sheet, scrimColor = ShadowPalette.scrim, sheetContent = { DetailScreenSendOption( diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreenSendOption.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreenSendOption.kt index 4d81c39..3a11ab8 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreenSendOption.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/detail/DetailScreenSendOption.kt @@ -15,6 +15,7 @@ import androidx.compose.material.RadioButton import androidx.compose.material.Text import androidx.compose.runtime.* import androidx.compose.ui.Alignment +import androidx.compose.ui.Alignment.Companion.CenterHorizontally import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString @@ -25,6 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.pixelized.biblib.R +import com.pixelized.biblib.ui.composable.Handle import com.pixelized.biblib.ui.theme.BibLibTheme import com.pixelized.biblib.utils.extention.* @@ -87,6 +89,11 @@ fun DetailScreenSendOption( .padding(top = 16.dp) .padding(horizontal = 16.dp), ) { + Handle( + modifier = Modifier + .align(alignment = CenterHorizontally) + .padding(bottom = 16.dp), + ) Text( modifier = Modifier.padding(bottom = 16.dp), style = MaterialTheme.typography.h6, @@ -95,7 +102,6 @@ fun DetailScreenSendOption( ) Text( - modifier = Modifier.padding(bottom = 8.dp), style = MaterialTheme.typography.caption, color = MaterialTheme.bibLib.colors.typography.light, text = rememberDescription() diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/sort/BookSortPage.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/sort/BookSortPage.kt index 06a7b26..87d2145 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/sort/BookSortPage.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/sort/BookSortPage.kt @@ -26,6 +26,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import com.pixelized.biblib.R import com.pixelized.biblib.model.search.SortType import com.pixelized.biblib.model.search.SortValue +import com.pixelized.biblib.ui.composable.Handle import com.pixelized.biblib.ui.theme.BibLibTheme import com.pixelized.biblib.utils.extention.bibLib import org.burnoutcrew.reorderable.* @@ -73,6 +74,10 @@ private fun BookSortPageContent( modifier = modifier, verticalArrangement = Arrangement.spacedBy(16.dp), ) { + Handle( + modifier = Modifier.align(Alignment.CenterHorizontally), + ) + Text( modifier = Modifier.padding(horizontal = 16.dp), style = MaterialTheme.typography.h6, diff --git a/app/src/main/java/com/pixelized/biblib/ui/theme/shape/BibLibShape.kt b/app/src/main/java/com/pixelized/biblib/ui/theme/shape/BibLibShape.kt index 1936c1e..1e58a6e 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/theme/shape/BibLibShape.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/theme/shape/BibLibShape.kt @@ -17,5 +17,5 @@ data class BibLibShape( ), val bookThumbnailCoverSmall: Shape = RoundedCornerShape(4.dp), val bookThumbnailCoverLarge: Shape = RoundedCornerShape(4.dp), - val filterSheet: Shape = RoundedCornerShape(topEnd = 16.dp, topStart = 16.dp), + val sheet: Shape = RoundedCornerShape(topEnd = 16.dp, topStart = 16.dp), ) \ No newline at end of file