Skip to content

Commit 05613a0

Browse files
committed
[f]: fixed second and more sheet expand if u previous select image
1 parent 6a47a9d commit 05613a0

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

kige/src/main/java/com/kiko/kige/data/state/KigeState.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,4 @@ data class KigeState(
3131
this.visibleState.value = false
3232
}
3333
}
34-
35-
fun hide(coroutineScope: CoroutineScope, onHided: () -> Unit) {
36-
rememberGalleryState.hide(coroutineScope, onHided)
37-
}
3834
}

kige/src/main/java/com/kiko/kige/ui/components/GallerySheet.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ internal fun GallerySheet(
4949
rememberKigeState: KigeState,
5050
onSelect: (painter: Painter, uri: Uri) -> Unit
5151
) {
52-
var selectedPhotoUri by remember { mutableStateOf("") }
53-
val selectedPainter = rememberAsyncImagePainter(model = selectedPhotoUri)
54-
55-
val context = LocalContext.current
56-
5752
val coroutineScope = rememberCoroutineScope()
5853

54+
var selectedPhotoUri by remember { mutableStateOf("") }
55+
val selectedPainter = rememberAsyncImagePainter(
56+
model = selectedPhotoUri,
57+
onSuccess = { rememberKigeState.hide(coroutineScope) })
58+
5959
if (rememberGalleryState.visibleState.value) {
6060
ModalBottomSheet(
6161
sheetState = rememberGalleryState.sheetState,
@@ -84,10 +84,8 @@ internal fun GallerySheet(
8484
CoilImage(
8585
modifier = rememberGalleryState.galleryUIState.imagesModifier
8686
.clickable {
87-
rememberKigeState.hide(coroutineScope) {
88-
selectedPhotoUri = photoUri
89-
onSelect(selectedPainter, Uri.fromFile(File(photoUri)))
90-
}
87+
selectedPhotoUri = photoUri
88+
onSelect(selectedPainter, Uri.fromFile(File(photoUri)))
9189
},
9290
component = rememberImageComponent {
9391
// shows a shimmering effect when loading an image.

0 commit comments

Comments
 (0)