From d85414b242959b3611247a85171e9f4fb93d5f7d Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Fri, 10 Jun 2022 14:23:28 +0200
Subject: [PATCH 01/28] Manifest permissions

---
 app/src/main/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 75369ba1..deaa3708 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="net.chmielowski.randomchoice">
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
+
     <application
         android:name=".RandomChoiceApplication"
         android:dataExtractionRules="@xml/data_extraction_rules"

From 0c92ad81feb8aa231d5e175941ccdfd8c7926092 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Fri, 10 Jun 2022 14:34:07 +0200
Subject: [PATCH 02/28] Create file

---
 .../chmielowski/randomchoice/utils/Camera.kt   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index 0719ad6c..bbe2111c 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -5,13 +5,17 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Environment
 import android.provider.MediaStore
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.content.FileProvider
 import net.chmielowski.randomchoice.R
+import java.io.File
 
 @Composable
 internal fun createLaunchCamera(onResult: (Bitmap?) -> Unit): () -> Unit {
@@ -28,8 +32,18 @@ internal fun createLaunchCamera(onResult: (Bitmap?) -> Unit): () -> Unit {
 
 private class CameraResultContract : ActivityResultContract<Unit, Bitmap?>() {
 
-    override fun createIntent(context: Context, input: Unit) =
-        Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+    override fun createIntent(context: Context, input: Unit): Intent {
+        val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+        val uri = createFile(context) ?: error("") // TODO@
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri)
+        return intent
+    }
+
+    private fun createFile(context: Context): Uri? {
+        val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: return null
+        val file = File.createTempFile("Random Choice", ".jpg", directory)
+        return FileProvider.getUriForFile(context, "com.example.android.fileprovider", file)
+    }
 
     override fun parseResult(resultCode: Int, intent: Intent?) =
         if (resultCode == Activity.RESULT_OK) {

From 1aacdc1f1e1332b822a919f64e3b36566cd4a07f Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Fri, 10 Jun 2022 14:35:38 +0200
Subject: [PATCH 03/28] Crash fix

---
 app/src/main/AndroidManifest.xml                       | 10 ++++++++++
 .../net/chmielowski/randomchoice/utils/Camera.kt       |  3 ++-
 app/src/main/res/xml/provider_paths.xml                |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/xml/provider_paths.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index deaa3708..bc085f8e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,16 @@
         <!--For Robolectric-->
         <activity android:name="androidx.activity.ComponentActivity" />
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index bbe2111c..c85a9562 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -14,6 +14,7 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.FileProvider
+import net.chmielowski.randomchoice.BuildConfig
 import net.chmielowski.randomchoice.R
 import java.io.File
 
@@ -42,7 +43,7 @@ private class CameraResultContract : ActivityResultContract<Unit, Bitmap?>() {
     private fun createFile(context: Context): Uri? {
         val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: return null
         val file = File.createTempFile("Random Choice", ".jpg", directory)
-        return FileProvider.getUriForFile(context, "com.example.android.fileprovider", file)
+        return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
     }
 
     override fun parseResult(resultCode: Int, intent: Intent?) =
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 00000000..a075ef96
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path
+        name="external_files"
+        path="." />
+</paths>

From d23b0c362a930c6d55d94cbea50b36ed852dd6cf Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Fri, 10 Jun 2022 14:41:05 +0200
Subject: [PATCH 04/28] Saving file

---
 .../chmielowski/randomchoice/utils/Camera.kt  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index c85a9562..e348a269 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -24,28 +24,22 @@ internal fun createLaunchCamera(onResult: (Bitmap?) -> Unit): () -> Unit {
     val context = LocalContext.current
     return {
         @Suppress("SwallowedException") try {
-            launcher.launch(Unit)
+            val file = createFile(context)
+            launcher.launch(file)
         } catch (e: ActivityNotFoundException) {
             context.showError()
         }
     }
 }
 
-private class CameraResultContract : ActivityResultContract<Unit, Bitmap?>() {
+private class CameraResultContract : ActivityResultContract<Uri, Bitmap?>() {
 
-    override fun createIntent(context: Context, input: Unit): Intent {
+    override fun createIntent(context: Context, input: Uri): Intent {
         val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-        val uri = createFile(context) ?: error("") // TODO@
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri)
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, input)
         return intent
     }
 
-    private fun createFile(context: Context): Uri? {
-        val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: return null
-        val file = File.createTempFile("Random Choice", ".jpg", directory)
-        return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
-    }
-
     override fun parseResult(resultCode: Int, intent: Intent?) =
         if (resultCode == Activity.RESULT_OK) {
             intent?.extras?.getParcelableCompat<Bitmap>("data")
@@ -59,3 +53,9 @@ private fun Context.showError() {
         .makeText(this, R.string.error, Toast.LENGTH_LONG)
         .show()
 }
+
+private fun createFile(context: Context): Uri? {
+    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: return null
+    val file = File.createTempFile("Random Choice", ".jpg", directory)
+    return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
+}

From c1d006d5f0989bfd07ede53ac703452805974de4 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Fri, 10 Jun 2022 15:32:53 +0200
Subject: [PATCH 05/28] Read file

---
 app/build.gradle                              |  3 +++
 .../chmielowski/randomchoice/core/Dilemma.kt  |  2 +-
 .../chmielowski/randomchoice/core/Option.kt   | 12 +++-------
 .../ui/screen/component/MarqueeText.kt        |  4 ++--
 .../ui/screen/input/InputScreen.kt            | 15 ++++++++-----
 .../chmielowski/randomchoice/utils/Camera.kt  | 22 +++++++++----------
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e26f8e32..1f15447a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,6 +132,9 @@ dependencies {
     implementation "io.insert-koin:koin-androidx-compose:$koin_version"
     testImplementation "io.insert-koin:koin-test:$koin_version"
 
+    implementation "io.coil-kt:coil:2.1.0"
+    implementation "io.coil-kt:coil-compose:2.1.0"
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.9'
     testImplementation "org.assertj:assertj-core:3.22.0"
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/Dilemma.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/Dilemma.kt
index 70974990..2cb5f14c 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/Dilemma.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/Dilemma.kt
@@ -45,7 +45,7 @@ internal data class Dilemma(private val options: List<Option> = listOf(Text(), T
     val canResetOrSave get() = options.any(Option::hasValue)
 
     fun update(id: OptionId, option: Option): Dilemma {
-        if (option is Image && option.bitmap == null) {
+        if (option is Image && option.file == null) {
             return this
         }
         return Dilemma(options.replace(id.value, option))
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/Option.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/Option.kt
index 94c278b4..66d9c54b 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/Option.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/Option.kt
@@ -1,10 +1,8 @@
 package net.chmielowski.randomchoice.core
 
-import android.graphics.Bitmap
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import net.chmielowski.randomchoice.utils.toBitmap
-import net.chmielowski.randomchoice.utils.toByteArray
+import java.io.File
 
 sealed interface Option : Parcelable {
 
@@ -19,12 +17,8 @@ sealed interface Option : Parcelable {
 
     @JvmInline
     @Parcelize
-    value class Image(private val array: ByteArray? = null) : Option {
+    value class Image(val file: File? = null) : Option {
 
-        constructor(bitmap: Bitmap?) : this(bitmap?.toByteArray())
-
-        val bitmap get() = array?.toBitmap()
-
-        override val hasValue get() = array != null
+        override val hasValue get() = file != null
     }
 }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/component/MarqueeText.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/component/MarqueeText.kt
index d20f5504..4d5b16bb 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/component/MarqueeText.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/component/MarqueeText.kt
@@ -20,13 +20,13 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
-import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import coil.compose.rememberAsyncImagePainter
 import net.chmielowski.randomchoice.core.Option
 import net.chmielowski.randomchoice.core.Result
 
@@ -52,7 +52,7 @@ internal fun AnimatedResult(
                         )
                         is Option.Image -> Card(Modifier.padding(top = 8.dp)) {
                             Image(
-                                bitmap = item.bitmap!!.asImageBitmap(),
+                                painter = rememberAsyncImagePainter(item.file),
                                 contentDescription = null,
                                 contentScale = ContentScale.FillWidth,
                                 modifier = Modifier
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 67424651..633b53f1 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -50,6 +50,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -57,15 +58,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import coil.compose.rememberAsyncImagePainter
 import com.arkivanov.mvikotlin.core.store.Store
 import com.arkivanov.mvikotlin.extensions.coroutines.labels
 import com.arkivanov.mvikotlin.extensions.coroutines.states
@@ -96,6 +98,7 @@ import net.chmielowski.randomchoice.ui.theme.Theme
 import net.chmielowski.randomchoice.ui.widgets.Scaffold
 import net.chmielowski.randomchoice.ui.widgets.rememberScrollBehavior
 import net.chmielowski.randomchoice.utils.Observe
+import net.chmielowski.randomchoice.utils.createFile
 import net.chmielowski.randomchoice.utils.createLaunchCamera
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -471,8 +474,10 @@ private fun ImageField(
     dilemma: Dilemma,
     onIntent: (Intent) -> Unit,
 ) {
-    val launchCamera = createLaunchCamera(onResult = { bitmap ->
-        onIntent(EnterOptionsIntent.ChangeOption(Option.Image(bitmap), field.id))
+    val context = LocalContext.current
+    val file = rememberSaveable { createFile(context) }
+    val launchCamera = createLaunchCamera(onResult = {
+        onIntent(EnterOptionsIntent.ChangeOption(Option.Image(file), field.id))
     })
     Card(
         modifier = Modifier.clickable(onClick = launchCamera)
@@ -483,10 +488,10 @@ private fun ImageField(
             modifier = Modifier.align(Alignment.End),
             canRemove = dilemma.canRemove,
         )
-        val bitmap = field.value.bitmap
+        val bitmap = field.value.file
         if (bitmap != null) {
             Image(
-                bitmap = bitmap.asImageBitmap(),
+                painter = rememberAsyncImagePainter(field.value.file),
                 contentDescription = null,
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier.fillMaxWidth(),
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index e348a269..382ef920 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -5,7 +5,6 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.net.Uri
 import android.os.Environment
 import android.provider.MediaStore
 import android.widget.Toast
@@ -20,23 +19,22 @@ import java.io.File
 
 @Composable
 internal fun createLaunchCamera(onResult: (Bitmap?) -> Unit): () -> Unit {
-    val launcher = rememberLauncherForActivityResult(CameraResultContract(), onResult)
     val context = LocalContext.current
+    val launcher = rememberLauncherForActivityResult(CameraResultContract(), onResult)
     return {
         @Suppress("SwallowedException") try {
-            val file = createFile(context)
-            launcher.launch(file)
+            launcher.launch(Unit)
         } catch (e: ActivityNotFoundException) {
             context.showError()
         }
     }
 }
 
-private class CameraResultContract : ActivityResultContract<Uri, Bitmap?>() {
+private class CameraResultContract : ActivityResultContract<Unit, Bitmap?>() {
 
-    override fun createIntent(context: Context, input: Uri): Intent {
+    override fun createIntent(context: Context, input: Unit): Intent {
         val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, input)
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, createFile(context).uri(context))
         return intent
     }
 
@@ -54,8 +52,10 @@ private fun Context.showError() {
         .show()
 }
 
-private fun createFile(context: Context): Uri? {
-    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: return null
-    val file = File.createTempFile("Random Choice", ".jpg", directory)
-    return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
+internal fun createFile(context: Context): File {
+    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
+    return File.createTempFile("Random Choice", ".jpg", directory)
 }
+
+private fun File.uri(context: Context) =
+    FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", this)

From 07443174215fa02e220e6971fe22c52e543dd0f7 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Fri, 10 Jun 2022 15:33:11 +0200
Subject: [PATCH 06/28] Cleanup

---
 .../chmielowski/randomchoice/ui/screen/input/InputScreen.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 633b53f1..0e2f591b 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -488,10 +488,10 @@ private fun ImageField(
             modifier = Modifier.align(Alignment.End),
             canRemove = dilemma.canRemove,
         )
-        val bitmap = field.value.file
-        if (bitmap != null) {
+        val file = field.value.file
+        if (file != null) {
             Image(
-                painter = rememberAsyncImagePainter(field.value.file),
+                painter = rememberAsyncImagePainter(file),
                 contentDescription = null,
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier.fillMaxWidth(),

From 515431e49b960f5fd1f142ea09d40cc5bd267e02 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 13:33:56 +0200
Subject: [PATCH 07/28] WiP

---
 .../ui/screen/input/InputScreen.kt             | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 0e2f591b..777d41ff 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -2,9 +2,12 @@
 
 package net.chmielowski.randomchoice.ui.screen.input
 
+import android.util.Log
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -57,6 +60,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -476,6 +480,7 @@ private fun ImageField(
 ) {
     val context = LocalContext.current
     val file = rememberSaveable { createFile(context) }
+    Log.d("pchm", "Create " + file.absolutePath.toString())
     val launchCamera = createLaunchCamera(onResult = {
         onIntent(EnterOptionsIntent.ChangeOption(Option.Image(file), field.id))
     })
@@ -488,13 +493,16 @@ private fun ImageField(
             modifier = Modifier.align(Alignment.End),
             canRemove = dilemma.canRemove,
         )
-        val file = field.value.file
-        if (file != null) {
+        val readFile = field.value.file
+        Log.d("pchm", "Read " + readFile?.absolutePath.toString())
+        if (readFile != null) {
             Image(
-                painter = rememberAsyncImagePainter(file),
+                painter = rememberAsyncImagePainter(readFile, contentScale = ContentScale.FillBounds),
                 contentDescription = null,
-                contentScale = ContentScale.FillWidth,
-                modifier = Modifier.fillMaxWidth(),
+//                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .size(50.dp)
+                    .border(2.dp, Color.Red),
             )
         } else {
             Image(

From 54a5003f31027f0d96d33ff50c56561a10d7a6c9 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 14:42:05 +0200
Subject: [PATCH 08/28] WiP

---
 .../chmielowski/randomchoice/MainActivity.kt  | 29 +++++++++++++++++++
 .../chmielowski/randomchoice/utils/Camera.kt  |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt
index e7e6cd47..61ba886f 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt
@@ -3,8 +3,17 @@ package net.chmielowski.randomchoice
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Text
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.core.os.bundleOf
 import androidx.core.view.WindowCompat
+import coil.compose.AsyncImagePainter
+import coil.compose.rememberAsyncImagePainter
 import com.arkivanov.mvikotlin.core.store.Store
 import net.chmielowski.randomchoice.core.Intent
 import net.chmielowski.randomchoice.core.Label
@@ -14,6 +23,7 @@ import net.chmielowski.randomchoice.ui.Content
 import net.chmielowski.randomchoice.ui.screen.input.DropdownMenuStrategy
 import net.chmielowski.randomchoice.utils.getParcelableCompat
 import org.koin.android.ext.android.get
+import java.io.File
 
 class MainActivity : ComponentActivity() {
 
@@ -32,6 +42,25 @@ class MainActivity : ComponentActivity() {
                 store = stateStore,
                 menuStrategy = DropdownMenuStrategy.Real(),
             )
+
+//            val file = File(
+//                "/storage/emulated/0/Android/data/net.chmielowski.randomchoice/files/Pictures/Random Choice7504732900224082083.jpg"
+//            )
+//            val painter = rememberAsyncImagePainter(file)
+//            Column {
+//                val state = painter.state
+//                if (state is AsyncImagePainter.State.Error) {
+//                    val txt = state.result.throwable.toString()
+//                    Text(txt)
+//                }
+//                Image(
+//                    painter,
+//                    contentDescription = null,
+//                    modifier = Modifier
+//                        .background(Color.Red)
+//                        .fillMaxSize(0.8F),
+//                )
+//            }
         }
     }
 
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index 382ef920..980ddaaf 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -22,9 +22,9 @@ internal fun createLaunchCamera(onResult: (Bitmap?) -> Unit): () -> Unit {
     val context = LocalContext.current
     val launcher = rememberLauncherForActivityResult(CameraResultContract(), onResult)
     return {
-        @Suppress("SwallowedException") try {
+        try {
             launcher.launch(Unit)
-        } catch (e: ActivityNotFoundException) {
+        } catch (_: ActivityNotFoundException) {
             context.showError()
         }
     }

From 73e184acb5a8a22c71ab7638a9352a979770cd94 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 14:49:58 +0200
Subject: [PATCH 09/28] Remove unused contract

---
 .../ui/screen/input/InputScreen.kt            |  7 +++--
 .../chmielowski/randomchoice/utils/Camera.kt  | 29 ++++---------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 777d41ff..935725f4 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -6,7 +6,6 @@ import android.util.Log
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -485,7 +484,7 @@ private fun ImageField(
         onIntent(EnterOptionsIntent.ChangeOption(Option.Image(file), field.id))
     })
     Card(
-        modifier = Modifier.clickable(onClick = launchCamera)
+        modifier = Modifier.clickable(onClick = { launchCamera() })
     ) {
         RemoveOptionButton(
             onClick = { onIntent(EnterOptionsIntent.Remove(field.id)) },
@@ -497,7 +496,9 @@ private fun ImageField(
         Log.d("pchm", "Read " + readFile?.absolutePath.toString())
         if (readFile != null) {
             Image(
-                painter = rememberAsyncImagePainter(readFile, contentScale = ContentScale.FillBounds),
+                painter = rememberAsyncImagePainter(
+                    readFile, contentScale = ContentScale.FillBounds
+                ),
                 contentDescription = null,
 //                contentScale = ContentScale.FillWidth,
                 modifier = Modifier
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index 980ddaaf..fc873d71 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -1,15 +1,11 @@
 package net.chmielowski.randomchoice.utils
 
-import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
 import android.os.Environment
-import android.provider.MediaStore
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.FileProvider
@@ -18,34 +14,19 @@ import net.chmielowski.randomchoice.R
 import java.io.File
 
 @Composable
-internal fun createLaunchCamera(onResult: (Bitmap?) -> Unit): () -> Unit {
+internal fun createLaunchCamera(onResult: (Boolean) -> Unit): () -> Unit {
     val context = LocalContext.current
-    val launcher = rememberLauncherForActivityResult(CameraResultContract(), onResult)
+    val launcher =
+        rememberLauncherForActivityResult(ActivityResultContracts.TakePicture(), onResult)
     return {
         try {
-            launcher.launch(Unit)
+            launcher.launch(createFile(context).uri(context))
         } catch (_: ActivityNotFoundException) {
             context.showError()
         }
     }
 }
 
-private class CameraResultContract : ActivityResultContract<Unit, Bitmap?>() {
-
-    override fun createIntent(context: Context, input: Unit): Intent {
-        val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, createFile(context).uri(context))
-        return intent
-    }
-
-    override fun parseResult(resultCode: Int, intent: Intent?) =
-        if (resultCode == Activity.RESULT_OK) {
-            intent?.extras?.getParcelableCompat<Bitmap>("data")
-        } else {
-            null
-        }
-}
-
 private fun Context.showError() {
     Toast
         .makeText(this, R.string.error, Toast.LENGTH_LONG)

From 52bdc03a95b15d5316f45456e09535e22941886a Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 14:53:35 +0200
Subject: [PATCH 10/28] Pass file

---
 .../chmielowski/randomchoice/ui/screen/input/InputScreen.kt | 5 ++++-
 .../kotlin/net/chmielowski/randomchoice/utils/Camera.kt     | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 935725f4..3f78eb3a 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -484,7 +484,10 @@ private fun ImageField(
         onIntent(EnterOptionsIntent.ChangeOption(Option.Image(file), field.id))
     })
     Card(
-        modifier = Modifier.clickable(onClick = { launchCamera() })
+        modifier = Modifier.clickable(onClick = {
+            val file1 = createFile(context)
+            launchCamera(file1)
+        })
     ) {
         RemoveOptionButton(
             onClick = { onIntent(EnterOptionsIntent.Remove(field.id)) },
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index fc873d71..12550acf 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -14,13 +14,13 @@ import net.chmielowski.randomchoice.R
 import java.io.File
 
 @Composable
-internal fun createLaunchCamera(onResult: (Boolean) -> Unit): () -> Unit {
+internal fun createLaunchCamera(onResult: (Boolean) -> Unit): (File) -> Unit {
     val context = LocalContext.current
     val launcher =
         rememberLauncherForActivityResult(ActivityResultContracts.TakePicture(), onResult)
-    return {
+    return { file: File ->
         try {
-            launcher.launch(createFile(context).uri(context))
+            launcher.launch(file.uri(context))
         } catch (_: ActivityNotFoundException) {
             context.showError()
         }

From 593caf592753bb3ca40dec6dea7853b6bd7a49ba Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 15:02:14 +0200
Subject: [PATCH 11/28] Labels

---
 .../randomchoice/core/StateStore.kt           |  7 +++
 .../randomchoice/ui/screen/Previews.kt        |  3 ++
 .../ui/screen/input/InputScreen.kt            | 45 ++++++++++++-------
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index 32b0d7f9..3318073e 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -1,5 +1,6 @@
 package net.chmielowski.randomchoice.core
 
+import android.net.Uri
 import android.os.Parcelable
 import com.arkivanov.mvikotlin.extensions.coroutines.CoroutineExecutor
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
@@ -45,6 +46,10 @@ internal sealed interface Intent {
         object ResetAll : EnterOptionsIntent
 
         data class SelectMode(val mode: Mode) : EnterOptionsIntent
+
+        data class OnCameraResult(val option: OptionId, val success: Boolean) : EnterOptionsIntent
+
+        data class ClickOption(val option: OptionId) : EnterOptionsIntent
     }
 
     data class SetTheme(val theme: Theme) : Intent
@@ -89,6 +94,8 @@ internal sealed interface Label {
     data class ShowResult(val result: Result) : Label
 
     object ShowDilemmaDeleted : Label
+
+    data class TakePicture(val uri: Uri) : Label
 }
 
 internal class MainExecutor(
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt
index cf8d0b44..050c2e95 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.tooling.preview.Preview
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flow
 import net.chmielowski.randomchoice.core.Dilemma
 import net.chmielowski.randomchoice.core.DilemmaId
@@ -31,6 +32,7 @@ internal fun InputScreenTextPreview() {
         onIntent = {},
         focusRequester = FocusRequester(),
         menuStrategy = DropdownMenuStrategy.Real(),
+        labels = emptyFlow(),
     )
 }
 
@@ -43,6 +45,7 @@ internal fun InputScreenImagePreview() {
         onIntent = {},
         focusRequester = FocusRequester(),
         menuStrategy = DropdownMenuStrategy.Real(),
+        labels = emptyFlow(),
     )
 }
 
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 3f78eb3a..0ae1a23e 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -3,6 +3,8 @@
 package net.chmielowski.randomchoice.ui.screen.input
 
 import android.util.Log
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -52,7 +54,6 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -66,7 +67,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -77,6 +77,7 @@ import com.arkivanov.mvikotlin.extensions.coroutines.states
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
 import net.chmielowski.randomchoice.R
 import net.chmielowski.randomchoice.core.Dilemma
 import net.chmielowski.randomchoice.core.Dilemma.OptionField
@@ -87,6 +88,7 @@ import net.chmielowski.randomchoice.core.Label
 import net.chmielowski.randomchoice.core.Label.FocusFirstOptionInput
 import net.chmielowski.randomchoice.core.Label.ShowDilemmaDeleted
 import net.chmielowski.randomchoice.core.Label.ShowResult
+import net.chmielowski.randomchoice.core.Label.TakePicture
 import net.chmielowski.randomchoice.core.Mode
 import net.chmielowski.randomchoice.core.Option
 import net.chmielowski.randomchoice.core.State
@@ -101,8 +103,6 @@ import net.chmielowski.randomchoice.ui.theme.Theme
 import net.chmielowski.randomchoice.ui.widgets.Scaffold
 import net.chmielowski.randomchoice.ui.widgets.rememberScrollBehavior
 import net.chmielowski.randomchoice.utils.Observe
-import net.chmielowski.randomchoice.utils.createFile
-import net.chmielowski.randomchoice.utils.createLaunchCamera
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @Destination(start = true)
@@ -118,7 +118,7 @@ internal fun InputScreen(
         when (label) {
             is ShowResult -> navigator.navigate(ResultScreenDestination(label.result))
             FocusFirstOptionInput -> focusRequester.requestFocus()
-            ShowDilemmaDeleted -> {}
+            ShowDilemmaDeleted, is TakePicture -> {} // TODO@ Consider taking picture there
         }
     }
     InputScreen(
@@ -127,6 +127,7 @@ internal fun InputScreen(
         onIntent = store::accept,
         focusRequester = focusRequester,
         menuStrategy = menuStrategy,
+        labels = store.labels,
     )
 }
 
@@ -139,6 +140,7 @@ internal fun InputScreen(
     onIntent: (Intent) -> Unit,
     focusRequester: FocusRequester,
     menuStrategy: DropdownMenuStrategy,
+    labels: Flow<Label>,
 ) {
     var transitionVisible by remember { mutableStateOf(false) }
     val scrollBehavior = rememberScrollBehavior()
@@ -200,6 +202,7 @@ internal fun InputScreen(
                 dilemma = state.dilemma,
                 onIntent = onIntent,
                 focusRequester = focusRequester,
+                labels = labels,
             )
             Spacer(modifier = Modifier.height(8.dp))
             Row {
@@ -375,6 +378,7 @@ private fun OptionFields(
     dilemma: Dilemma,
     onIntent: (Intent) -> Unit,
     focusRequester: FocusRequester,
+    labels: Flow<Label>,
 ) {
     val addedFocusRequester = remember { FocusRequester() }
     dilemma.LaunchWhenFocusableOptionAdded {
@@ -387,6 +391,7 @@ private fun OptionFields(
             onIntent = onIntent,
             addedFocusRequester = addedFocusRequester,
             dilemma = dilemma,
+            labels = labels,
         )
     }
 }
@@ -426,6 +431,7 @@ private fun Field(
     onIntent: (Intent) -> Unit,
     addedFocusRequester: FocusRequester,
     dilemma: Dilemma,
+    labels: Flow<Label>,
 ) {
     when (field) {
         is Dilemma.TextField -> TextField(
@@ -439,6 +445,7 @@ private fun Field(
             field = field,
             onIntent = onIntent,
             dilemma = dilemma,
+            labels = labels,
         )
     }
 }
@@ -476,18 +483,16 @@ private fun ImageField(
     field: Dilemma.ImageField,
     dilemma: Dilemma,
     onIntent: (Intent) -> Unit,
+    labels: Flow<Label>,
 ) {
-    val context = LocalContext.current
-    val file = rememberSaveable { createFile(context) }
-    Log.d("pchm", "Create " + file.absolutePath.toString())
-    val launchCamera = createLaunchCamera(onResult = {
-        onIntent(EnterOptionsIntent.ChangeOption(Option.Image(file), field.id))
-    })
+    val launcher = rememberTakePictureLauncher(onIntent, field)
+    labels.Observe { label ->
+        if (label is TakePicture) {
+            launcher.launch(label.uri)
+        }
+    }
     Card(
-        modifier = Modifier.clickable(onClick = {
-            val file1 = createFile(context)
-            launchCamera(file1)
-        })
+        modifier = Modifier.clickable(onClick = { onIntent(EnterOptionsIntent.ClickOption(option = field.id)) })
     ) {
         RemoveOptionButton(
             onClick = { onIntent(EnterOptionsIntent.Remove(field.id)) },
@@ -522,6 +527,16 @@ private fun ImageField(
     }
 }
 
+@Composable
+private fun rememberTakePictureLauncher(
+    onIntent: (Intent) -> Unit,
+    field: Dilemma.ImageField
+) = rememberLauncherForActivityResult(
+    ActivityResultContracts.TakePicture(),
+    onResult = { success ->
+        onIntent(EnterOptionsIntent.OnCameraResult(option = field.id, success = success))
+    })
+
 private fun Modifier.chooseRequester(
     field: Dilemma.TextField,
     first: FocusRequester,

From 84d06fa691b0584bac8c2209ce6e60e58acdd580 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 15:04:12 +0200
Subject: [PATCH 12/28] Crash on empty intent

---
 .../kotlin/net/chmielowski/randomchoice/core/StateStore.kt    | 4 ++++
 .../chmielowski/randomchoice/ui/screen/input/InputScreen.kt   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index 3318073e..87a0064d 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -11,6 +11,8 @@ import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.Add
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.AddNew
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.ChangeOption
+import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.ClickOption
+import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.OnCameraResult
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.Remove
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.ResetAll
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.SelectMode
@@ -126,6 +128,8 @@ internal class MainExecutor(
                     }
                 }
                 is SelectMode -> dispatchState { copy(dilemma = dilemma.selectMode(intent.mode)) }
+                is ClickOption -> TODO()
+                is OnCameraResult -> TODO()
             }
             MakeChoice -> {
                 val result = getState().dilemma.choose(choice)
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 0ae1a23e..1500f57a 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -485,12 +485,14 @@ private fun ImageField(
     onIntent: (Intent) -> Unit,
     labels: Flow<Label>,
 ) {
+    // TODO@ Extract as function
     val launcher = rememberTakePictureLauncher(onIntent, field)
     labels.Observe { label ->
         if (label is TakePicture) {
             launcher.launch(label.uri)
         }
     }
+
     Card(
         modifier = Modifier.clickable(onClick = { onIntent(EnterOptionsIntent.ClickOption(option = field.id)) })
     ) {
@@ -527,6 +529,7 @@ private fun ImageField(
     }
 }
 
+// TODO@ Move to Camera
 @Composable
 private fun rememberTakePictureLauncher(
     onIntent: (Intent) -> Unit,

From 91c0b43a21c242576106980e18eb828e8633aaec Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:13:19 +0200
Subject: [PATCH 13/28] WiP

---
 .../net/chmielowski/randomchoice/DiModule.kt  |  7 +++-
 .../randomchoice/core/StateStore.kt           | 34 +++++++++++++++++--
 .../chmielowski/randomchoice/utils/Camera.kt  |  2 +-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
index dbd0bfe0..b1ff42e5 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
@@ -1,6 +1,7 @@
 package net.chmielowski.randomchoice
 
 import net.chmielowski.randomchoice.core.Choice
+import net.chmielowski.randomchoice.core.CreateFile
 import net.chmielowski.randomchoice.core.MainExecutor
 import net.chmielowski.randomchoice.core.RandomChoice
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemma
@@ -31,5 +32,9 @@ internal val diModule = module {
     factory<ObserveSavedDilemmas> { ObserveSavedDilemmasImpl(get()) }
     factory<DeleteSavedDilemma> { DeleteSavedDilemmaImpl(get(), get()) }
     factory<UndeleteSavedDilemma> { UndeleteSavedDilemmaImpl(get(), get()) }
-    factory { MainExecutor.Factory { MainExecutor(get(), get(), get(), get(), get()) } }
+
+    // File system
+    factory { CreateFile(get()) }
+
+    factory { MainExecutor.Factory { MainExecutor(get(), get(), get(), get(), get(), get()) } }
 }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index 87a0064d..c598076d 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -1,6 +1,8 @@
 package net.chmielowski.randomchoice.core
 
+import android.content.Context
 import android.net.Uri
+import android.os.Environment
 import android.os.Parcelable
 import com.arkivanov.mvikotlin.extensions.coroutines.CoroutineExecutor
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
@@ -23,6 +25,8 @@ import net.chmielowski.randomchoice.persistence.SaveDilemma
 import net.chmielowski.randomchoice.persistence.UndeleteSavedDilemma
 import net.chmielowski.randomchoice.ui.theme.Theme
 import net.chmielowski.randomchoice.ui.theme.ThemePreference
+import net.chmielowski.randomchoice.utils.uri
+import java.io.File
 
 internal fun createStateStore(
     factory: MainExecutor.Factory,
@@ -100,12 +104,24 @@ internal sealed interface Label {
     data class TakePicture(val uri: Uri) : Label
 }
 
+// TODO@ Move
+internal class CreateFile(private val context: Context) {
+
+    operator fun invoke(): Pair<File, Uri> {
+        val directory =
+            context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
+        val file = File.createTempFile("Random Choice", ".jpg", directory)
+        return file to file.uri(context)
+    }
+}
+
 internal class MainExecutor(
     private val choice: Choice,
     private val preference: ThemePreference,
     private val saveDilemma: SaveDilemma,
     private val deleteDilemma: DeleteSavedDilemma,
     private val undeleteDilemma: UndeleteSavedDilemma,
+    private val createFile: CreateFile,
 ) : CoroutineExecutor<Intent, Nothing, State, State, Label>() {
 
     @Suppress("ComplexMethod")
@@ -128,8 +144,22 @@ internal class MainExecutor(
                     }
                 }
                 is SelectMode -> dispatchState { copy(dilemma = dilemma.selectMode(intent.mode)) }
-                is ClickOption -> TODO()
-                is OnCameraResult -> TODO()
+                is ClickOption -> {
+                    val (file, uri) = createFile()
+                    dispatchState {
+                        copy(dilemma = dilemma.update(intent.option, Option.Image(file)))
+                    }
+                    publish(Label.TakePicture(uri))
+                }
+                is OnCameraResult -> {
+                    if (intent.success) {
+
+                    } else {
+                        // TODO@ Show error
+                        // TODO@ Delete file
+                        // TODO@ Clearnup state
+                    }
+                }
             }
             MakeChoice -> {
                 val result = getState().dilemma.choose(choice)
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index 12550acf..97207c75 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -38,5 +38,5 @@ internal fun createFile(context: Context): File {
     return File.createTempFile("Random Choice", ".jpg", directory)
 }
 
-private fun File.uri(context: Context) =
+fun File.uri(context: Context) =
     FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", this)

From 5100c17cf1d0e4847ca7424cb3fbfb842428c8c5 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:23:00 +0200
Subject: [PATCH 14/28] Error debuging

---
 .../chmielowski/randomchoice/core/StateStore.kt |  4 ++--
 .../randomchoice/ui/screen/input/InputScreen.kt | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index c598076d..ef658a66 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -101,7 +101,7 @@ internal sealed interface Label {
 
     object ShowDilemmaDeleted : Label
 
-    data class TakePicture(val uri: Uri) : Label
+    data class TakePicture(val uri: Uri, val option: OptionId) : Label
 }
 
 // TODO@ Move
@@ -149,7 +149,7 @@ internal class MainExecutor(
                     dispatchState {
                         copy(dilemma = dilemma.update(intent.option, Option.Image(file)))
                     }
-                    publish(Label.TakePicture(uri))
+                    publish(Label.TakePicture(uri, intent.option))
                 }
                 is OnCameraResult -> {
                     if (intent.success) {
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 1500f57a..819d0d36 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -64,12 +64,12 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImagePainter
 import coil.compose.rememberAsyncImagePainter
 import com.arkivanov.mvikotlin.core.store.Store
 import com.arkivanov.mvikotlin.extensions.coroutines.labels
@@ -488,7 +488,7 @@ private fun ImageField(
     // TODO@ Extract as function
     val launcher = rememberTakePictureLauncher(onIntent, field)
     labels.Observe { label ->
-        if (label is TakePicture) {
+        if (label is TakePicture && label.option == field.id) {
             launcher.launch(label.uri)
         }
     }
@@ -503,12 +503,17 @@ private fun ImageField(
             canRemove = dilemma.canRemove,
         )
         val readFile = field.value.file
-        Log.d("pchm", "Read " + readFile?.absolutePath.toString())
         if (readFile != null) {
+            val painter = rememberAsyncImagePainter(readFile)
+            val state = painter.state
+            LaunchedEffect(state) {
+                if (state is AsyncImagePainter.State.Error) {
+
+                    Log.d("pchm", "${state.result.throwable}\n${readFile.absolutePath}")
+                }
+            }
             Image(
-                painter = rememberAsyncImagePainter(
-                    readFile, contentScale = ContentScale.FillBounds
-                ),
+                painter = painter,
                 contentDescription = null,
 //                contentScale = ContentScale.FillWidth,
                 modifier = Modifier

From 548d91018e8dabf542c38706d8518b8aa8b80513 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:29:23 +0200
Subject: [PATCH 15/28] Works!

---
 .../chmielowski/randomchoice/core/OptionId.kt |  6 +++++-
 .../randomchoice/core/StateStore.kt           | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/OptionId.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/OptionId.kt
index 5a520b09..a7ffd778 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/OptionId.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/OptionId.kt
@@ -1,4 +1,8 @@
 package net.chmielowski.randomchoice.core
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
 @JvmInline
-value class OptionId(val value: Int)
+@Parcelize
+value class OptionId(val value: Int) : Parcelable
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index ef658a66..0cbc6db4 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -79,6 +79,7 @@ internal data class State(
     val dilemma: Dilemma = Dilemma(),
     private val lastSaved: Dilemma? = null,
     val lastDeleted: DilemmaId? = null,
+    val pendingPhotoRequest: PhotoRequest? = null,
 ) : Parcelable {
 
     val showResetButton get() = dilemma.canResetOrSave
@@ -91,6 +92,12 @@ internal data class State(
     val showSavedMessage get() = dilemma == lastSaved
 
     val mode get() = dilemma.mode
+
+    @Parcelize
+    data class PhotoRequest(
+        val option: OptionId,
+        val file: File,
+    ) : Parcelable
 }
 
 internal sealed interface Label {
@@ -147,17 +154,25 @@ internal class MainExecutor(
                 is ClickOption -> {
                     val (file, uri) = createFile()
                     dispatchState {
-                        copy(dilemma = dilemma.update(intent.option, Option.Image(file)))
+                        copy(pendingPhotoRequest = State.PhotoRequest(intent.option, file))
                     }
                     publish(Label.TakePicture(uri, intent.option))
                 }
                 is OnCameraResult -> {
                     if (intent.success) {
-
+                        dispatchState {
+                            val request = pendingPhotoRequest!!
+                            copy(
+                                dilemma = dilemma.update(request.option, Option.Image(request.file)),
+                                pendingPhotoRequest = null
+                            )
+                        }
                     } else {
+                        dispatchState {
+                            copy(pendingPhotoRequest = null)
+                        }
                         // TODO@ Show error
                         // TODO@ Delete file
-                        // TODO@ Clearnup state
                     }
                 }
             }

From b8801fdb14a5a32743ec2f18b235aaaed24b4656 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:31:59 +0200
Subject: [PATCH 16/28] Delete file

---
 .../net/chmielowski/randomchoice/DiModule.kt  |  2 +-
 .../randomchoice/core/StateStore.kt           | 24 +++++++------------
 .../randomchoice/file/CreateFile.kt           | 17 +++++++++++++
 .../randomchoice/file/DeleteFile.kt           | 10 ++++++++
 4 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
 create mode 100644 app/src/main/kotlin/net/chmielowski/randomchoice/file/DeleteFile.kt

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
index b1ff42e5..b3526bd2 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
@@ -1,7 +1,7 @@
 package net.chmielowski.randomchoice
 
 import net.chmielowski.randomchoice.core.Choice
-import net.chmielowski.randomchoice.core.CreateFile
+import net.chmielowski.randomchoice.file.CreateFile
 import net.chmielowski.randomchoice.core.MainExecutor
 import net.chmielowski.randomchoice.core.RandomChoice
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemma
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index 0cbc6db4..80c99297 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -1,8 +1,6 @@
 package net.chmielowski.randomchoice.core
 
-import android.content.Context
 import android.net.Uri
-import android.os.Environment
 import android.os.Parcelable
 import com.arkivanov.mvikotlin.extensions.coroutines.CoroutineExecutor
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
@@ -20,12 +18,13 @@ import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.ResetAll
 import net.chmielowski.randomchoice.core.Intent.EnterOptionsIntent.SelectMode
 import net.chmielowski.randomchoice.core.Intent.MakeChoice
 import net.chmielowski.randomchoice.core.Intent.SetTheme
+import net.chmielowski.randomchoice.file.CreateFile
+import net.chmielowski.randomchoice.file.DeleteFile
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemma
 import net.chmielowski.randomchoice.persistence.SaveDilemma
 import net.chmielowski.randomchoice.persistence.UndeleteSavedDilemma
 import net.chmielowski.randomchoice.ui.theme.Theme
 import net.chmielowski.randomchoice.ui.theme.ThemePreference
-import net.chmielowski.randomchoice.utils.uri
 import java.io.File
 
 internal fun createStateStore(
@@ -111,17 +110,6 @@ internal sealed interface Label {
     data class TakePicture(val uri: Uri, val option: OptionId) : Label
 }
 
-// TODO@ Move
-internal class CreateFile(private val context: Context) {
-
-    operator fun invoke(): Pair<File, Uri> {
-        val directory =
-            context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
-        val file = File.createTempFile("Random Choice", ".jpg", directory)
-        return file to file.uri(context)
-    }
-}
-
 internal class MainExecutor(
     private val choice: Choice,
     private val preference: ThemePreference,
@@ -129,6 +117,7 @@ internal class MainExecutor(
     private val deleteDilemma: DeleteSavedDilemma,
     private val undeleteDilemma: UndeleteSavedDilemma,
     private val createFile: CreateFile,
+    private val deleteFile: DeleteFile,
 ) : CoroutineExecutor<Intent, Nothing, State, State, Label>() {
 
     @Suppress("ComplexMethod")
@@ -163,16 +152,19 @@ internal class MainExecutor(
                         dispatchState {
                             val request = pendingPhotoRequest!!
                             copy(
-                                dilemma = dilemma.update(request.option, Option.Image(request.file)),
+                                dilemma = dilemma.update(
+                                    request.option,
+                                    Option.Image(request.file)
+                                ),
                                 pendingPhotoRequest = null
                             )
                         }
                     } else {
+                        deleteFile(getState().pendingPhotoRequest!!.file)
                         dispatchState {
                             copy(pendingPhotoRequest = null)
                         }
                         // TODO@ Show error
-                        // TODO@ Delete file
                     }
                 }
             }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
new file mode 100644
index 00000000..51c59c72
--- /dev/null
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
@@ -0,0 +1,17 @@
+package net.chmielowski.randomchoice.file
+
+import android.content.Context
+import android.net.Uri
+import android.os.Environment
+import net.chmielowski.randomchoice.utils.uri
+import java.io.File
+
+internal class CreateFile(private val context: Context) {
+
+    operator fun invoke(): Pair<File, Uri> {
+        val directory =
+            context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
+        val file = File.createTempFile("Random Choice", ".jpg", directory)
+        return file to file.uri(context)
+    }
+}
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/file/DeleteFile.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/file/DeleteFile.kt
new file mode 100644
index 00000000..738d1898
--- /dev/null
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/file/DeleteFile.kt
@@ -0,0 +1,10 @@
+package net.chmielowski.randomchoice.file
+
+import java.io.File
+
+internal class DeleteFile {
+
+    operator fun invoke(file: File) {
+        file.delete()
+    }
+}
\ No newline at end of file

From 33512c49c5ef775a0de5f91ac899c67b629f1e65 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:32:26 +0200
Subject: [PATCH 17/28] Delete file

---
 app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
index b3526bd2..4372b93b 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
@@ -4,6 +4,7 @@ import net.chmielowski.randomchoice.core.Choice
 import net.chmielowski.randomchoice.file.CreateFile
 import net.chmielowski.randomchoice.core.MainExecutor
 import net.chmielowski.randomchoice.core.RandomChoice
+import net.chmielowski.randomchoice.file.DeleteFile
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemma
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemmaImpl
 import net.chmielowski.randomchoice.persistence.NonCancellableTask
@@ -35,6 +36,7 @@ internal val diModule = module {
 
     // File system
     factory { CreateFile(get()) }
+    factory { DeleteFile() }
 
-    factory { MainExecutor.Factory { MainExecutor(get(), get(), get(), get(), get(), get()) } }
+    factory { MainExecutor.Factory { MainExecutor(get(), get(), get(), get(), get(), get(), get()) } }
 }

From ce4c51c409b3cd26e2ee74f5b28335f5a9fd701b Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:03:44 +0200
Subject: [PATCH 18/28] Scaling

---
 .../ui/screen/input/InputScreen.kt            | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 819d0d36..9938441a 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -2,18 +2,17 @@
 
 package net.chmielowski.randomchoice.ui.screen.input
 
-import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -60,10 +59,10 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -504,21 +503,19 @@ private fun ImageField(
         )
         val readFile = field.value.file
         if (readFile != null) {
-            val painter = rememberAsyncImagePainter(readFile)
+            val painter =
+                rememberAsyncImagePainter(readFile, contentScale = ContentScale.FillWidth)
             val state = painter.state
-            LaunchedEffect(state) {
-                if (state is AsyncImagePainter.State.Error) {
-
-                    Log.d("pchm", "${state.result.throwable}\n${readFile.absolutePath}")
-                }
+            if (state is AsyncImagePainter.State.Error) {
+                // TODO@
             }
             Image(
                 painter = painter,
                 contentDescription = null,
-//                contentScale = ContentScale.FillWidth,
+                contentScale = ContentScale.FillWidth,
                 modifier = Modifier
-                    .size(50.dp)
-                    .border(2.dp, Color.Red),
+                    .defaultMinSize(minHeight = 80.dp)
+                    .fillMaxWidth()
             )
         } else {
             Image(

From 08a2c16c8d1f599fb012195b9910568908da83ab Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:06:02 +0200
Subject: [PATCH 19/28] Cleanup

---
 .../chmielowski/randomchoice/core/StateStore.kt    |  2 +-
 .../randomchoice/ui/screen/input/InputScreen.kt    | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index 80c99297..71fa642c 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -52,7 +52,7 @@ internal sealed interface Intent {
 
         data class SelectMode(val mode: Mode) : EnterOptionsIntent
 
-        data class OnCameraResult(val option: OptionId, val success: Boolean) : EnterOptionsIntent
+        data class OnCameraResult(val success: Boolean) : EnterOptionsIntent
 
         data class ClickOption(val option: OptionId) : EnterOptionsIntent
     }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 9938441a..c38e412a 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -485,7 +485,7 @@ private fun ImageField(
     labels: Flow<Label>,
 ) {
     // TODO@ Extract as function
-    val launcher = rememberTakePictureLauncher(onIntent, field)
+    val launcher = rememberTakePictureLauncher(onIntent)
     labels.Observe { label ->
         if (label is TakePicture && label.option == field.id) {
             launcher.launch(label.uri)
@@ -533,14 +533,10 @@ private fun ImageField(
 
 // TODO@ Move to Camera
 @Composable
-private fun rememberTakePictureLauncher(
-    onIntent: (Intent) -> Unit,
-    field: Dilemma.ImageField
-) = rememberLauncherForActivityResult(
-    ActivityResultContracts.TakePicture(),
-    onResult = { success ->
-        onIntent(EnterOptionsIntent.OnCameraResult(option = field.id, success = success))
-    })
+private fun rememberTakePictureLauncher(onIntent: (Intent) -> Unit) =
+    rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        onIntent(EnterOptionsIntent.OnCameraResult(success = success))
+    }
 
 private fun Modifier.chooseRequester(
     field: Dilemma.TextField,

From bf1125934d263de3b1d803aedb645a64a32ab7c4 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:07:43 +0200
Subject: [PATCH 20/28] Move launcher higher

---
 .../randomchoice/ui/screen/input/InputScreen.kt  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index c38e412a..191b60b9 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -113,11 +113,13 @@ internal fun InputScreen(
 ) {
     val state by store.states.collectAsState(State())
     val focusRequester = remember { FocusRequester() }
+    val launcher = rememberTakePictureLauncher(store::accept)
     store.labels.Observe { label ->
         when (label) {
             is ShowResult -> navigator.navigate(ResultScreenDestination(label.result))
             FocusFirstOptionInput -> focusRequester.requestFocus()
-            ShowDilemmaDeleted, is TakePicture -> {} // TODO@ Consider taking picture there
+            is TakePicture -> launcher.launch(label.uri)
+            ShowDilemmaDeleted -> {}
         }
     }
     InputScreen(
@@ -442,9 +444,8 @@ private fun Field(
         )
         is Dilemma.ImageField -> ImageField(
             field = field,
-            onIntent = onIntent,
             dilemma = dilemma,
-            labels = labels,
+            onIntent = onIntent,
         )
     }
 }
@@ -482,16 +483,7 @@ private fun ImageField(
     field: Dilemma.ImageField,
     dilemma: Dilemma,
     onIntent: (Intent) -> Unit,
-    labels: Flow<Label>,
 ) {
-    // TODO@ Extract as function
-    val launcher = rememberTakePictureLauncher(onIntent)
-    labels.Observe { label ->
-        if (label is TakePicture && label.option == field.id) {
-            launcher.launch(label.uri)
-        }
-    }
-
     Card(
         modifier = Modifier.clickable(onClick = { onIntent(EnterOptionsIntent.ClickOption(option = field.id)) })
     ) {

From 2b5e8e156646e25ec699c6a7d4065deeb1cd03d7 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:10:58 +0200
Subject: [PATCH 21/28] Cleanup

---
 .../chmielowski/randomchoice/MainActivity.kt  | 29 --------------
 .../randomchoice/file/CreateFile.kt           | 20 +++++++---
 .../ui/screen/input/InputScreen.kt            | 12 +-----
 .../chmielowski/randomchoice/utils/Camera.kt  | 38 ++-----------------
 4 files changed, 21 insertions(+), 78 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt
index 61ba886f..e7e6cd47 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/MainActivity.kt
@@ -3,17 +3,8 @@ package net.chmielowski.randomchoice
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Text
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.core.os.bundleOf
 import androidx.core.view.WindowCompat
-import coil.compose.AsyncImagePainter
-import coil.compose.rememberAsyncImagePainter
 import com.arkivanov.mvikotlin.core.store.Store
 import net.chmielowski.randomchoice.core.Intent
 import net.chmielowski.randomchoice.core.Label
@@ -23,7 +14,6 @@ import net.chmielowski.randomchoice.ui.Content
 import net.chmielowski.randomchoice.ui.screen.input.DropdownMenuStrategy
 import net.chmielowski.randomchoice.utils.getParcelableCompat
 import org.koin.android.ext.android.get
-import java.io.File
 
 class MainActivity : ComponentActivity() {
 
@@ -42,25 +32,6 @@ class MainActivity : ComponentActivity() {
                 store = stateStore,
                 menuStrategy = DropdownMenuStrategy.Real(),
             )
-
-//            val file = File(
-//                "/storage/emulated/0/Android/data/net.chmielowski.randomchoice/files/Pictures/Random Choice7504732900224082083.jpg"
-//            )
-//            val painter = rememberAsyncImagePainter(file)
-//            Column {
-//                val state = painter.state
-//                if (state is AsyncImagePainter.State.Error) {
-//                    val txt = state.result.throwable.toString()
-//                    Text(txt)
-//                }
-//                Image(
-//                    painter,
-//                    contentDescription = null,
-//                    modifier = Modifier
-//                        .background(Color.Red)
-//                        .fillMaxSize(0.8F),
-//                )
-//            }
         }
     }
 
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
index 51c59c72..fa7b69ef 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
@@ -3,15 +3,25 @@ package net.chmielowski.randomchoice.file
 import android.content.Context
 import android.net.Uri
 import android.os.Environment
-import net.chmielowski.randomchoice.utils.uri
+import androidx.core.content.FileProvider
+import net.chmielowski.randomchoice.BuildConfig
 import java.io.File
 
 internal class CreateFile(private val context: Context) {
 
     operator fun invoke(): Pair<File, Uri> {
-        val directory =
-            context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
-        val file = File.createTempFile("Random Choice", ".jpg", directory)
-        return file to file.uri(context)
+        val file = createTempFile()
+        val uri = getUri(file)
+        return file to uri
     }
+
+    private fun createTempFile(): File {
+        val directory = context
+            .getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
+        return File.createTempFile("Random Choice", ".jpg", directory)
+    }
+
+    private fun getUri(file: File) =
+        FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
+
 }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 191b60b9..3bb13401 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -2,8 +2,6 @@
 
 package net.chmielowski.randomchoice.ui.screen.input
 
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -102,6 +100,7 @@ import net.chmielowski.randomchoice.ui.theme.Theme
 import net.chmielowski.randomchoice.ui.widgets.Scaffold
 import net.chmielowski.randomchoice.ui.widgets.rememberScrollBehavior
 import net.chmielowski.randomchoice.utils.Observe
+import net.chmielowski.randomchoice.utils.rememberTakePictureLauncher
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @Destination(start = true)
@@ -118,7 +117,7 @@ internal fun InputScreen(
         when (label) {
             is ShowResult -> navigator.navigate(ResultScreenDestination(label.result))
             FocusFirstOptionInput -> focusRequester.requestFocus()
-            is TakePicture -> launcher.launch(label.uri)
+            is TakePicture -> launcher.launch(label.uri) // _: ActivityNotFoundException TODO@
             ShowDilemmaDeleted -> {}
         }
     }
@@ -523,13 +522,6 @@ private fun ImageField(
     }
 }
 
-// TODO@ Move to Camera
-@Composable
-private fun rememberTakePictureLauncher(onIntent: (Intent) -> Unit) =
-    rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-        onIntent(EnterOptionsIntent.OnCameraResult(success = success))
-    }
-
 private fun Modifier.chooseRequester(
     field: Dilemma.TextField,
     first: FocusRequester,
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
index 97207c75..649f424d 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/utils/Camera.kt
@@ -1,42 +1,12 @@
 package net.chmielowski.randomchoice.utils
 
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.os.Environment
-import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.core.content.FileProvider
-import net.chmielowski.randomchoice.BuildConfig
-import net.chmielowski.randomchoice.R
-import java.io.File
+import net.chmielowski.randomchoice.core.Intent
 
 @Composable
-internal fun createLaunchCamera(onResult: (Boolean) -> Unit): (File) -> Unit {
-    val context = LocalContext.current
-    val launcher =
-        rememberLauncherForActivityResult(ActivityResultContracts.TakePicture(), onResult)
-    return { file: File ->
-        try {
-            launcher.launch(file.uri(context))
-        } catch (_: ActivityNotFoundException) {
-            context.showError()
-        }
+internal fun rememberTakePictureLauncher(onIntent: (Intent) -> Unit) =
+    rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        onIntent(Intent.EnterOptionsIntent.OnCameraResult(success = success))
     }
-}
-
-private fun Context.showError() {
-    Toast
-        .makeText(this, R.string.error, Toast.LENGTH_LONG)
-        .show()
-}
-
-internal fun createFile(context: Context): File {
-    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES) ?: error("TODO@")
-    return File.createTempFile("Random Choice", ".jpg", directory)
-}
-
-fun File.uri(context: Context) =
-    FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", this)

From abf012fa85e57e2f8ea58a42917ab4e2063ce4b5 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:11:33 +0200
Subject: [PATCH 22/28] Warnings

---
 .../main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
index fa7b69ef..5f1977cd 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
@@ -23,5 +23,4 @@ internal class CreateFile(private val context: Context) {
 
     private fun getUri(file: File) =
         FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
-
 }

From f8b34c479a87a4e2a659313d63dc555d64d7a9e5 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:12:34 +0200
Subject: [PATCH 23/28] Build fix

---
 .../net/chmielowski/randomchoice/ui/screen/Previews.kt    | 3 ---
 .../randomchoice/ui/screen/input/InputScreen.kt           | 8 +-------
 .../randomchoice/ui/screen/saved/SavedScreen.kt           | 3 ++-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt
index 050c2e95..cf8d0b44 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/Previews.kt
@@ -6,7 +6,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.tooling.preview.Preview
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flow
 import net.chmielowski.randomchoice.core.Dilemma
 import net.chmielowski.randomchoice.core.DilemmaId
@@ -32,7 +31,6 @@ internal fun InputScreenTextPreview() {
         onIntent = {},
         focusRequester = FocusRequester(),
         menuStrategy = DropdownMenuStrategy.Real(),
-        labels = emptyFlow(),
     )
 }
 
@@ -45,7 +43,6 @@ internal fun InputScreenImagePreview() {
         onIntent = {},
         focusRequester = FocusRequester(),
         menuStrategy = DropdownMenuStrategy.Real(),
-        labels = emptyFlow(),
     )
 }
 
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
index 3bb13401..82e0fb61 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/input/InputScreen.kt
@@ -74,7 +74,6 @@ import com.arkivanov.mvikotlin.extensions.coroutines.states
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
 import net.chmielowski.randomchoice.R
 import net.chmielowski.randomchoice.core.Dilemma
 import net.chmielowski.randomchoice.core.Dilemma.OptionField
@@ -127,7 +126,6 @@ internal fun InputScreen(
         onIntent = store::accept,
         focusRequester = focusRequester,
         menuStrategy = menuStrategy,
-        labels = store.labels,
     )
 }
 
@@ -140,7 +138,6 @@ internal fun InputScreen(
     onIntent: (Intent) -> Unit,
     focusRequester: FocusRequester,
     menuStrategy: DropdownMenuStrategy,
-    labels: Flow<Label>,
 ) {
     var transitionVisible by remember { mutableStateOf(false) }
     val scrollBehavior = rememberScrollBehavior()
@@ -202,7 +199,6 @@ internal fun InputScreen(
                 dilemma = state.dilemma,
                 onIntent = onIntent,
                 focusRequester = focusRequester,
-                labels = labels,
             )
             Spacer(modifier = Modifier.height(8.dp))
             Row {
@@ -378,7 +374,6 @@ private fun OptionFields(
     dilemma: Dilemma,
     onIntent: (Intent) -> Unit,
     focusRequester: FocusRequester,
-    labels: Flow<Label>,
 ) {
     val addedFocusRequester = remember { FocusRequester() }
     dilemma.LaunchWhenFocusableOptionAdded {
@@ -391,7 +386,6 @@ private fun OptionFields(
             onIntent = onIntent,
             addedFocusRequester = addedFocusRequester,
             dilemma = dilemma,
-            labels = labels,
         )
     }
 }
@@ -431,7 +425,6 @@ private fun Field(
     onIntent: (Intent) -> Unit,
     addedFocusRequester: FocusRequester,
     dilemma: Dilemma,
-    labels: Flow<Label>,
 ) {
     when (field) {
         is Dilemma.TextField -> TextField(
@@ -497,6 +490,7 @@ private fun ImageField(
             val painter =
                 rememberAsyncImagePainter(readFile, contentScale = ContentScale.FillWidth)
             val state = painter.state
+            @Suppress("ControlFlowWithEmptyBody")
             if (state is AsyncImagePainter.State.Error) {
                 // TODO@
             }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/saved/SavedScreen.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/saved/SavedScreen.kt
index faf297aa..52da7920 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/saved/SavedScreen.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/ui/screen/saved/SavedScreen.kt
@@ -43,6 +43,7 @@ import net.chmielowski.randomchoice.core.Label
 import net.chmielowski.randomchoice.core.Label.FocusFirstOptionInput
 import net.chmielowski.randomchoice.core.Label.ShowDilemmaDeleted
 import net.chmielowski.randomchoice.core.Label.ShowResult
+import net.chmielowski.randomchoice.core.Label.TakePicture
 import net.chmielowski.randomchoice.persistence.ObserveSavedDilemmas
 import net.chmielowski.randomchoice.ui.widgets.Divider
 import net.chmielowski.randomchoice.ui.widgets.Scaffold
@@ -116,7 +117,7 @@ private fun undoDeletingSnackbarHostState(
                     SnackbarResult.ActionPerformed -> onIntent(DilemmaIntent.UndoDeleting)
                 }
             }
-            is ShowResult, FocusFirstOptionInput -> {
+            is ShowResult, FocusFirstOptionInput, is TakePicture -> {
             }
         }
     }

From bbc182976b56791b69e05956e60aadb3edce55b1 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <7473920+pchmielowski@users.noreply.github.com>
Date: Wed, 15 Jun 2022 17:15:47 +0200
Subject: [PATCH 24/28] Extract interface

---
 .../kotlin/net/chmielowski/randomchoice/DiModule.kt    |  4 ++--
 .../net/chmielowski/randomchoice/file/CreateFile.kt    |  9 +++++++--
 .../net/chmielowski/randomchoice/AbstractTest.kt       | 10 ++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
index 4372b93b..b86e3a1b 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
@@ -1,7 +1,7 @@
 package net.chmielowski.randomchoice
 
 import net.chmielowski.randomchoice.core.Choice
-import net.chmielowski.randomchoice.file.CreateFile
+import net.chmielowski.randomchoice.file.CreateFileImpl
 import net.chmielowski.randomchoice.core.MainExecutor
 import net.chmielowski.randomchoice.core.RandomChoice
 import net.chmielowski.randomchoice.file.DeleteFile
@@ -35,7 +35,7 @@ internal val diModule = module {
     factory<UndeleteSavedDilemma> { UndeleteSavedDilemmaImpl(get(), get()) }
 
     // File system
-    factory { CreateFile(get()) }
+    factory { CreateFileImpl(get()) }
     factory { DeleteFile() }
 
     factory { MainExecutor.Factory { MainExecutor(get(), get(), get(), get(), get(), get(), get()) } }
diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
index 5f1977cd..99bd7d03 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/file/CreateFile.kt
@@ -7,9 +7,14 @@ import androidx.core.content.FileProvider
 import net.chmielowski.randomchoice.BuildConfig
 import java.io.File
 
-internal class CreateFile(private val context: Context) {
+interface CreateFile {
 
-    operator fun invoke(): Pair<File, Uri> {
+    operator fun invoke(): Pair<File, Uri>
+}
+
+internal class CreateFileImpl(private val context: Context) : CreateFile {
+
+    override operator fun invoke(): Pair<File, Uri> {
         val file = createTempFile()
         val uri = getUri(file)
         return file to uri
diff --git a/app/src/sharedTest/kotlin/net/chmielowski/randomchoice/AbstractTest.kt b/app/src/sharedTest/kotlin/net/chmielowski/randomchoice/AbstractTest.kt
index 3ada677b..6a5a1afb 100644
--- a/app/src/sharedTest/kotlin/net/chmielowski/randomchoice/AbstractTest.kt
+++ b/app/src/sharedTest/kotlin/net/chmielowski/randomchoice/AbstractTest.kt
@@ -3,6 +3,7 @@
 package net.chmielowski.randomchoice
 
 import android.graphics.Bitmap
+import android.net.Uri
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.annotation.StringRes
@@ -23,6 +24,8 @@ import kotlinx.coroutines.Dispatchers
 import net.chmielowski.randomchoice.core.Choice
 import net.chmielowski.randomchoice.core.MainExecutor
 import net.chmielowski.randomchoice.core.createStateStore
+import net.chmielowski.randomchoice.file.CreateFile
+import net.chmielowski.randomchoice.file.DeleteFile
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemmaImpl
 import net.chmielowski.randomchoice.persistence.NonCancellableTask
 import net.chmielowski.randomchoice.persistence.ObserveSavedDilemmasImpl
@@ -34,6 +37,7 @@ import net.chmielowski.randomchoice.ui.theme.Theme
 import net.chmielowski.randomchoice.ui.theme.ThemePreference
 import org.junit.Before
 import org.junit.Rule
+import java.io.File
 import java.io.FileOutputStream
 
 internal abstract class AbstractTest {
@@ -69,6 +73,12 @@ internal abstract class AbstractTest {
                     saveDilemma = SaveDilemmaImpl(database, NonCancellableTask.fake),
                     deleteDilemma = DeleteSavedDilemmaImpl(database, NonCancellableTask.fake),
                     undeleteDilemma = UndeleteSavedDilemmaImpl(database, NonCancellableTask.fake),
+                    createFile = object : CreateFile {
+                        override fun invoke(): Pair<File, Uri> {
+                            TODO("Not yet implemented")
+                        }
+                    },
+                    deleteFile = DeleteFile(),
                 )
             }),
             menuStrategy = menuStrategy,

From 92af7d7a76e97ab06326590a600a1320f1619471 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <piotrek.chmielowski@interia.pl>
Date: Thu, 3 Nov 2022 18:14:54 +0100
Subject: [PATCH 25/28] Coil version bump

---
 app/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1f15447a..e700565f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,8 +132,7 @@ dependencies {
     implementation "io.insert-koin:koin-androidx-compose:$koin_version"
     testImplementation "io.insert-koin:koin-test:$koin_version"
 
-    implementation "io.coil-kt:coil:2.1.0"
-    implementation "io.coil-kt:coil-compose:2.1.0"
+    implementation "io.coil-kt:coil-compose:2.2.2"
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.9'

From 3ed1a8aaa508e0584aca6d097c5b5b381af5d3a5 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <piotrek.chmielowski@interia.pl>
Date: Thu, 3 Nov 2022 18:16:24 +0100
Subject: [PATCH 26/28] Cleanup

---
 .../kotlin/net/chmielowski/randomchoice/core/StateStore.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
index 71fa642c..16b323ad 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/core/StateStore.kt
@@ -107,7 +107,7 @@ internal sealed interface Label {
 
     object ShowDilemmaDeleted : Label
 
-    data class TakePicture(val uri: Uri, val option: OptionId) : Label
+    data class TakePicture(val option: OptionId, val uri: Uri) : Label
 }
 
 internal class MainExecutor(
@@ -145,7 +145,7 @@ internal class MainExecutor(
                     dispatchState {
                         copy(pendingPhotoRequest = State.PhotoRequest(intent.option, file))
                     }
-                    publish(Label.TakePicture(uri, intent.option))
+                    publish(Label.TakePicture(intent.option, uri))
                 }
                 is OnCameraResult -> {
                     if (intent.success) {

From e151ddd8a966ca3428ab56abb1c07032b4de8493 Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <piotrek.chmielowski@interia.pl>
Date: Thu, 3 Nov 2022 18:24:18 +0100
Subject: [PATCH 27/28] Crash fix

---
 app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
index b86e3a1b..0e035fa7 100644
--- a/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
+++ b/app/src/main/kotlin/net/chmielowski/randomchoice/DiModule.kt
@@ -4,6 +4,7 @@ import net.chmielowski.randomchoice.core.Choice
 import net.chmielowski.randomchoice.file.CreateFileImpl
 import net.chmielowski.randomchoice.core.MainExecutor
 import net.chmielowski.randomchoice.core.RandomChoice
+import net.chmielowski.randomchoice.file.CreateFile
 import net.chmielowski.randomchoice.file.DeleteFile
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemma
 import net.chmielowski.randomchoice.persistence.DeleteSavedDilemmaImpl
@@ -35,7 +36,7 @@ internal val diModule = module {
     factory<UndeleteSavedDilemma> { UndeleteSavedDilemmaImpl(get(), get()) }
 
     // File system
-    factory { CreateFileImpl(get()) }
+    factory<CreateFile> { CreateFileImpl(get()) }
     factory { DeleteFile() }
 
     factory { MainExecutor.Factory { MainExecutor(get(), get(), get(), get(), get(), get(), get()) } }

From 7f65a1ae62fbd2e2e6652eaa8058a2fce815136b Mon Sep 17 00:00:00 2001
From: Piotr Chmielowski <piotrek.chmielowski@interia.pl>
Date: Thu, 3 Nov 2022 18:28:47 +0100
Subject: [PATCH 28/28] Copy

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e854d18b..01b80d43 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="message_saved">Saved!</string>
     <string name="message_deleted">Dilemma deleted</string>
     <string name="message_empty">The list is empty</string>
-    <string name="message_photo_mode_experimental">Photo mode is currently experimental and for now doesn\'t support saving dilemmas with photos and the quality of photos is limited.\nThese limitations are going to be resolved soon.</string>
+    <string name="message_photo_mode_experimental">Photo mode is currently experimental and for now doesn\'t support saving dilemmas with photos.\nThis limitation is going to be resolved soon.</string>
 
     <string name="error_no_email_client">No e-mail client installed!</string>