[a]: added uri to output, changed launch effects to side effects

Author: BadKiko

gradle/libs.versions.toml

@@ -3,12 +3,12 @@ accompanist-permissions = "0.33.1-alpha"
 agp = "8.2.2"
 coil-compose = "2.5.0"
 github-landscapist-coil = "2.2.8"
+landscapist-placeholder = "2.2.8"
 kotlin = "1.9.22"
 core-ktx = "1.12.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
 espresso-core = "3.5.1"
-landscapist-placeholder = "2.2.8"
 lifecycle-runtime-ktx = "2.7.0"
 activity-compose = "1.8.2"
 material3 = "1.2.0"

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

@@ -17,9 +17,7 @@ import kotlinx.coroutines.launch
 data class KigeState(
     val visibleState: MutableState<Boolean>,
     val rememberGalleryState: GalleryState,
-    val rememberPermissionState: PermissionState,
-    private val _photoUri: MutableState<String> = mutableStateOf(""),
-    val photoUri: State<String> = _photoUri,
+    val rememberPermissionState: PermissionState
 ) {
     fun expand() {
         this.visibleState.value = true

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

@@ -4,6 +4,8 @@
 
 package com.kiko.kige.ui.components
 
+import android.graphics.Bitmap
+import android.net.Uri
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -43,7 +45,7 @@ import com.skydoves.landscapist.placeholder.shimmer.ShimmerPlugin
 internal fun GallerySheet(
     rememberGalleryState: GalleryState,
     rememberKigeState: KigeState,
-    onSelect: (painter: Painter) -> Unit
+    onSelect: (painter: Painter, uri: Uri) -> Unit
 ) {
     var selectedPhotoUri by remember { mutableStateOf("") }
     val selectedPainter = rememberAsyncImagePainter(model = selectedPhotoUri)
@@ -80,7 +82,7 @@ internal fun GallerySheet(
                                 .clickable {
                                     rememberKigeState.hide(coroutineScope) {
                                         selectedPhotoUri = photoUri
-                                        onSelect(selectedPainter)
+                                        onSelect(selectedPainter, Uri.parse(photoUri))
                                     }
                                 },
                             component = rememberImageComponent {

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

@@ -1,78 +1,64 @@
 package com.kiko.kige.ui.components
 
 import android.Manifest
+import android.net.Uri
 import android.os.Build
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.painter.Painter
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
-import com.kiko.kige.data.remembers.rememberKigeGalleryState
-import com.kiko.kige.data.remembers.rememberKigePermissionState
 import com.kiko.kige.data.remembers.rememberKigeState
 import com.kiko.kige.data.state.GalleryState
 import com.kiko.kige.data.state.KigeState
-import com.kiko.kige.data.state.PermissionState
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun KigePicker(
-    rememberKigeState: KigeState = rememberKigeState(),
-    onSelect: (painter: Painter) -> Unit
+    rememberKigeState: KigeState = rememberKigeState(), onSelect: (painter: Painter, uri: Uri) -> Unit
 ) {
     if (rememberKigeState.visibleState.value) {
-        val readExternalPermission = if (Build.VERSION.SDK_INT < 33)
-            rememberPermissionState(Manifest.permission.READ_EXTERNAL_STORAGE)
-        else
-            rememberPermissionState(Manifest.permission.READ_MEDIA_IMAGES)
+        val readExternalPermission =
+            if (Build.VERSION.SDK_INT < 33) rememberPermissionState(Manifest.permission.READ_EXTERNAL_STORAGE)
+            else rememberPermissionState(Manifest.permission.READ_MEDIA_IMAGES)
 
         val coroutineScope = rememberCoroutineScope()
 
         if (readExternalPermission.status.isGranted) {
             CreateGallerySheet(
-                coroutineScope,
-                rememberKigeState.rememberGalleryState,
-                rememberKigeState,
-                onSelect
+                rememberKigeState.rememberGalleryState, rememberKigeState, onSelect
             )
         } else {
             PermissionSheet(
                 { rememberKigeState.hide(coroutineScope) },
                 rememberKigeState.rememberPermissionState
             ) {
                 CreateGallerySheet(
-                    coroutineScope,
                     rememberKigeState.rememberGalleryState,
                     rememberKigeState,
                     onSelect
                 )
             }
 
-            LaunchedEffect(true) {
-                coroutineScope.launch {
-                    rememberKigeState.rememberPermissionState.expand()
-                }
+            SideEffect {
+                rememberKigeState.rememberPermissionState.expand()
             }
         }
     }
 }
 
 @Composable
 private fun CreateGallerySheet(
-    coroutineScope: CoroutineScope,
     rememberKigeGalleryState: GalleryState,
     rememberKigeState: KigeState,
-    onSelect: (painter: Painter) -> Unit
+    onSelect: (painter: Painter, uri: Uri) -> Unit
 ) {
     GallerySheet(rememberKigeGalleryState, rememberKigeState, onSelect)
 
-    LaunchedEffect(true) {
-        coroutineScope.launch {
-            rememberKigeGalleryState.expand()
-        }
+    SideEffect {
+        rememberKigeGalleryState.expand()
     }
 }

samplekige/src/main/java/com/kiko/kige/samplekige/MainActivity.kt

@@ -33,8 +33,8 @@ class MainActivity : ComponentActivity() {
 
                 val rememberKigeState = rememberKigeState()
 
-                KigePicker(rememberKigeState) {
-                    image = it
+                KigePicker(rememberKigeState) { painter, _ ->
+                    image = painter
                 }
 
                 image?.let {