Fix #430

SapuSeven · Nov 21, 2023 · 5447e31 · 5447e31
1 parent 3cc80cc
commit 5447e31
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/sapuseven/untis/ui/common/ReportsInfoBottomSheet.kt b/app/src/main/java/com/sapuseven/untis/ui/common/ReportsInfoBottomSheet.kt
@@ -30,15 +30,15 @@ import kotlinx.coroutines.launch
 fun ReportsInfoBottomSheet(reportsDataStore: DataStore<Preferences> = LocalContext.current.reportsDataStore) {
 	val scope = rememberCoroutineScope()
 	var bottomSheetVisible by rememberSaveable { mutableStateOf(false) }
-	val bottomSheetState = rememberStandardBottomSheetState(initialValue = SheetValue.Expanded)
+	val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 	var saveEnabled by rememberSaveable { mutableStateOf(true) }
 
 	LaunchedEffect(Unit) {
 		if (reportsDataStore.data.map { prefs ->
 				prefs[reportsDataStoreBreadcrumbsEnable.first]
 			}.first() == null) {
 			bottomSheetVisible = true
-			bottomSheetState.show()
+			sheetState.show()
 		}
 	}
 
@@ -47,8 +47,13 @@ fun ReportsInfoBottomSheet(reportsDataStore: DataStore<Preferences> = LocalConte
 			modifier = Modifier.fillMaxSize()
 		) {
 			ModalBottomSheet(
-				onDismissRequest = { bottomSheetVisible = false },
-				sheetState = bottomSheetState,
+				onDismissRequest = {
+					scope.launch {
+						sheetState.hide()
+						bottomSheetVisible = false
+					}
+				},
+				sheetState = sheetState,
 			) {
 				Row(
 					verticalAlignment = Alignment.CenterVertically,
@@ -125,9 +130,9 @@ fun ReportsInfoBottomSheet(reportsDataStore: DataStore<Preferences> = LocalConte
 											?: reportsDataStoreBreadcrumbsEnable.second
 								}
 
-								bottomSheetState.hide()
+								sheetState.hide()
 							}.invokeOnCompletion {
-								if (!bottomSheetState.isVisible) {
+								if (!sheetState.isVisible) {
 									bottomSheetVisible = false
 								}
 							}