Improve API for select image button

Inky-developer · Inky-developer · commit b07c17a61b37 · 2025-11-24T16:35:16.000+01:00
The picker launcher is not needed anymore
diff --git a/app/src/main/java/com/inky/fitnesscalendar/ui/components/imageComponents.kt b/app/src/main/java/com/inky/fitnesscalendar/ui/components/imageComponents.kt
@@ -2,7 +2,6 @@ package com.inky.fitnesscalendar.ui.components
 
 import android.content.Context
 import android.net.Uri
-import androidx.activity.compose.ManagedActivityResultLauncher
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
@@ -18,6 +17,9 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
@@ -78,35 +80,65 @@ fun ActivityImage(
     )
 }
 
+enum class ImageLimit {
+    Single,
+    Multiple
+}
+
 /**
  * A menu button that displays an image picker.
- * @param imagePickerLauncher: The launcher to run when the item is clicked. This launcher should be initialized unconditionally with [rememberImagePickerLauncher]
+ * @param imageLimit: Whether multiple images or just one image can be picked
+ * @param onImages: Callback for when images have been picked
  * @param onDismissMenu: Callback for when the menu should get dismissed
  */
 @Composable
 fun SelectImageDropdownMenuItem(
-    imagePickerLauncher: ManagedActivityResultLauncher<PickVisualMediaRequest, *>,
+    imageLimit: ImageLimit,
+    onImages: (NonEmptyList<ImageName>) -> Unit,
     onDismissMenu: () -> Unit,
 ) {
+    val selectedImages = rememberSaveable { mutableStateListOf<ImageName>() }
+
+    LaunchedEffect(selectedImages.size) {
+        selectedImages.asNonEmptyOrNull()?.let {
+            onImages(it)
+            onDismissMenu()
+        }
+    }
+
+    val launcher = when (imageLimit) {
+        ImageLimit.Single -> rememberImagePickerLauncher(onName = {
+            selectedImages.add(it)
+        })
+
+        ImageLimit.Multiple -> rememberMultipleImagePickerLauncher(onImages = {
+            selectedImages.addAll(it)
+        })
+    }
+
+    val itemLabel = when (imageLimit) {
+        ImageLimit.Single -> R.string.add_image
+        ImageLimit.Multiple -> R.string.add_images
+    }
+
     DropdownMenuItem(
-        text = { Text(stringResource(R.string.add_image)) },
+        text = { Text(stringResource(itemLabel)) },
         leadingIcon = {
             Icon(
                 painterResource(R.drawable.outline_add_image_24),
                 stringResource(R.string.add_image)
             )
         },
         onClick = {
-            imagePickerLauncher.launch(
+            launcher.launch(
                 PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
             )
-            onDismissMenu()
         }
     )
 }
 
 @Composable
-fun rememberMultipleImagePickerLauncher(
+private fun rememberMultipleImagePickerLauncher(
     onImages: (NonEmptyList<ImageName>) -> Unit,
     context: Context = LocalContext.current
 ) = rememberLauncherForActivityResult(ActivityResultContracts.PickMultipleVisualMedia()) { uris ->
@@ -117,7 +149,7 @@ fun rememberMultipleImagePickerLauncher(
 }
 
 @Composable
-fun rememberImagePickerLauncher(
+private fun rememberImagePickerLauncher(
     onName: (ImageName) -> Unit,
     context: Context = LocalContext.current
 ) =
diff --git a/app/src/main/java/com/inky/fitnesscalendar/ui/views/EditActivityView.kt b/app/src/main/java/com/inky/fitnesscalendar/ui/views/EditActivityView.kt
@@ -73,13 +73,13 @@ import com.inky.fitnesscalendar.ui.components.DateTimePicker
 import com.inky.fitnesscalendar.ui.components.DescriptionTextInput
 import com.inky.fitnesscalendar.ui.components.FavoriteIcon
 import com.inky.fitnesscalendar.ui.components.FeelSelector
+import com.inky.fitnesscalendar.ui.components.ImageLimit
 import com.inky.fitnesscalendar.ui.components.ImageViewer
 import com.inky.fitnesscalendar.ui.components.OkayCancelDialog
 import com.inky.fitnesscalendar.ui.components.OptionGroup
 import com.inky.fitnesscalendar.ui.components.SelectImageDropdownMenuItem
 import com.inky.fitnesscalendar.ui.components.defaultTopAppBarColors
 import com.inky.fitnesscalendar.ui.components.optionGroupDefaultBackground
-import com.inky.fitnesscalendar.ui.components.rememberMultipleImagePickerLauncher
 import com.inky.fitnesscalendar.ui.util.Icons
 import com.inky.fitnesscalendar.util.asNonEmptyOrNull
 import com.inky.fitnesscalendar.util.someOrNone
@@ -201,11 +201,6 @@ fun NewActivity(
             (!isKeyboardVisible || isTest) && (editState.activityId == null || editState != initialState) && editState.isValid
         }
     }
-    val imagePickerLauncher = rememberMultipleImagePickerLauncher(onImages = { images ->
-        onState(editState.copy(images = editState.images + images.map {
-            ActivityEditState.ImageState(it)
-        }))
-    })
 
     BackHandler(enabled = editState != initialState) {
         showBackDialog = true
@@ -263,7 +258,12 @@ fun NewActivity(
                         onDismissRequest = { contextMenuOpen = false }
                     ) {
                         SelectImageDropdownMenuItem(
-                            imagePickerLauncher = imagePickerLauncher,
+                            imageLimit = ImageLimit.Multiple,
+                            onImages = { images ->
+                                onState(editState.copy(images = editState.images + images.map {
+                                    ActivityEditState.ImageState(it)
+                                }))
+                            },
                             onDismissMenu = { contextMenuOpen = false },
                         )
                     }
diff --git a/app/src/main/java/com/inky/fitnesscalendar/ui/views/EditDayDialog.kt b/app/src/main/java/com/inky/fitnesscalendar/ui/views/EditDayDialog.kt
@@ -29,10 +29,10 @@ import com.inky.fitnesscalendar.ui.components.ActivityImage
 import com.inky.fitnesscalendar.ui.components.BaseEditDialog
 import com.inky.fitnesscalendar.ui.components.DescriptionTextInput
 import com.inky.fitnesscalendar.ui.components.FeelSelector
+import com.inky.fitnesscalendar.ui.components.ImageLimit
 import com.inky.fitnesscalendar.ui.components.ImageViewer
 import com.inky.fitnesscalendar.ui.components.OptionGroup
 import com.inky.fitnesscalendar.ui.components.SelectImageDropdownMenuItem
-import com.inky.fitnesscalendar.ui.components.rememberImagePickerLauncher
 import com.inky.fitnesscalendar.ui.util.Icons
 import com.inky.fitnesscalendar.view_model.BaseViewModel
 import kotlinx.parcelize.Parcelize
@@ -64,9 +64,6 @@ fun EditDayDialog(
     var editState by rememberSaveable(day) { mutableStateOf(EditDayState(day)) }
     var showImageViewer by rememberSaveable { mutableStateOf(false) }
 
-    val imagePickerLauncher =
-        rememberImagePickerLauncher(onName = { editState = editState.copy(imageName = it) })
-
     BaseEditDialog(
         title = stringResource(R.string.edit_day),
         onNavigateBack = onNavigateBack,
@@ -82,7 +79,8 @@ fun EditDayDialog(
 
             DropdownMenu(expanded = showMenu, onDismissRequest = { showMenu = false }) {
                 SelectImageDropdownMenuItem(
-                    imagePickerLauncher = imagePickerLauncher,
+                    imageLimit = ImageLimit.Single,
+                    onImages = { images -> editState = editState.copy(imageName = images.first()) },
                     onDismissMenu = { showMenu = false },
                 )
             }
diff --git a/app/src/main/java/com/inky/fitnesscalendar/ui/views/settings/EditPlaceDialog.kt b/app/src/main/java/com/inky/fitnesscalendar/ui/views/settings/EditPlaceDialog.kt
@@ -33,11 +33,11 @@ import com.inky.fitnesscalendar.ui.components.ActivityImage
 import com.inky.fitnesscalendar.ui.components.BaseEditDialog
 import com.inky.fitnesscalendar.ui.components.ColorSelector
 import com.inky.fitnesscalendar.ui.components.DescriptionTextInput
+import com.inky.fitnesscalendar.ui.components.ImageLimit
 import com.inky.fitnesscalendar.ui.components.ImageViewer
 import com.inky.fitnesscalendar.ui.components.OptionGroup
 import com.inky.fitnesscalendar.ui.components.SelectImageDropdownMenuItem
 import com.inky.fitnesscalendar.ui.components.optionGroupDefaultBackground
-import com.inky.fitnesscalendar.ui.components.rememberImagePickerLauncher
 import com.inky.fitnesscalendar.ui.util.Icons
 import com.inky.fitnesscalendar.view_model.PlaceListViewModel
 import kotlinx.coroutines.flow.flowOf
@@ -74,8 +74,6 @@ private fun EditPlaceDialog(initialPlace: Place?, onDismiss: () -> Unit, onSave:
 
     var imageName by rememberSaveable(initialPlace) { mutableStateOf(initialPlace?.imageName) }
     var showImageViewer by rememberSaveable { mutableStateOf(false) }
-    val imagePickerLauncher =
-        rememberImagePickerLauncher(onName = { imageName = it })
 
     var name by rememberSaveable(initialPlace) { mutableStateOf(initialPlace?.name ?: "") }
     var color by rememberSaveable(initialPlace) { mutableStateOf(initialPlace?.color) }
@@ -112,7 +110,8 @@ private fun EditPlaceDialog(initialPlace: Place?, onDismiss: () -> Unit, onSave:
 
             DropdownMenu(expanded = showMenu, onDismissRequest = { showMenu = false }) {
                 SelectImageDropdownMenuItem(
-                    imagePickerLauncher = imagePickerLauncher,
+                    imageLimit = ImageLimit.Single,
+                    onImages = { imageName = it.first() },
                     onDismissMenu = { showMenu = false },
                 )
             }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -335,4 +335,5 @@
     <string name="light_mode">Helles Design</string>
     <string name="no_overlay">Keine Überlagerung</string>
     <string name="setting_default_statistic">Initiale Statistik</string>
+    <string name="add_images">Bilder hinzufügen</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -336,4 +336,5 @@
     <string name="light_mode">Light mode</string>
     <string name="no_overlay">No overlay</string>
     <string name="setting_default_statistic">Default statistic</string>
+    <string name="add_images">Add images</string>
 </resources>
