Pick image from gallery and upload it

Author: AdamGrzybkowski

gravatar-quickeditor/api/gravatar-quickeditor.api

@@ -9,16 +9,21 @@ public final class com/gravatar/quickeditor/GravatarQuickEditor {
 public final class com/gravatar/quickeditor/ui/avatarpicker/ComposableSingletons$AvatarPickerKt {
 	public static final field INSTANCE Lcom/gravatar/quickeditor/ui/avatarpicker/ComposableSingletons$AvatarPickerKt;
 	public static field lambda-1 Lkotlin/jvm/functions/Function3;
-	public static field lambda-2 Lkotlin/jvm/functions/Function3;
+	public static field lambda-2 Lkotlin/jvm/functions/Function2;
 	public static field lambda-3 Lkotlin/jvm/functions/Function2;
-	public static field lambda-4 Lkotlin/jvm/functions/Function2;
-	public static field lambda-5 Lkotlin/jvm/functions/Function2;
 	public fun <init> ()V
 	public final fun getLambda-1$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function3;
-	public final fun getLambda-2$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function3;
+	public final fun getLambda-2$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
 	public final fun getLambda-3$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
-	public final fun getLambda-4$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
-	public final fun getLambda-5$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
+}
+
+public final class com/gravatar/quickeditor/ui/components/ComposableSingletons$AvatarsSectionKt {
+	public static final field INSTANCE Lcom/gravatar/quickeditor/ui/components/ComposableSingletons$AvatarsSectionKt;
+	public static field lambda-1 Lkotlin/jvm/functions/Function3;
+	public static field lambda-2 Lkotlin/jvm/functions/Function2;
+	public fun <init> ()V
+	public final fun getLambda-1$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function3;
+	public final fun getLambda-2$gravatar_quickeditor_release ()Lkotlin/jvm/functions/Function2;
 }
 
 public final class com/gravatar/quickeditor/ui/components/ComposableSingletons$EmailLabelKt {

gravatar-quickeditor/build.gradle.kts

@@ -102,6 +102,7 @@ dependencies {
     implementation(libs.coil.compose)
     implementation(libs.retrofit)
     implementation(libs.retrofit.gson.converter)
+    implementation(libs.ucrop)
 
     // Jetpack Compose
     implementation(platform(libs.compose.bom))

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/QuickEditorContainer.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import androidx.datastore.preferences.preferencesDataStore
 import com.google.gson.GsonBuilder
+import com.gravatar.quickeditor.data.FileUtils
 import com.gravatar.quickeditor.data.repository.AvatarRepository
 import com.gravatar.quickeditor.data.service.WordPressOAuthApi
 import com.gravatar.quickeditor.data.service.WordPressOAuthService
@@ -60,6 +61,10 @@ internal class QuickEditorContainer private constructor(
         IdentityService()
     }
 
+    val fileUtils: FileUtils by lazy {
+        FileUtils(context)
+    }
+
     val avatarRepository: AvatarRepository by lazy {
         AvatarRepository(
             avatarService = avatarService,

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/data/FileUtils.kt

@@ -0,0 +1,19 @@
+package com.gravatar.quickeditor.data
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.net.toFile
+import java.io.File
+
+internal class FileUtils(
+    private val context: Context,
+) {
+    fun createTempFile(): File {
+        return File(context.cacheDir, "gravatar_${System.currentTimeMillis()}")
+    }
+
+    fun deleteFile(uri: Uri) {
+        val toFile = uri.toFile()
+        toFile.delete()
+    }
+}

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/data/models/QuickEditorError.kt

@@ -6,4 +6,6 @@ internal sealed class QuickEditorError {
     data object Unknown : QuickEditorError()
 
     data object Server : QuickEditorError()
+
+    data object AvatarUploadFailed : QuickEditorError()
 }

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/data/repository/AvatarRepository.kt

@@ -1,5 +1,7 @@
 package com.gravatar.quickeditor.data.repository
 
+import android.net.Uri
+import androidx.core.net.toFile
 import com.gravatar.quickeditor.data.models.QuickEditorError
 import com.gravatar.quickeditor.data.storage.TokenStorage
 import com.gravatar.restapi.models.Avatar
@@ -44,6 +46,16 @@ internal class AvatarRepository(
         } ?: Result.Failure(QuickEditorError.TokenNotFound)
     }
 
+    suspend fun uploadAvatar(email: Email, avatarUri: Uri): Result<Unit, QuickEditorError> = withContext(dispatcher) {
+        val token = tokenStorage.getToken(email.hash().toString())
+        token?.let {
+            when (avatarService.uploadCatching(avatarUri.toFile(), token)) {
+                is Result.Success -> Result.Success(Unit)
+                is Result.Failure -> Result.Failure(QuickEditorError.AvatarUploadFailed)
+            }
+        } ?: Result.Failure(QuickEditorError.TokenNotFound)
+    }
+
     private suspend fun getAvatarsAsync(token: String): Deferred<List<Avatar>> = coroutineScope {
         async { avatarService.retrieve(token) }
     }
@@ -55,5 +67,5 @@ internal class AvatarRepository(
 
 internal data class IdentityAvatars(
     val avatars: List<Avatar>,
-    val selectedAvatarId: String,
+    val selectedAvatarId: String?,
 )

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/avatarpicker/AvatarPicker.kt

@@ -1,15 +1,18 @@
 package com.gravatar.quickeditor.ui.avatarpicker
 
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
@@ -47,8 +50,11 @@ import com.gravatar.restapi.models.Avatar
 import com.gravatar.types.Email
 import com.gravatar.ui.GravatarTheme
 import com.gravatar.ui.components.ComponentState
+import com.yalantis.ucrop.UCrop
+import com.yalantis.ucrop.UCropActivity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.io.File
 import java.time.Instant
 
 @Composable
@@ -62,6 +68,14 @@ internal fun AvatarPicker(
     val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsState()
 
+    val uCropLauncher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        it.data?.let { intentData ->
+            UCrop.getOutput(intentData)?.let { croppedImageUri ->
+                viewModel.uploadAvatar(croppedImageUri)
+            }
+        }
+    }
+
     LaunchedEffect(Unit) {
         withContext(Dispatchers.Main.immediate) {
             lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
@@ -75,6 +89,10 @@ internal fun AvatarPicker(
                                 duration = SnackbarDuration.Long,
                             )
                         }
+
+                        is AvatarPickerAction.LaunchImageCropper -> {
+                            uCropLauncher.launchAvatarCrop(action.imageUri, action.tempFile, context)
+                        }
                     }
                 }
             }
@@ -86,6 +104,7 @@ internal fun AvatarPicker(
             AvatarPicker(
                 uiState = uiState,
                 onAvatarSelected = viewModel::selectAvatar,
+                onLocalImageSelected = viewModel::localImageSelected,
             )
             SnackbarHost(
                 modifier = Modifier
@@ -103,7 +122,11 @@ internal fun AvatarPicker(
 }
 
 @Composable
-internal fun AvatarPicker(uiState: AvatarPickerUiState, onAvatarSelected: (Avatar) -> Unit) {
+internal fun AvatarPicker(
+    uiState: AvatarPickerUiState,
+    onAvatarSelected: (Avatar) -> Unit,
+    onLocalImageSelected: (Uri) -> Unit,
+) {
     Surface(Modifier.fillMaxWidth()) {
         Column {
             EmailLabel(
@@ -127,10 +150,11 @@ internal fun AvatarPicker(uiState: AvatarPickerUiState, onAvatarSelected: (Avata
                 }
 
                 uiState.error -> Text(text = "There was an error loading avatars", textAlign = TextAlign.Center)
-                uiState.avatars != null ->
+                uiState.avatarsSectionUiState != null ->
                     AvatarsSection(
-                        uiState.avatars,
+                        uiState.avatarsSectionUiState,
                         onAvatarSelected,
+                        onLocalImageSelected,
                         Modifier.padding(horizontal = 16.dp),
                     )
             }
@@ -188,6 +212,7 @@ private fun AvatarPickerPreview() {
                 ),
             ),
             onAvatarSelected = { },
+            onLocalImageSelected = { },
         )
     }
 }

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/avatarpicker/AvatarPickerAction.kt

@@ -1,7 +1,11 @@
 package com.gravatar.quickeditor.ui.avatarpicker
 
+import android.net.Uri
 import com.gravatar.restapi.models.Avatar
+import java.io.File
 
 internal sealed class AvatarPickerAction {
     data class AvatarSelected(val avatar: Avatar) : AvatarPickerAction()
+
+    data class LaunchImageCropper(val imageUri: Uri, val tempFile: File) : AvatarPickerAction()
 }

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/avatarpicker/AvatarPickerUiState.kt

@@ -1,5 +1,6 @@
 package com.gravatar.quickeditor.ui.avatarpicker
 
+import android.net.Uri
 import com.gravatar.quickeditor.data.repository.IdentityAvatars
 import com.gravatar.restapi.models.Avatar
 import com.gravatar.restapi.models.Profile
@@ -13,24 +14,47 @@ internal data class AvatarPickerUiState(
     val profile: ComponentState<Profile>? = null,
     val identityAvatars: IdentityAvatars? = null,
     val selectingAvatarId: String? = null,
+    val uploadingAvatar: Uri? = null,
+    val scrollToIndex: Int? = null,
 ) {
-    val avatars: List<AvatarUi>? = identityAvatars?.mapToUiModel()
+    val avatarsSectionUiState: AvatarsSectionUiState? = identityAvatars?.mapToUiModel()?.let {
+        AvatarsSectionUiState(
+            avatars = it,
+            scrollToIndex = scrollToIndex,
+            uploadButtonEnabled = uploadingAvatar == null,
+        )
+    }
 
-    private fun IdentityAvatars.mapToUiModel(): List<AvatarUi.Uploaded> {
-        return this.avatars.map { avatar ->
-            AvatarUi.Uploaded(
-                avatar = avatar,
-                isSelected = avatar.imageId == (selectingAvatarId ?: selectedAvatarId),
-                isLoading = avatar.imageId == selectingAvatarId,
+    private fun IdentityAvatars.mapToUiModel(): List<AvatarUi> {
+        return mutableListOf<AvatarUi>().apply {
+            if (uploadingAvatar != null) add(AvatarUi.Local(uploadingAvatar))
+            addAll(
+                this@mapToUiModel.avatars.map { avatar ->
+                    AvatarUi.Uploaded(
+                        avatar = avatar,
+                        isSelected = avatar.imageId == (selectingAvatarId ?: selectedAvatarId),
+                        isLoading = avatar.imageId == selectingAvatarId,
+                    )
+                },
             )
-        }
+        }.toList()
     }
 }
 
+internal data class AvatarsSectionUiState(
+    val avatars: List<AvatarUi>,
+    val scrollToIndex: Int?,
+    val uploadButtonEnabled: Boolean,
+)
+
 internal sealed class AvatarUi(val avatarId: String) {
     data class Uploaded(
         val avatar: Avatar,
         val isSelected: Boolean,
         val isLoading: Boolean,
     ) : AvatarUi(avatar.imageId)
+
+    data class Local(
+        val uri: Uri,
+    ) : AvatarUi(uri.toString())
 }