Implement 'Take photo' action in the media picker

Author: AdamGrzybkowski

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ junit = "4.13.2"
 mockk = "1.13.9"
 appcompat = "1.7.0"
 material = "1.12.0"
-ucrop = "2.2.9"
+ucrop = "2.2.9-native"
 coil = "2.7.0"
 activityCompose = "1.9.0"
 robolectric = "4.12.2"

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

@@ -8,8 +8,8 @@ import java.io.File
 internal class FileUtils(
     private val context: Context,
 ) {
-    fun createTempFile(): File {
-        return File(context.cacheDir, "gravatar_${System.currentTimeMillis()}")
+    fun createCroppedAvatarFile(): File {
+        return File(context.cacheDir, "cropped_avatar_${System.currentTimeMillis()}.jpg")
     }
 
     fun deleteFile(uri: Uri) {

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

@@ -2,6 +2,7 @@ package com.gravatar.quickeditor.ui.avatarpicker
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
 import android.graphics.Color
 import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -163,7 +164,8 @@ internal fun AvatarPicker(
     }
 }
 
-private const val UCROP_COMPRESSION_QUALITY = 100
+private const val UCROP_COMPRESSION_QUALITY = 90
+private const val UCROP_MAX_IMAGE_SIZE = 1080
 
 private fun ActivityResultLauncher<Intent>.launchAvatarCrop(image: Uri, tempFile: File, context: Context) {
     val options = UCrop.Options().apply {
@@ -172,6 +174,8 @@ private fun ActivityResultLauncher<Intent>.launchAvatarCrop(image: Uri, tempFile
         setToolbarWidgetColor(Color.WHITE)
         setAllowedGestures(UCropActivity.SCALE, UCropActivity.ROTATE, UCropActivity.NONE)
         setCompressionQuality(UCROP_COMPRESSION_QUALITY)
+        setCompressionFormat(Bitmap.CompressFormat.JPEG)
+        withMaxResultSize(UCROP_MAX_IMAGE_SIZE, UCROP_MAX_IMAGE_SIZE)
         setCircleDimmedLayer(true)
     }
     launch(

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

@@ -71,7 +71,7 @@ internal class AvatarPickerViewModel(
 
     fun localImageSelected(imageUri: Uri) {
         viewModelScope.launch {
-            _actions.send(AvatarPickerAction.LaunchImageCropper(imageUri, fileUtils.createTempFile()))
+            _actions.send(AvatarPickerAction.LaunchImageCropper(imageUri, fileUtils.createCroppedAvatarFile()))
         }
     }
 

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/components/AvatarsSection.kt

@@ -29,12 +29,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.onPlaced
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.gravatar.quickeditor.QuickEditorFileProvider
 import com.gravatar.quickeditor.R
 import com.gravatar.quickeditor.ui.avatarpicker.AvatarUi
 import com.gravatar.quickeditor.ui.avatarpicker.AvatarsSectionUiState
@@ -50,14 +52,21 @@ internal fun AvatarsSection(
     onLocalImageSelected: (Uri) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val context = LocalContext.current
     var popupVisible by rememberSaveable { mutableStateOf(false) }
     var popupYOffset by rememberSaveable { mutableIntStateOf(0) }
+    var photoImageUri by rememberSaveable { mutableStateOf<Uri?>(null) }
     val listState = rememberLazyListState()
 
     val pickMedia = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
         uri?.let { onLocalImageSelected(it) }
     }
 
+    val takePhoto = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        val takenPictureUri = photoImageUri
+        if (success && takenPictureUri != null) onLocalImageSelected(takenPictureUri)
+    }
+
     LaunchedEffect(state.scrollToIndex) {
         state.scrollToIndex?.let { listState.scrollToItem(it) }
     }
@@ -133,7 +142,12 @@ internal fun AvatarsSection(
                     popupVisible = false
                     pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
                 },
-                onTakePhotoClick = { popupVisible = false },
+                onTakePhotoClick = {
+                    popupVisible = false
+                    val imageUri = QuickEditorFileProvider.getTempCameraImageUri(context)
+                    photoImageUri = imageUri
+                    takePhoto.launch(imageUri)
+                },
             )
         }
     }

gravatar-quickeditor/src/test/java/com/gravatar/quickeditor/ui/avatarpicker/AvatarPickerViewModelTest.kt

@@ -267,7 +267,7 @@ class AvatarPickerViewModelTest {
     fun `given local image when selected then launch cropper action sent`() = runTest {
         val file = mockk<File>()
         val uri = mockk<Uri>()
-        every { fileUtils.createTempFile() } returns file
+        every { fileUtils.createCroppedAvatarFile() } returns file
 
         viewModel = initViewModel()