[f]: fixed PermissionSheet non expandable after hide

BadKiko · Feb 12, 2024 · 5345006 · 5345006
1 parent d8ef20b
commit 5345006
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/kige/src/main/java/com/kiko/kige/ui/components/KigePicker.kt b/kige/src/main/java/com/kiko/kige/ui/components/KigePicker.kt
@@ -40,7 +40,10 @@ fun KigePicker(
                 onSelect
             )
         } else {
-            PermissionSheet(rememberKigeState.rememberPermissionState) {
+            PermissionSheet(
+                { rememberKigeState.hide(coroutineScope) },
+                rememberKigeState.rememberPermissionState
+            ) {
                 CreateGallerySheet(
                     coroutineScope,
                     rememberKigeState.rememberGalleryState,

diff --git a/kige/src/main/java/com/kiko/kige/ui/components/PermissionSheet.kt b/kige/src/main/java/com/kiko/kige/ui/components/PermissionSheet.kt
@@ -21,13 +21,15 @@ import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.kiko.kige.data.state.KigeState
 import com.kiko.kige.data.state.PermissionState
 import com.kiko.kige.data.utils.GalleryUtils
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class)
 @Composable
 internal fun PermissionSheet(
+    onHide: () -> Unit,
     rememberKigePermissionState: PermissionState,
     onGivenPermission: @Composable () -> Unit
 ) {
@@ -47,7 +49,10 @@ internal fun PermissionSheet(
     if (rememberKigePermissionState.visibleState.value) {
         ModalBottomSheet(
             sheetState = rememberKigePermissionState.sheetState,
-            onDismissRequest = { rememberKigePermissionState.hide(coroutineScope) }) {
+            onDismissRequest = {
+                onHide()
+                rememberKigePermissionState.hide(coroutineScope)
+            }) {
             Column(
                 modifier = Modifier.padding(16.dp),
                 horizontalAlignment = Alignment.CenterHorizontally,