[Jetsurvey] Saving the image cleaned up

florina-muntenescu · florina-muntenescu · commit f5b360d33432 · 2020-11-08T22:32:26.000Z
diff --git a/Jetsurvey/app/build.gradle b/Jetsurvey/app/build.gradle
@@ -102,6 +102,8 @@ dependencies {
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.runtimeLivedata
 
+    implementation Libs.Accompanist.coil
+
     androidTestImplementation Libs.junit
     androidTestImplementation Libs.AndroidX.Test.core
     androidTestImplementation Libs.AndroidX.Test.espressoCore
diff --git a/Jetsurvey/app/src/main/AndroidManifest.xml b/Jetsurvey/app/src/main/AndroidManifest.xml
@@ -27,15 +27,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.Jetsurvey">
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="com.example.compose.jetsurvey.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/filepaths" />
-        </provider>
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/PhotoUtils.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/PhotoUtils.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.compose.jetsurvey.survey
+
+import android.content.ContentValues
+import android.provider.MediaStore
+
+val photoCollection by lazy {
+    MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+}
+
+fun getPhotoDetails() = ContentValues().apply {
+    put(MediaStore.Images.Media.DISPLAY_NAME, generateFilename())
+    put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
+}
+
+/**
+ * Create a unique file name based on the time the photo is taken
+ */
+private fun generateFilename() = "selfie-${System.currentTimeMillis()}.jpg"
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/Survey.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/Survey.kt
@@ -16,7 +16,7 @@
 
 package com.example.compose.jetsurvey.survey
 
-import android.graphics.Bitmap
+import android.net.Uri
 import androidx.annotation.StringRes
 
 data class SurveyResult(
@@ -44,7 +44,7 @@ enum class SurveyActionType { PICK_DATE, TAKE_PHOTO, SELECT_CONTACT }
 
 sealed class SurveyActionResult {
     data class Date(val date: String) : SurveyActionResult()
-    data class Photo(val bitmap: Bitmap) : SurveyActionResult()
+    data class Photo(val uri: Uri) : SurveyActionResult()
     data class Contact(val contact: String) : SurveyActionResult()
 }
 
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyFragment.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyFragment.kt
@@ -16,10 +16,8 @@
 
 package com.example.compose.jetsurvey.survey
 
-import android.content.ContentValues
+import android.net.Uri
 import android.os.Bundle
-import android.provider.MediaStore
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,29 +34,13 @@ class SurveyFragment : Fragment() {
 
     private val viewModel: SurveyViewModel by viewModels { SurveyViewModelFactory() }
 
-    // Add a specific media item.
-    val resolver by lazy { requireContext().contentResolver }
+    private val resolver by lazy { requireContext().contentResolver }
+    // Uri used to save photos taken with the camera
+    private var uri: Uri? = null
 
-    // Find all audio files on the primary external storage device.
-// On API <= 28, use VOLUME_EXTERNAL instead.
-    val photoCollection by lazy {
-        MediaStore.Images.Media.getContentUri(
-            MediaStore.VOLUME_EXTERNAL_PRIMARY
-        )
-    }
-
-    val newPhotoDetails by lazy {
-        ContentValues().apply {
-            put(MediaStore.Images.Media.DISPLAY_NAME, "photo")
-            put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
-        }
-    }
-    val uri by lazy { resolver.insert(photoCollection, newPhotoDetails) }
-
-    private val takePicture = registerForActivityResult(TakePicture()) { saved ->
-        if (saved) {
-            Log.d("flo", "saved: $saved")
-//            viewModel.saveImageFromCamera(bitmap, imagesFolder)
+    private val takePicture = registerForActivityResult(TakePicture()) { photoSaved ->
+        if (photoSaved) {
+            uri?.let { viewModel.onImageSaved(it) }
         }
     }
 
@@ -101,7 +83,7 @@ class SurveyFragment : Fragment() {
     private fun handleSurveyAction(questionId: Int, actionType: SurveyActionType) {
         when (actionType) {
             SurveyActionType.PICK_DATE -> showDatePicker(questionId)
-            SurveyActionType.TAKE_PHOTO -> takeAPhoto(questionId)
+            SurveyActionType.TAKE_PHOTO -> takeAPhoto()
             SurveyActionType.SELECT_CONTACT -> selectContact(questionId)
         }
     }
@@ -116,9 +98,8 @@ class SurveyFragment : Fragment() {
         }
     }
 
-
-    @Suppress("UNUSED_PARAMETER")
-    private fun takeAPhoto(questionId: Int) {
+    private fun takeAPhoto() {
+        uri = resolver.insert(photoCollection, getPhotoDetails())
         takePicture.launch(uri)
     }
 
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt
@@ -16,7 +16,6 @@
 
 package com.example.compose.jetsurvey.survey
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.ScrollableColumn
 import androidx.compose.foundation.background
@@ -26,7 +25,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSizeConstraints
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
@@ -49,12 +48,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageAsset
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.ui.tooling.preview.Preview
 import com.example.compose.jetsurvey.R
 import com.example.compose.jetsurvey.theme.JetsurveyTheme
+import com.example.compose.jetsurvey.theme.questionBackground
+import dev.chrisbanes.accompanist.coil.CoilImage
 
 @Composable
 fun Question(
@@ -276,9 +276,9 @@ private fun ActionQuestion(
                 )
             }
             is SurveyActionResult.Photo -> {
-                Image(
-                    asset = answer.result.bitmap.asImageAsset(),
-                    modifier = Modifier.defaultMinSizeConstraints(minWidth = 500.dp, minHeight = 500.dp)
+                CoilImage(
+                    data = answer.result.uri,
+                    modifier = Modifier.fillMaxSize()
                 )
             }
             is SurveyActionResult.Contact -> TODO()
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyViewModel.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyViewModel.kt
@@ -16,26 +16,13 @@
 
 package com.example.compose.jetsurvey.survey
 
-import android.content.Context
-import android.content.res.XmlResourceParser
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.util.Log
+import android.net.Uri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.FileOutputStream
-
-private const val FILEPATH_XML_KEY = "files-path"
 
 class SurveyViewModel(private val surveyRepository: SurveyRepository) : ViewModel() {
 
@@ -76,6 +63,12 @@ class SurveyViewModel(private val surveyRepository: SurveyRepository) : ViewMode
         updateStateWithActionResult(questionId, SurveyActionResult.Date(date))
     }
 
+    fun onImageSaved(uri: Uri) {
+        getLatestQuestionId()?.let { questionId ->
+            updateStateWithActionResult(questionId, SurveyActionResult.Photo(uri))
+        }
+    }
+
     private fun updateStateWithActionResult(questionId: Int, result: SurveyActionResult) {
         val latestState = _uiState.value
         if (latestState != null && latestState is SurveyState.Questions) {
@@ -88,59 +81,15 @@ class SurveyViewModel(private val surveyRepository: SurveyRepository) : ViewMode
         }
     }
 
-
-    fun saveImageFromCamera(bitmap: Bitmap, imagesFolder: File) {
-        val imageFile = File(imagesFolder, generateFilename("CAMERA"))
-        val imageStream = FileOutputStream(imageFile)
-
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                try {
-//                    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, imageStream)
-                    val grayscaleBitmap = withContext(Dispatchers.Default) {
-                        applyGrayscaleFilter(bitmap)
-                    }
-                    grayscaleBitmap.compress(Bitmap.CompressFormat.JPEG, 100, imageStream)
-                    imageStream.flush()
-                    imageStream.close()
-
-                    Log.d("flo", "Camera image saved")
-
-                } catch (e: Exception) {
-                    Log.e(javaClass.simpleName, "Error writing bitmap", e)
-                }
-            }
-        }
-
-        Log.d("flo", "filename: ${imageFile.path}")
-        val newBitmap = BitmapFactory.decodeFile(imageFile.absolutePath)
-        updateStateWithActionResult(975, SurveyActionResult.Photo(newBitmap))
-    }
-}
-
-fun getImagesFolder(context: Context): File {
-    return File(context.filesDir, "images/").also {
-        if (!it.exists()) {
-            it.mkdir()
+    private fun getLatestQuestionId(): Int? {
+        val latestState = _uiState.value
+        if (latestState != null && latestState is SurveyState.Questions) {
+            return latestState.questionsState[0].question.id
         }
+        return null
     }
 }
 
-fun generateFilename(source: String) = "$source-${System.currentTimeMillis()}.jpg"
-
-suspend fun applyGrayscaleFilter(original: Bitmap): Bitmap = withContext(Dispatchers.Default) {
-    val height = original.height
-    val width = original.width
-
-    val modifiedBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)
-    val canvas = Canvas(modifiedBitmap)
-    val paint = Paint()
-    canvas.drawBitmap(original, null, Rect(0, 0, original.width, original.height), paint)
-
-    modifiedBitmap
-}
-
-
 class SurveyViewModelFactory : ViewModelProvider.Factory {
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
diff --git a/Jetsurvey/app/src/main/res/xml/filepaths.xml b/Jetsurvey/app/src/main/res/xml/filepaths.xml
diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
@@ -28,6 +28,11 @@ object Libs {
 
     const val material = "com.google.android.material:material:1.1.0"
 
+    object Accompanist {
+        private const val version = "0.3.2"
+        const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
+    }
+
     object Kotlin {
         private const val version = "1.4.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
