[f]: fixed second and more sheet expand if u previous select image

BadKiko · Feb 13, 2024 · 05613a0 · 05613a0
1 parent 6a47a9d
commit 05613a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/kige/src/main/java/com/kiko/kige/data/state/KigeState.kt b/kige/src/main/java/com/kiko/kige/data/state/KigeState.kt
@@ -31,8 +31,4 @@ data class KigeState(
             this.visibleState.value = false
         }
     }
-
-    fun hide(coroutineScope: CoroutineScope, onHided: () -> Unit) {
-        rememberGalleryState.hide(coroutineScope, onHided)
-    }
 }
diff --git a/kige/src/main/java/com/kiko/kige/ui/components/GallerySheet.kt b/kige/src/main/java/com/kiko/kige/ui/components/GallerySheet.kt
@@ -49,13 +49,13 @@ internal fun GallerySheet(
     rememberKigeState: KigeState,
     onSelect: (painter: Painter, uri: Uri) -> Unit
 ) {
-    var selectedPhotoUri by remember { mutableStateOf("") }
-    val selectedPainter = rememberAsyncImagePainter(model = selectedPhotoUri)
-
-    val context = LocalContext.current
-
     val coroutineScope = rememberCoroutineScope()
 
+    var selectedPhotoUri by remember { mutableStateOf("") }
+    val selectedPainter = rememberAsyncImagePainter(
+        model = selectedPhotoUri,
+        onSuccess = { rememberKigeState.hide(coroutineScope) })
+
     if (rememberGalleryState.visibleState.value) {
         ModalBottomSheet(
             sheetState = rememberGalleryState.sheetState,
@@ -84,10 +84,8 @@ internal fun GallerySheet(
                         CoilImage(
                             modifier = rememberGalleryState.galleryUIState.imagesModifier
                                 .clickable {
-                                    rememberKigeState.hide(coroutineScope) {
-                                        selectedPhotoUri = photoUri
-                                        onSelect(selectedPainter, Uri.fromFile(File(photoUri)))
-                                    }
+                                    selectedPhotoUri = photoUri
+                                    onSelect(selectedPainter, Uri.fromFile(File(photoUri)))
                                 },
                             component = rememberImageComponent {
                                 // shows a shimmering effect when loading an image.