Refactor gallery picker code

Author: david-trujillo

app/src/main/kotlin/run/nabla/gallerypicker/example/Navigation.kt

@@ -1,6 +1,8 @@
 package run.nabla.gallerypicker.example
 
 import android.net.Uri
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
 import androidx.navigation.compose.composable
@@ -16,6 +18,7 @@ fun NavGraphBuilder.galleryPicker(
 ) {
     composable(route = GALLERY_SCREEN) {
         GalleryPicker(
+            modifier = Modifier.statusBarsPadding(),
             onImageSelected = onImageSelected
         )
     }

gallery-picker/build.gradle.kts

@@ -50,7 +50,7 @@ publishing {
         register<MavenPublication>("release") {
             groupId = "run.nabla"
             artifactId = "gallery-picker"
-            version = "1.4.4"
+            version = "1.4.5"
             afterEvaluate {
                 from(components["release"])
             }

gallery-picker/src/main/kotlin/run/nabla/gallerypicker/picker/GalleryPicker.kt

@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.lazy.staggeredgrid.LazyStaggeredGridState
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan
@@ -32,12 +32,13 @@ import run.nabla.gallerypicker.permission.RequestPermissionScreen
 import run.nabla.gallerypicker.permission.RequestPermissionState
 import run.nabla.gallerypicker.permission.rememberRequestPermissionState
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalPermissionsApi::class)
+@OptIn(ExperimentalPermissionsApi::class, ExperimentalMaterialApi::class)
 @Composable
 fun GalleryPicker(
     modifier: Modifier = Modifier,
     state: GalleryPickerState = rememberGalleryPickerState(),
     permissionState: RequestPermissionState = rememberRequestPermissionState(),
+    lazyGridState: LazyStaggeredGridState = rememberLazyStaggeredGridState(),
     backgroundColor: Color = Color.Black,
     header: @Composable () -> Unit = {
         GalleryHeader(
@@ -47,7 +48,6 @@ fun GalleryPicker(
     onImageSelected: (Uri) -> Unit,
 ) {
     val context = LocalContext.current
-    val lazyGridState = rememberLazyStaggeredGridState()
     val storagePermissionState = rememberPermissionState(
         Manifest.permission.READ_EXTERNAL_STORAGE
     )
@@ -64,7 +64,6 @@ fun GalleryPicker(
     LazyVerticalStaggeredGrid(
         modifier = modifier
             .background(backgroundColor)
-            .statusBarsPadding()
             .padding(horizontal = state.horizontalPadding.dp)
             .fillMaxWidth(),
         state = lazyGridState,

gallery-picker/src/main/kotlin/run/nabla/gallerypicker/picker/GalleryPickerActivity.kt

@@ -7,8 +7,10 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Typography
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
@@ -60,6 +62,7 @@ class GalleryPickerActivity : ComponentActivity() {
 
             MaterialTheme(typography = typography) {
                 GalleryPicker(
+                    modifier = Modifier.statusBarsPadding(),
                     onImageSelected = onImageSelected,
                     backgroundColor = Color(request.backgroundColor.toULong()),
                     state = rememberGalleryPickerState(