From 800b9af57f7b5ea1b1d911ff45d0fa019c38590d Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:40:39 +0100
Subject: [PATCH 01/15] Revert "Fixed the failed TestCase"

This reverts commit d5ef9941
---
 .../developers/androidify/creation/CreationViewModelTest.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
index 4a98ddc5..bb4ee426 100644
--- a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
+++ b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
@@ -50,7 +50,6 @@ class CreationViewModelTest {
 
     private val internetConnectivityManager = TestInternetConnectivityManager(true)
     private val imageGenerationRepository = FakeImageGenerationRepository()
-    private val fakeUri = Uri.parse("content://test/image.jpg")
 
     @Before
     fun setup() {

From fb73daebc20182204145e2eed683a975b56536cf Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:42:01 +0100
Subject: [PATCH 02/15] Revert " ./gradlew spotlessApply"

This reverts commit 4647f0f7
---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../androidify/navigation/NavigationRoutes.kt |  8 ++---
 .../ondevice/LocalSegmentationDataSource.kt   |  8 ++---
 .../startup/FirebaseAppCheckInitializer.kt    | 16 ++-------
 .../vertexai/FirebaseAiDataSource.kt          | 12 +++----
 .../data/ImageGenerationRepository.kt         |  4 +--
 .../androidify/creation/CreationScreen.kt     | 13 ++++++-
 .../androidify/creation/CreationViewModel.kt  |  3 +-
 .../androidify/results/ResultsScreenTest.kt   |  2 ++
 .../customize/ComposableBitmapRendererImpl.kt | 35 ++++++++-----------
 .../customize/CustomizeExportScreen.kt        |  8 +++++
 .../customize/CustomizeExportViewModel.kt     | 14 ++++----
 .../androidify/results/BotResultCard.kt       |  1 +
 .../androidify/results/ResultsViewModel.kt    |  6 ++--
 .../customize/CustomizeStateTest.kt           |  2 +-
 .../customize/CustomizeViewModelTest.kt       |  2 ++
 .../results/ResultsViewModelTest.kt           |  8 +++--
 17 files changed, 78 insertions(+), 67 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 968b3708..7db43670 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
      Copyright 2025 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
index 8322c46f..50930b0c 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
@@ -29,7 +29,7 @@ data object Home : NavigationRoute
 @Serializable
 data class Create(
     @Serializable(with = UriSerializer::class) val fileName: Uri? = null,
-    val prompt: String? = null,
+    val prompt: String? = null
 ) : NavigationRoute
 
 @Serializable
@@ -49,7 +49,7 @@ object About : NavigationRoute
 data class Result(
     @Serializable(with = UriSerializer::class) val resultImageUri: Uri,
     @Serializable(with = UriSerializer::class) val originalImageUri: Uri? = null,
-    val prompt: String? = null,
+    val prompt: String? = null
 ) : NavigationRoute
 
 /**
@@ -61,5 +61,5 @@ data class Result(
 @Serializable
 data class CustomizeExport(
     @Serializable(with = UriSerializer::class) val resultImageUri: Uri,
-    @Serializable(with = UriSerializer::class) val originalImageUri: Uri?,
-) : NavigationRoute
+    @Serializable(with = UriSerializer::class) val originalImageUri: Uri?
+) : NavigationRoute
\ No newline at end of file
diff --git a/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt
index e9118cf4..d9e96128 100644
--- a/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt
+++ b/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt
@@ -37,7 +37,7 @@ interface LocalSegmentationDataSource {
 }
 
 class LocalSegmentationDataSourceImpl @Inject constructor(
-    private val moduleInstallClient: ModuleInstallClient,
+    private val moduleInstallClient: ModuleInstallClient
 ) : LocalSegmentationDataSource {
     private val segmenter by lazy {
         val options = SubjectSegmenterOptions.Builder()
@@ -60,7 +60,7 @@ class LocalSegmentationDataSourceImpl @Inject constructor(
         return areModulesAvailable
     }
     private class CustomInstallStatusListener(
-        val continuation: CancellableContinuation<Boolean>,
+        val continuation: CancellableContinuation<Boolean>
     ) : InstallStatusListener {
 
         override fun onInstallStatusUpdated(update: ModuleInstallStatusUpdate) {
@@ -70,7 +70,7 @@ class LocalSegmentationDataSourceImpl @Inject constructor(
                 continuation.resume(true)
             } else if (update.installState == STATE_FAILED || update.installState == STATE_CANCELED) {
                 continuation.resumeWithException(
-                    ImageSegmentationException("Module download failed or was canceled. State: ${update.installState}"),
+                    ImageSegmentationException("Module download failed or was canceled. State: ${update.installState}")
                 )
             } else {
                 Log.d("LocalSegmentationDataSource", "State update: ${update.installState}")
@@ -128,4 +128,4 @@ class LocalSegmentationDataSourceImpl @Inject constructor(
     }
 }
 
-class ImageSegmentationException(message: String? = null) : Exception(message)
+class ImageSegmentationException(message: String? = null): Exception(message)
\ No newline at end of file
diff --git a/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt b/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt
index ffa5d0c0..00b9b54c 100644
--- a/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt
+++ b/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt
@@ -19,11 +19,9 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
 import androidx.startup.Initializer
-import com.android.developers.androidify.network.BuildConfig
 import com.google.firebase.Firebase
 import com.google.firebase.appcheck.FirebaseAppCheck
 import com.google.firebase.appcheck.appCheck
-import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory
 import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory
 
 /**
@@ -33,17 +31,9 @@ import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderF
 class FirebaseAppCheckInitializer : Initializer<FirebaseAppCheck> {
     override fun create(context: Context): FirebaseAppCheck {
         return Firebase.appCheck.apply {
-            if (BuildConfig.DEBUG) {
-                Log.i("AndroidifyAppCheck", "Firebase debug")
-                installAppCheckProviderFactory(
-                    DebugAppCheckProviderFactory.getInstance(),
-                )
-            } else {
-                Log.i("AndroidifyAppCheck", "Play integrity")
-                installAppCheckProviderFactory(
-                    PlayIntegrityAppCheckProviderFactory.getInstance(),
-                )
-            }
+            installAppCheckProviderFactory(
+                PlayIntegrityAppCheckProviderFactory.getInstance(),
+            )
         }
     }
 
diff --git a/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
index fef0f431..20103ff6 100644
--- a/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
+++ b/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
@@ -85,12 +85,12 @@ class FirebaseAiDataSourceImpl @Inject constructor(
         return Firebase.ai(backend = GenerativeBackend.vertexAI()).imagenModel(
             remoteConfigDataSource.imageModelName(),
             safetySettings =
-            ImagenSafetySettings(
-                safetyFilterLevel = ImagenSafetyFilterLevel.BLOCK_LOW_AND_ABOVE,
-                // Uses `ALLOW_ADULT` filter since `ALLOW_ALL` requires a special approval
-                // See https://cloud.google.com/vertex-ai/generative-ai/docs/image/responsible-ai-imagen#person-face-gen
-                personFilterLevel = ImagenPersonFilterLevel.ALLOW_ADULT,
-            ),
+                ImagenSafetySettings(
+                    safetyFilterLevel = ImagenSafetyFilterLevel.BLOCK_LOW_AND_ABOVE,
+                    // Uses `ALLOW_ADULT` filter since `ALLOW_ALL` requires a special approval
+                    // See https://cloud.google.com/vertex-ai/generative-ai/docs/image/responsible-ai-imagen#person-face-gen
+                    personFilterLevel = ImagenPersonFilterLevel.ALLOW_ADULT,
+                ),
         )
     }
 
diff --git a/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt b/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
index 9e335077..7016ee46 100644
--- a/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
+++ b/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
@@ -38,7 +38,7 @@ interface ImageGenerationRepository {
     suspend fun saveImageToExternalStorage(imageBitmap: Bitmap): Uri
     suspend fun saveImageToExternalStorage(imageUri: Uri): Uri
 
-    suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String): Bitmap
+    suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String) : Bitmap
     suspend fun removeBackground(image: Bitmap): Bitmap
 }
 
@@ -134,7 +134,7 @@ internal class ImageGenerationRepositoryImpl @Inject constructor(
 
     override suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String): Bitmap {
         val backgroundBotInstructions = remoteConfigDataSource.getBotBackgroundInstructionPrompt() +
-            "\"" + backgroundPrompt + "\""
+               "\"" +  backgroundPrompt + "\""
         return firebaseAiDataSource.generateImageWithEdit(image, backgroundBotInstructions)
     }
 
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
index 8cdd2681..059cb578 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
@@ -92,6 +92,7 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.ripple
 import androidx.compose.material3.toShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -120,13 +121,23 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.net.toUri
 import androidx.graphics.shapes.RoundedPolygon
 import androidx.graphics.shapes.rectangle
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LifecycleResumeEffect
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import coil3.request.crossfade
+import com.android.developers.androidify.customize.CustomizeAndExportScreen
+import com.android.developers.androidify.customize.CustomizeExportViewModel
 import com.android.developers.androidify.data.DropBehaviourFactory
+import com.android.developers.androidify.results.ResultsScreen
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.theme.LimeGreen
 import com.android.developers.androidify.theme.LocalSharedTransitionScope
@@ -183,7 +194,7 @@ fun CreationScreen(
                     uiState.imageUri
                 } else {
                     null
-                },
+                }
             )
             creationViewModel.onResultDisplayed()
         }
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
index 632300f2..603e0ba9 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
@@ -43,6 +43,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @HiltViewModel(assistedFactory = CreationViewModel.Factory::class)
 class CreationViewModel @AssistedInject constructor(
@@ -163,7 +164,7 @@ class CreationViewModel @AssistedInject constructor(
                     _uiState.update {
                         it.copy(
                             resultBitmapUri = imageGenerationRepository.saveImage(bitmap),
-                            screenState = ScreenState.EDIT,
+                            screenState = ScreenState.EDIT
                         )
                     }
                 } catch (e: Exception) {
diff --git a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt b/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
index f478f44b..9f1f312a 100644
--- a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
+++ b/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
@@ -15,6 +15,7 @@
  */
 package com.android.developers.androidify.results
 
+import android.graphics.Bitmap
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.CompositionLocalProvider
@@ -174,6 +175,7 @@ class ResultsScreenTest {
         val frontCardDesc = composeTestRule.activity.getString(R.string.resultant_android_bot)
         val testUri = android.net.Uri.parse("placeholder://image")
 
+
         val initialState = ResultState(resultImageUri = testUri, originalImageUrl = testUri)
         val state = mutableStateOf(initialState)
 
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt
index 643c04fc..6522028a 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt
@@ -22,6 +22,7 @@ import android.content.Context.DISPLAY_SERVICE
 import android.graphics.Bitmap
 import android.graphics.SurfaceTexture
 import android.hardware.display.DisplayManager
+import android.hardware.display.VirtualDisplay
 import android.view.Display
 import android.view.Surface
 import android.view.ViewGroup
@@ -57,10 +58,7 @@ import javax.inject.Singleton
 
 interface ComposableBitmapRenderer {
 
-    suspend fun renderComposableToBitmap(
-        canvasSize: Size,
-        composableContent: @Composable () -> Unit,
-    ): Bitmap?
+    suspend fun renderComposableToBitmap(canvasSize: Size, composableContent: @Composable () -> Unit): Bitmap?
 }
 
 /**
@@ -76,22 +74,20 @@ interface ComposableBitmapRenderer {
  *              }
  */
 @Singleton
-class ComposableBitmapRendererImpl @Inject constructor(private val application: Application) :
-    ComposableBitmapRenderer {
+class ComposableBitmapRendererImpl @Inject constructor(private val application: Application) : ComposableBitmapRenderer {
 
     private suspend fun <T> useVirtualDisplay(callback: suspend (display: Display) -> T): T? {
         val texture = SurfaceTexture(false)
         val surface = Surface(texture)
-        val outerContext = application.resources.displayMetrics
-        val virtualDisplay =
-            application.getSystemService(DisplayManager::class.java).createVirtualDisplay(
-                "virtualDisplay",
-                outerContext.widthPixels,
-                outerContext.heightPixels,
-                outerContext.densityDpi,
-                surface,
-                DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY,
-            )
+        val virtualDisplay: VirtualDisplay? =
+                (application.getSystemService(DISPLAY_SERVICE) as DisplayManager).createVirtualDisplay(
+                    "virtualDisplay",
+                    1,
+                    1,
+                    72,
+                    surface,
+                    DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY,
+                )
 
         val result = callback(virtualDisplay!!.display)
         virtualDisplay.release()
@@ -100,10 +96,7 @@ class ComposableBitmapRendererImpl @Inject constructor(private val application:
         return result
     }
 
-    override suspend fun renderComposableToBitmap(
-        canvasSize: Size,
-        composableContent: @Composable () -> Unit,
-    ): Bitmap? {
+    override suspend fun renderComposableToBitmap(canvasSize: Size, composableContent: @Composable () -> Unit): Bitmap? {
         val bitmap = useVirtualDisplay { display ->
             val outputDensity = Density(1f)
 
@@ -180,7 +173,7 @@ class ComposableBitmapRendererImpl @Inject constructor(private val application:
             }
         }
 
-        val composeView = ComposeView(presentation.context).apply {
+        val composeView = ComposeView(context).apply {
             val intSize = with(density) { size.toSize().roundedToIntSize() }
             require(intSize.width > 0 && intSize.height > 0) { "pixel size must not have zero dimension" }
 
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
index c7d213bb..66f30298 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
@@ -18,6 +18,9 @@
 package com.android.developers.androidify.customize
 
 import android.Manifest
+import android.R.attr.visible
+import android.graphics.Bitmap
+import android.net.Uri
 import android.os.Build
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ExperimentalSharedTransitionApi
@@ -58,14 +61,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.dropShadow
+import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.shadow.Shadow
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.LookaheadScope
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
 import com.android.developers.androidify.results.PermissionRationaleDialog
@@ -86,6 +93,7 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.permissions.shouldShowRationale
 import com.android.developers.androidify.theme.R as ThemeR
+import android.content.ContentResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index ec75abfd..702692f7 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -49,10 +49,10 @@ class CustomizeExportViewModel @AssistedInject constructor(
 ) : AndroidViewModel(application) {
 
     @AssistedFactory
-    interface Factory {
+    interface Factory{
         fun create(
             @Assisted("resultImageUrl") resultImageUrl: Uri,
-            @Assisted("originalImageUrl")originalImageUrl: Uri?,
+            @Assisted("originalImageUrl")originalImageUrl: Uri?
         ): CustomizeExportViewModel
     }
 
@@ -103,6 +103,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
         loadInitialBitmap(resultImageUrl)
     }
 
+
     override fun onCleared() {
         super.onCleared()
     }
@@ -154,7 +155,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
                 snackbarHostState.value.showSnackbar("Background removal failed")
                 _state.update {
                     val aspectRatioToolState = (it.toolState[CustomizeTool.Size] as AspectRatioToolState)
-                        .copy(selectedToolOption = previousSizeOption)
+                        .copy(selectedToolOption =  previousSizeOption)
                     it.copy(
                         toolState = it.toolState + (CustomizeTool.Size to aspectRatioToolState),
                         showImageEditProgress = false,
@@ -195,7 +196,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
             is SizeOption -> {
                 val selectedSizeOption = toolState.selectedToolOption as SizeOption
                 val needsBackgroundRemoval = selectedSizeOption == SizeOption.Sticker &&
-                    state.value.exportImageCanvas.imageBitmapRemovedBackground == null
+                        state.value.exportImageCanvas.imageBitmapRemovedBackground == null
 
                 val imageBitmap = state.value.exportImageCanvas.imageBitmap
                 if (needsBackgroundRemoval && imageBitmap != null) {
@@ -247,8 +248,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
             _state.update { it.copy(showImageEditProgress = true) }
             try {
                 val bitmap = imageGenerationRepository.addBackgroundToBot(
-                    image,
-                    backgroundOption.prompt,
+                    image, backgroundOption.prompt,
                 )
                 _state.update {
                     it.copy(
@@ -303,7 +303,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
                 val bitmap = localFileProvider.loadBitmapFromUri(uri)
                 _state.update {
                     it.copy(
-                        exportImageCanvas = it.exportImageCanvas.copy(imageBitmap = bitmap),
+                        exportImageCanvas = it.exportImageCanvas.copy(imageBitmap = bitmap)
                     )
                 }
             } catch (e: Exception) {
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt b/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
index 3f4139be..fd772d8d 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
@@ -15,6 +15,7 @@
  */
 package com.android.developers.androidify.results
 
+import android.graphics.Bitmap
 import android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
index 5005ecc4..2b226d61 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
@@ -15,6 +15,7 @@
  */
 package com.android.developers.androidify.results
 
+import android.graphics.Bitmap
 import android.net.Uri
 import androidx.compose.material3.SnackbarHostState
 import androidx.lifecycle.ViewModel
@@ -26,12 +27,13 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import javax.inject.Inject
 
 @HiltViewModel(assistedFactory = ResultsViewModel.Factory::class)
 class ResultsViewModel @AssistedInject constructor(
     @Assisted("resultImageUrl") val resultImageUrl: Uri?,
     @Assisted("originalImageUrl") val originalImageUrl: Uri?,
-    @Assisted("promptText") val promptText: String?,
+    @Assisted("promptText") val promptText: String?
 ) : ViewModel() {
 
     @AssistedFactory
@@ -50,7 +52,7 @@ class ResultsViewModel @AssistedInject constructor(
     val snackbarHostState: StateFlow<SnackbarHostState>
         get() = _snackbarHostState
 
-    init {
+    init{
         _state.update {
             ResultState(resultImageUrl, originalImageUrl, promptText = promptText)
         }
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
index 8f4214ae..c6ea63e1 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
@@ -53,7 +53,7 @@ class CustomizeStateTest {
                 SizeOption.WallpaperTablet,
                 SizeOption.Banner,
                 SizeOption.SocialHeader,
-                SizeOption.Sticker,
+                SizeOption.Sticker
             ),
             state.options,
         )
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
index a77c6cad..97c2cc12 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
@@ -17,6 +17,7 @@
 
 package com.android.developers.androidify.customize
 
+import android.graphics.Bitmap
 import android.net.Uri
 import androidx.test.core.app.ApplicationProvider
 import com.android.developers.testing.data.TestFileProvider
@@ -115,6 +116,7 @@ class CustomizeViewModelTest {
             }
         }
 
+
         viewModel.downloadClicked()
         assertNotNull(values.last().externalOriginalSavedUri)
         assertEquals(
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
index 43bf653c..810a2edf 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
@@ -17,11 +17,13 @@
 
 package com.android.developers.androidify.results
 
+import android.graphics.Bitmap
 import android.net.Uri
 import com.android.developers.testing.util.MainDispatcherRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -39,7 +41,7 @@ class ResultsViewModelTest {
 
     @Test
     fun stateInitialEmpty() = runTest {
-        val viewModel = ResultsViewModel(null, null, null)
+        val viewModel = ResultsViewModel(null,null,null)
         assertEquals(
             ResultState(),
             viewModel.state.value,
@@ -48,7 +50,7 @@ class ResultsViewModelTest {
 
     @Test
     fun setArgumentsWithOriginalImage_isCorrect() = runTest {
-        val viewModel = ResultsViewModel(fakeUri, originalFakeUri, null)
+        val viewModel = ResultsViewModel(fakeUri,originalFakeUri,null)
         assertEquals(
             ResultState(
                 resultImageUri = fakeUri,
@@ -60,7 +62,7 @@ class ResultsViewModelTest {
 
     @Test
     fun initialState_withPrompt_isCorrect() = runTest {
-        val viewModel = ResultsViewModel(fakeUri, null, fakePromptText)
+        val viewModel = ResultsViewModel(fakeUri,null,fakePromptText)
         assertEquals(
             ResultState(
                 resultImageUri = fakeUri,

From 39a0bec43eeb71ee02ba0a0d4ff576dfab477dfb Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:43:39 +0100
Subject: [PATCH 03/15] Revert "Test Cases handling and comments resolved."

This reverts commit 2c19c4a9
---
 .../androidify/navigation/MainNavigation.kt   | 31 +++++++--------
 .../androidify/navigation/UriSerializer.kt    | 21 ++--------
 .../developers/testing/data/BitmapSample.kt   | 20 ----------
 .../testing/data/TestFileProvider.kt          |  2 +-
 .../customize/CustomizeExportScreen.kt        |  4 +-
 .../customize/CustomizeExportViewModel.kt     | 12 ++++++
 .../androidify/customize/ImageRenderer.kt     | 21 +++++-----
 .../developers/androidify/customize/Utils.kt  | 27 -------------
 .../androidify/results/ResultsScreen.kt       | 16 ++++++--
 .../results/ResultsScreenScreenshotTest.kt    |  2 +-
 .../customize/CustomizeStateTest.kt           |  2 +-
 .../customize/CustomizeViewModelTest.kt       | 38 +++++++++++++++----
 .../results/ResultsViewModelTest.kt           | 19 +++++++---
 13 files changed, 105 insertions(+), 110 deletions(-)
 delete mode 100644 core/testing/src/main/java/com/android/developers/testing/data/BitmapSample.kt
 delete mode 100644 feature/results/src/main/java/com/android/developers/androidify/customize/Utils.kt

diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
index 2a8fbbc5..bc076d5c 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
@@ -105,11 +105,11 @@ fun MainNavigation() {
             }
             entry<Create> { createKey ->
                 val creationViewModel = hiltViewModel<CreationViewModel, CreationViewModel.Factory>(
-                    creationCallback = { factory ->
+                    creationCallback = {    factory ->
                         factory.create(
-                            originalImageUrl = createKey.fileName,
+                            originalImageUrl = createKey.fileName
                         )
-                    },
+                    }
                 )
                 CreationScreen(
                     onCameraPressed = {
@@ -123,16 +123,16 @@ fun MainNavigation() {
                         backStack.add(About)
                     },
                     onImageCreated = { resultImageUri, prompt, originalImageUri ->
-                        backStack.removeAll { it is Result }
+                        backStack.removeAll{ it is Result}
                         backStack.add(
                             Result(
                                 resultImageUri = resultImageUri,
                                 prompt = prompt,
-                                originalImageUri = originalImageUri,
-                            ),
+                                originalImageUri = originalImageUri
+                            )
                         )
                     },
-                    creationViewModel = creationViewModel,
+                    creationViewModel = creationViewModel
                 )
             }
             entry<Result> { resultKey ->
@@ -141,17 +141,18 @@ fun MainNavigation() {
                         factory.create(
                             resultImageUrl = resultKey.resultImageUri,
                             originalImageUrl = resultKey.originalImageUri,
-                            promptText = resultKey.prompt,
+                            promptText = resultKey.prompt
                         )
-                    },
+                    }
                 )
                 ResultsScreen(
                     onNextPress = { resultImageUri, originalImageUri ->
+                        backStack.removeAll{ it is Result}
                         backStack.add(
                             CustomizeExport(
                                 resultImageUri = resultImageUri,
-                                originalImageUri = originalImageUri,
-                            ),
+                                originalImageUri = originalImageUri
+                            )
                         )
                     },
                     onAboutPress = {
@@ -160,7 +161,7 @@ fun MainNavigation() {
                     onBackPress = {
                         backStack.removeLastOrNull()
                     },
-                    viewModel = resultsViewModel,
+                    viewModel = resultsViewModel
                 )
             }
             entry<CustomizeExport> { shareKey ->
@@ -168,9 +169,9 @@ fun MainNavigation() {
                     creationCallback = { factory ->
                         factory.create(
                             resultImageUrl = shareKey.resultImageUri,
-                            originalImageUrl = shareKey.originalImageUri,
+                            originalImageUrl = shareKey.originalImageUri
                         )
-                    },
+                    }
                 )
                 CustomizeAndExportScreen(
                     onBackPress = {
@@ -179,7 +180,7 @@ fun MainNavigation() {
                     onInfoPress = {
                         backStack.add(About)
                     },
-                    viewModel = customizeExportViewModel,
+                    viewModel = customizeExportViewModel
                 )
             }
             entry<About> {
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt b/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt
index 69950d33..02733c09 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt
@@ -1,30 +1,15 @@
-/*
- * Copyright 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.android.developers.androidify.navigation
 
 import android.net.Uri
-import androidx.core.net.toUri
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import androidx.core.net.toUri
 
-object UriSerializer : KSerializer<Uri> {
+object UriSerializer: KSerializer<Uri> {
     override val descriptor: SerialDescriptor =
         PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
 
@@ -33,4 +18,4 @@ object UriSerializer : KSerializer<Uri> {
     }
 
     override fun deserialize(decoder: Decoder): Uri = decoder.decodeString().toUri()
-}
+}
\ No newline at end of file
diff --git a/core/testing/src/main/java/com/android/developers/testing/data/BitmapSample.kt b/core/testing/src/main/java/com/android/developers/testing/data/BitmapSample.kt
deleted file mode 100644
index ceec4d74..00000000
--- a/core/testing/src/main/java/com/android/developers/testing/data/BitmapSample.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.developers.testing.data
-
-import android.graphics.Bitmap
-
-val bitmapSample = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
diff --git a/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt b/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt
index 75761a89..5a9ca1a7 100644
--- a/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt
+++ b/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt
@@ -66,6 +66,6 @@ class TestFileProvider : LocalFileProvider {
     }
 
     override suspend fun loadBitmapFromUri(uri: Uri): Bitmap? {
-        return bitmapSample
+        TODO("Not yet implemented")
     }
 }
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
index 66f30298..9a8f5edc 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
@@ -426,7 +426,7 @@ fun CustomizeExportPreview() {
         AnimatedContent(true) { targetState ->
             targetState
             CompositionLocalProvider(LocalNavAnimatedContentScope provides this@AnimatedContent) {
-                val imageUri = getPlaceholderBotUri()
+                val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
                 val state = CustomizeExportState(
                     exportImageCanvas = ExportImageCanvas(imageUri = imageUri),
                 )
@@ -453,7 +453,7 @@ fun CustomizeExportPreviewLarge() {
         AnimatedContent(true) { targetState ->
             targetState
             CompositionLocalProvider(LocalNavAnimatedContentScope provides this@AnimatedContent) {
-                val imageUri = getPlaceholderBotUri()
+                val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
                 val state = CustomizeExportState(
                     exportImageCanvas = ExportImageCanvas(
                         imageUri = imageUri,
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index 702692f7..8ecbad10 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -108,6 +108,18 @@ class CustomizeExportViewModel @AssistedInject constructor(
         super.onCleared()
     }
 
+    fun setArguments(
+        resultImageUrl: Uri,
+        originalImageUrl: Uri?,
+    ) {
+        _state.update {
+            CustomizeExportState(
+                originalImageUrl,
+                exportImageCanvas = it.exportImageCanvas.copy(imageUri = resultImageUrl),
+            )
+        }
+    }
+
     fun shareClicked() {
         viewModelScope.launch {
             val exportImageCanvas = state.value.exportImageCanvas
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
index dc26cac7..a113d060 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
@@ -17,6 +17,7 @@
 
 package com.android.developers.androidify.customize
 
+import android.content.ContentResolver
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.animateBounds
 import androidx.compose.animation.core.animateFloatAsState
@@ -41,10 +42,13 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.layout
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.util.fastRoundToInt
+import androidx.core.net.toUri
 import coil3.compose.AsyncImage
+import com.android.developers.androidify.results.R
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.theme.LocalAnimateBoundsScope
 @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalSharedTransitionApi::class)
@@ -171,9 +175,8 @@ fun BackgroundLayout(
                 .then(safeAnimateBounds)
                 .rotate(rotationAnimation),
         ) {
-            val clip = if (exportImageCanvas.selectedBackgroundOption == BackgroundOption.None ||
-                exportImageCanvas.selectedBackgroundOption.aiBackground
-            ) {
+            val clip = if (exportImageCanvas.selectedBackgroundOption == BackgroundOption.None
+                || exportImageCanvas.selectedBackgroundOption.aiBackground) {
                 Modifier
             } else {
                 Modifier.clip(RoundedCornerShape(6))
@@ -208,7 +211,7 @@ private fun Modifier.safeAnimateBounds(): Modifier {
 @Preview
 @Composable
 private fun ImageRendererPreviewSquare() {
-    val imageUri = getPlaceholderBotUri()
+    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
 
     AndroidifyTheme {
         ImageResult(
@@ -231,7 +234,7 @@ private fun ImageRendererPreviewSquare() {
 @Preview
 @Composable
 private fun ImageRendererPreviewBanner() {
-    val imageUri = getPlaceholderBotUri()
+    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -253,7 +256,7 @@ private fun ImageRendererPreviewBanner() {
 @Preview
 @Composable
 private fun ImageRendererPreviewWallpaper() {
-    val imageUri = getPlaceholderBotUri()
+    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -275,7 +278,7 @@ private fun ImageRendererPreviewWallpaper() {
 @Preview(widthDp = 1280, heightDp = 800)
 @Composable
 private fun ImageRendererPreviewWallpaperTablet() {
-    val imageUri = getPlaceholderBotUri()
+    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -297,7 +300,7 @@ private fun ImageRendererPreviewWallpaperTablet() {
 @Preview
 @Composable
 private fun ImageRendererPreviewWallpaperSocial() {
-    val imageUri = getPlaceholderBotUri()
+    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -319,7 +322,7 @@ private fun ImageRendererPreviewWallpaperSocial() {
 @Preview
 @Composable
 fun ImageRendererPreviewWallpaperIO() {
-    val imageUri = getPlaceholderBotUri()
+    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/Utils.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/Utils.kt
deleted file mode 100644
index 40886c77..00000000
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/Utils.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.developers.androidify.customize
-
-import android.content.ContentResolver
-import android.net.Uri
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.core.net.toUri
-import com.android.developers.androidify.results.R
-
-@Composable
-fun getPlaceholderBotUri(): Uri =
-    ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
index 589ce799..c8e51dab 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
@@ -17,6 +17,7 @@
 
 package com.android.developers.androidify.results
 
+import android.content.ContentResolver
 import android.net.Uri
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.EaseOutBack
@@ -51,6 +52,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
@@ -59,8 +61,8 @@ import androidx.compose.ui.text.font.FontWeight.Companion.Bold
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.net.toUri
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.android.developers.androidify.customize.getPlaceholderBotUri
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.theme.components.AndroidifyTopAppBar
 import com.android.developers.androidify.theme.components.PrimaryButton
@@ -73,14 +75,20 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 
 @Composable
 fun ResultsScreen(
+    /*resultImageUri: Uri,
+    originalImageUri: Uri?,
+    promptText: String?,*/
     modifier: Modifier = Modifier,
     verboseLayout: Boolean = allowsFullContent(),
     onBackPress: () -> Unit,
     onAboutPress: () -> Unit,
-    onNextPress: (resultImageUri: Uri, originalImageUri: Uri?) -> Unit,
+    onNextPress: (resultImageUri:Uri, originalImageUri:Uri?) -> Unit,
     viewModel: ResultsViewModel,
 ) {
     val state = viewModel.state.collectAsStateWithLifecycle()
+    /*LaunchedEffect(resultImageUri, originalImageUri, promptText) {
+        viewModel.setArguments(resultImageUri, originalImageUri, promptText)
+    }*/
     val snackbarHostState by viewModel.snackbarHostState.collectAsStateWithLifecycle()
     Scaffold(
         snackbarHost = {
@@ -128,7 +136,7 @@ fun ResultsScreen(
 @Composable
 private fun ResultsScreenPreview() {
     AndroidifyTheme {
-        val imageUri = getPlaceholderBotUri()
+        val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
         val state = remember {
             mutableStateOf(
                 ResultState(
@@ -150,7 +158,7 @@ private fun ResultsScreenPreview() {
 @Composable
 private fun ResultsScreenPreviewSmall() {
     AndroidifyTheme {
-        val imageUri = getPlaceholderBotUri()
+        val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
         val state = remember {
             mutableStateOf(
                 ResultState(
diff --git a/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt b/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt
index 56e6b586..ff33b851 100644
--- a/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt
+++ b/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt
@@ -29,10 +29,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.net.toUri
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.util.AdaptivePreview
 import com.android.developers.androidify.util.SmallPhonePreview
+import androidx.core.net.toUri
 
 class ResultsScreenScreenshotTest {
 
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
index c6ea63e1..27afd8cc 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
@@ -77,7 +77,7 @@ class CustomizeStateTest {
     @Test
     fun exportImageCanvas_defaultValues() {
         val canvas = ExportImageCanvas()
-        Assert.assertNull(canvas.imageUri)
+        Assert.assertNull(canvas.imageBitmap)
         Assert.assertEquals(SizeOption.Square, canvas.aspectRatioOption)
         Assert.assertEquals(Size(1000f, 1000f), canvas.canvasSize)
         Assert.assertNull(canvas.mainImageUri)
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
index 97c2cc12..4fbcc49c 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
@@ -48,9 +48,11 @@ class CustomizeViewModelTest {
     val mainDispatcherRule = MainDispatcherRule()
 
     private lateinit var viewModel: CustomizeExportViewModel
+
+    private val fakeBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
     private val originalFakeUri = Uri.parse("content://com.example.app/images/original.jpg")
 
-    private val fakeUri = Uri.parse("content://com.example.app/images/original.jpg")
+    val fakeUri = Uri.parse("content://test/image.jpg")
 
     @Before
     fun setup() {
@@ -68,17 +70,22 @@ class CustomizeViewModelTest {
     }
 
     @Test
-    fun stateResultUri_NotNull() = runTest {
-        assertNotNull(
-            viewModel.state.value.exportImageCanvas.imageUri,
+    fun stateInitialEmpty() = runTest {
+        assertEquals(
+            CustomizeExportState(),
+            viewModel.state.value,
         )
     }
 
     @Test
     fun setArgumentsWithOriginalImage() = runTest {
+        viewModel.setArguments(
+            fakeUri,
+            originalFakeUri,
+        )
         assertEquals(
             CustomizeExportState(
-                exportImageCanvas = ExportImageCanvas(imageUri = fakeUri, imageBitmap = bitmapSample),
+                exportImageCanvas = ExportImageCanvas(imageBitmap = fakeBitmap),
                 originalImageUrl = originalFakeUri,
             ),
             viewModel.state.value,
@@ -90,6 +97,7 @@ class CustomizeViewModelTest {
         val remoteConfigDataSource = TestRemoteConfigDataSource(true)
         remoteConfigDataSource.backgroundVibeEnabled = false
         val viewModel = CustomizeExportViewModel(
+        viewModel.setArguments(
             fakeUri,
             null,
             FakeImageGenerationRepository(),
@@ -100,7 +108,7 @@ class CustomizeViewModelTest {
         )
         assertEquals(
             CustomizeExportState(
-                exportImageCanvas = ExportImageCanvas(imageUri = fakeUri, imageBitmap = bitmapSample),
+                exportImageCanvas = ExportImageCanvas(imageBitmap = fakeBitmap),
                 originalImageUrl = null,
             ),
             viewModel.state.value,
@@ -116,6 +124,10 @@ class CustomizeViewModelTest {
             }
         }
 
+        viewModel.setArguments(
+            fakeUri,
+            originalFakeUri,
+        )
 
         viewModel.downloadClicked()
         assertNotNull(values.last().externalOriginalSavedUri)
@@ -134,6 +146,10 @@ class CustomizeViewModelTest {
                 values.add(it)
             }
         }
+        viewModel.setArguments(
+            fakeUri,
+            originalFakeUri,
+        )
         advanceUntilIdle()
         viewModel.shareClicked()
         // Ensure all coroutines on the test scheduler complete
@@ -145,7 +161,7 @@ class CustomizeViewModelTest {
     fun changeBackground_NotNull() = runTest {
         val viewModel = CustomizeExportViewModel(
             fakeUri,
-            null,
+            originalFakeUri,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
@@ -159,6 +175,10 @@ class CustomizeViewModelTest {
                 values.add(it)
             }
         }
+        viewModel.setArguments(
+            fakeUri,
+            originalFakeUri,
+        )
         advanceUntilIdle()
         viewModel.selectedToolStateChanged(
             BackgroundToolState(
@@ -185,6 +205,10 @@ class CustomizeViewModelTest {
                 values.add(it)
             }
         }
+        viewModel.setArguments(
+            fakeUri,
+            originalFakeUri,
+        )
         advanceUntilIdle()
         viewModel.selectedToolStateChanged(
             BackgroundToolState(
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
index 810a2edf..e8828609 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
@@ -34,14 +34,25 @@ class ResultsViewModelTest {
     @get:Rule
     val mainDispatcherRule = MainDispatcherRule()
 
+    private lateinit var viewModel: ResultsViewModel
+
+    private val fakeBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
     private val fakePromptText = "Pink Hair, plaid shirt, jeans"
     private val originalFakeUri = Uri.parse("content://com.example.app/images/original.jpg")
 
     private val fakeUri = Uri.parse("content://test/image.jpg")
 
+    @Before
+    fun setup() {
+        viewModel = ResultsViewModel(
+            fakeUri,
+            originalFakeUri,
+            fakePromptText
+        )
+    }
+
     @Test
     fun stateInitialEmpty() = runTest {
-        val viewModel = ResultsViewModel(null,null,null)
         assertEquals(
             ResultState(),
             viewModel.state.value,
@@ -49,8 +60,7 @@ class ResultsViewModelTest {
     }
 
     @Test
-    fun setArgumentsWithOriginalImage_isCorrect() = runTest {
-        val viewModel = ResultsViewModel(fakeUri,originalFakeUri,null)
+    fun setArgumentsWithOriginalImage() = runTest {
         assertEquals(
             ResultState(
                 resultImageUri = fakeUri,
@@ -61,8 +71,7 @@ class ResultsViewModelTest {
     }
 
     @Test
-    fun initialState_withPrompt_isCorrect() = runTest {
-        val viewModel = ResultsViewModel(fakeUri,null,fakePromptText)
+    fun setArgumentsWithPrompt() = runTest {
         assertEquals(
             ResultState(
                 resultImageUri = fakeUri,

From bb9d8229e721e095da17e52cce18ba0183ad2551 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:45:03 +0100
Subject: [PATCH 04/15] Revert "Test Cases handling"

This reverts commit 50e83950
---
 .../testing/data/TestFileProvider.kt          |  4 ----
 .../creation/CreationViewModelTest.kt         |  5 ++---
 .../customize/CustomizeViewModelTest.kt       | 21 +++++++-----------
 .../results/ResultsViewModelTest.kt           | 22 +++++++++++--------
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt b/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt
index 5a9ca1a7..bc10d9e7 100644
--- a/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt
+++ b/core/testing/src/main/java/com/android/developers/testing/data/TestFileProvider.kt
@@ -64,8 +64,4 @@ class TestFileProvider : LocalFileProvider {
     ): Uri {
         TODO("Not yet implemented")
     }
-
-    override suspend fun loadBitmapFromUri(uri: Uri): Bitmap? {
-        TODO("Not yet implemented")
-    }
 }
diff --git a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
index bb4ee426..a1d76da8 100644
--- a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
+++ b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
@@ -54,7 +54,6 @@ class CreationViewModelTest {
     @Before
     fun setup() {
         viewModel = CreationViewModel(
-            originalImageUrl = fakeUri,
             internetConnectivityManager,
             imageGenerationRepository,
             TestTextGenerationRepository(),
@@ -135,7 +134,7 @@ class CreationViewModelTest {
         viewModel.onImageSelected(Uri.parse("content://test/image.jpg"))
         viewModel.onSelectedPromptOptionChanged(PromptType.PHOTO)
         viewModel.startClicked()
-        assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState)
+        assertEquals(ScreenState.RESULT, viewModel.uiState.value.screenState)
         assertNotNull(viewModel.uiState.value.resultBitmapUri)
     }
 
@@ -196,7 +195,7 @@ class CreationViewModelTest {
             "testing input description"
         }
         viewModel.startClicked()
-        assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState)
+        assertEquals(ScreenState.RESULT, viewModel.uiState.value.screenState)
         assertNotNull(viewModel.uiState.value.resultBitmapUri)
     }
 
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
index 4fbcc49c..670305ea 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
@@ -21,7 +21,6 @@ import android.graphics.Bitmap
 import android.net.Uri
 import androidx.test.core.app.ApplicationProvider
 import com.android.developers.testing.data.TestFileProvider
-import com.android.developers.testing.data.bitmapSample
 import com.android.developers.testing.network.TestRemoteConfigDataSource
 import com.android.developers.testing.repository.FakeImageGenerationRepository
 import com.android.developers.testing.util.FakeComposableBitmapRenderer
@@ -52,8 +51,6 @@ class CustomizeViewModelTest {
     private val fakeBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
     private val originalFakeUri = Uri.parse("content://com.example.app/images/original.jpg")
 
-    val fakeUri = Uri.parse("content://test/image.jpg")
-
     @Before
     fun setup() {
         val remoteConfigDataSource = TestRemoteConfigDataSource(true)
@@ -80,7 +77,7 @@ class CustomizeViewModelTest {
     @Test
     fun setArgumentsWithOriginalImage() = runTest {
         viewModel.setArguments(
-            fakeUri,
+            fakeBitmap,
             originalFakeUri,
         )
         assertEquals(
@@ -98,7 +95,7 @@ class CustomizeViewModelTest {
         remoteConfigDataSource.backgroundVibeEnabled = false
         val viewModel = CustomizeExportViewModel(
         viewModel.setArguments(
-            fakeUri,
+            fakeBitmap,
             null,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
@@ -125,7 +122,7 @@ class CustomizeViewModelTest {
         }
 
         viewModel.setArguments(
-            fakeUri,
+            fakeBitmap,
             originalFakeUri,
         )
 
@@ -147,7 +144,7 @@ class CustomizeViewModelTest {
             }
         }
         viewModel.setArguments(
-            fakeUri,
+            fakeBitmap,
             originalFakeUri,
         )
         advanceUntilIdle()
@@ -160,14 +157,12 @@ class CustomizeViewModelTest {
     @Test
     fun changeBackground_NotNull() = runTest {
         val viewModel = CustomizeExportViewModel(
-            fakeUri,
-            originalFakeUri,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
             localFileProvider = TestFileProvider(),
             remoteConfigDataSource = TestRemoteConfigDataSource(false),
-        )
+            )
         val values = mutableListOf<CustomizeExportState>()
         // Launch collector on the backgroundScope directly to use runTest's scheduler
         backgroundScope.launch(UnconfinedTestDispatcher()) {
@@ -176,7 +171,7 @@ class CustomizeViewModelTest {
             }
         }
         viewModel.setArguments(
-            fakeUri,
+            fakeBitmap,
             originalFakeUri,
         )
         advanceUntilIdle()
@@ -206,7 +201,7 @@ class CustomizeViewModelTest {
             }
         }
         viewModel.setArguments(
-            fakeUri,
+            fakeBitmap,
             originalFakeUri,
         )
         advanceUntilIdle()
@@ -230,7 +225,7 @@ class CustomizeViewModelTest {
         val remoteConfigDataSource = TestRemoteConfigDataSource(true)
         remoteConfigDataSource.backgroundVibeEnabled = true
         val viewModel = CustomizeExportViewModel(
-            fakeUri,
+            fakeBitmap,
             null,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
index e8828609..5f425658 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/results/ResultsViewModelTest.kt
@@ -40,15 +40,9 @@ class ResultsViewModelTest {
     private val fakePromptText = "Pink Hair, plaid shirt, jeans"
     private val originalFakeUri = Uri.parse("content://com.example.app/images/original.jpg")
 
-    private val fakeUri = Uri.parse("content://test/image.jpg")
-
     @Before
     fun setup() {
-        viewModel = ResultsViewModel(
-            fakeUri,
-            originalFakeUri,
-            fakePromptText
-        )
+        viewModel = ResultsViewModel()
     }
 
     @Test
@@ -61,9 +55,14 @@ class ResultsViewModelTest {
 
     @Test
     fun setArgumentsWithOriginalImage() = runTest {
+        viewModel.setArguments(
+            fakeBitmap,
+            originalFakeUri,
+            promptText = null,
+        )
         assertEquals(
             ResultState(
-                resultImageUri = fakeUri,
+                resultImageBitmap = fakeBitmap,
                 originalImageUrl = originalFakeUri,
             ),
             viewModel.state.value,
@@ -72,9 +71,14 @@ class ResultsViewModelTest {
 
     @Test
     fun setArgumentsWithPrompt() = runTest {
+        viewModel.setArguments(
+            fakeBitmap,
+            null,
+            promptText = fakePromptText,
+        )
         assertEquals(
             ResultState(
-                resultImageUri = fakeUri,
+                resultImageBitmap = fakeBitmap,
                 originalImageUrl = null,
                 promptText = fakePromptText,
             ),

From b190d7fbf3f961458d7e95e523a972ca0c80696e Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:45:04 +0100
Subject: [PATCH 05/15] Revert "Handling the process death scenario for Bitmap"

This reverts commit 500f5dc1939d70d12d5c158c9a7eaeb15e69a472.
---
 .../customize/CustomizeExportViewModel.kt     | 24 ++++---------------
 .../androidify/customize/CustomizeState.kt    |  1 -
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index 8ecbad10..6ac04930 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -16,7 +16,6 @@
 package com.android.developers.androidify.customize
 
 import android.app.Application
-import android.graphics.Bitmap
 import android.net.Uri
 import android.util.Log
 import androidx.compose.foundation.layout.fillMaxSize
@@ -31,11 +30,13 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @HiltViewModel(assistedFactory = CustomizeExportViewModel.Factory::class)
 class CustomizeExportViewModel @AssistedInject constructor(
@@ -89,7 +90,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
         }
 
         _state.update {
-            it.copy(
+            CustomizeExportState(
                 originalImageUrl = originalImageUrl,
                 exportImageCanvas = it.exportImageCanvas.copy(imageUri = resultImageUrl),
                 toolState = mapOf(
@@ -100,7 +101,6 @@ class CustomizeExportViewModel @AssistedInject constructor(
                 ),
             )
         }
-        loadInitialBitmap(resultImageUrl)
     }
 
 
@@ -252,7 +252,8 @@ class CustomizeExportViewModel @AssistedInject constructor(
                 }
                 return@launch
             }
-            val image = state.value.exportImageCanvas.imageBitmap
+
+            val image = state.value.exportImageCanvas.imageUri?.let { uri -> localFileProvider.loadBitmapFromUri(uri) }
             if (image == null) {
                 return@launch
             }
@@ -308,19 +309,4 @@ class CustomizeExportViewModel @AssistedInject constructor(
             it.copy(selectedTool = tool)
         }
     }
-
-    private fun loadInitialBitmap(uri: Uri) {
-        viewModelScope.launch {
-            try {
-                val bitmap = localFileProvider.loadBitmapFromUri(uri)
-                _state.update {
-                    it.copy(
-                        exportImageCanvas = it.exportImageCanvas.copy(imageBitmap = bitmap)
-                    )
-                }
-            } catch (e: Exception) {
-                _snackbarHostState.value.showSnackbar("Could not load image.")
-            }
-        }
-    }
 }
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
index 68fe8d87..8228ba31 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
@@ -66,7 +66,6 @@ data class BackgroundToolState(
 
 data class ExportImageCanvas(
     val imageUri: Uri? = null,
-    val imageBitmap: Bitmap? = null,
     val imageBitmapRemovedBackground: Bitmap? = null,
     val aspectRatioOption: SizeOption = SizeOption.Square,
     val canvasSize: Size = Size(1000f, 1000f),

From f20bdad93bd68d688a60c4a647665b5093914536 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:46:04 +0100
Subject: [PATCH 06/15] Revert "Fixed the PR Comments"

This reverts commit 048c5021
---
 .../androidify/navigation/MainNavigation.kt   | 67 ++++++-------------
 .../androidify/navigation/NavigationRoutes.kt | 30 +--------
 .../androidify/navigation/UriSerializer.kt    | 21 ------
 .../androidify/util/LocalFileProvider.kt      | 18 -----
 .../androidify/creation/CreationScreen.kt     | 44 ++++++------
 .../androidify/creation/CreationViewModel.kt  | 44 +++++-------
 .../androidify/results/ResultsScreenTest.kt   | 21 +++---
 .../customize/CustomizeExportScreen.kt        | 12 ++--
 .../customize/CustomizeExportViewModel.kt     | 42 +++++++-----
 .../androidify/customize/ImageRenderer.kt     | 14 ++--
 .../androidify/results/BotResultCard.kt       | 22 ++----
 .../androidify/results/ResultsScreen.kt       | 33 ++++-----
 .../androidify/results/ResultsViewModel.kt    | 25 ++-----
 .../results/ResultsScreenScreenshotTest.kt    |  7 +-
 14 files changed, 142 insertions(+), 258 deletions(-)
 delete mode 100644 app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt

diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
index bc076d5c..2d302a21 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
@@ -32,7 +32,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.IntOffset
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.core.net.toUri
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.entry
 import androidx.navigation3.runtime.entryProvider
@@ -40,13 +40,10 @@ import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import com.android.developers.androidify.camera.CameraPreviewScreen
 import com.android.developers.androidify.creation.CreationScreen
-import com.android.developers.androidify.creation.CreationViewModel
 import com.android.developers.androidify.customize.CustomizeAndExportScreen
-import com.android.developers.androidify.customize.CustomizeExportViewModel
 import com.android.developers.androidify.home.AboutScreen
 import com.android.developers.androidify.home.HomeScreen
 import com.android.developers.androidify.results.ResultsScreen
-import com.android.developers.androidify.results.ResultsViewModel
 import com.android.developers.androidify.theme.transitions.ColorSplashTransitionScreen
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 
@@ -98,20 +95,14 @@ fun MainNavigation() {
                 CameraPreviewScreen(
                     onImageCaptured = { uri ->
                         backStack.removeAll { it is Create }
-                        backStack.add(Create(uri))
+                        backStack.add(Create(uri.toString()))
                         backStack.removeAll { it is Camera }
                     },
                 )
             }
             entry<Create> { createKey ->
-                val creationViewModel = hiltViewModel<CreationViewModel, CreationViewModel.Factory>(
-                    creationCallback = {    factory ->
-                        factory.create(
-                            originalImageUrl = createKey.fileName
-                        )
-                    }
-                )
                 CreationScreen(
+                    createKey.fileName,
                     onCameraPressed = {
                         backStack.removeAll { it is Camera }
                         backStack.add(Camera)
@@ -123,64 +114,50 @@ fun MainNavigation() {
                         backStack.add(About)
                     },
                     onImageCreated = { resultImageUri, prompt, originalImageUri ->
-                        backStack.removeAll{ it is Result}
+                        backStack.removeAll{ it is ImageResult}
                         backStack.add(
-                            Result(
-                                resultImageUri = resultImageUri,
+                            ImageResult(
+                                result = resultImageUri.toString(),
                                 prompt = prompt,
-                                originalImageUri = originalImageUri
+                                originalImageUri = originalImageUri?.toString()
                             )
                         )
-                    },
-                    creationViewModel = creationViewModel
-                )
-            }
-            entry<Result> { resultKey ->
-                val resultsViewModel = hiltViewModel<ResultsViewModel, ResultsViewModel.Factory>(
-                    creationCallback = { factory ->
-                        factory.create(
-                            resultImageUrl = resultKey.resultImageUri,
-                            originalImageUrl = resultKey.originalImageUri,
-                            promptText = resultKey.prompt
-                        )
                     }
                 )
+            }
+            entry<ImageResult> { resultKey ->
                 ResultsScreen(
+                    resultImageUri = resultKey.result.toUri(),
+                    originalImageUri = resultKey.originalImageUri?.toUri(),
                     onNextPress = { resultImageUri, originalImageUri ->
-                        backStack.removeAll{ it is Result}
+                        backStack.removeAll{ it is ImageResult}
                         backStack.add(
-                            CustomizeExport(
-                                resultImageUri = resultImageUri,
-                                originalImageUri = originalImageUri
+                            ShareResult(
+                                resultUri = resultImageUri.toString(),
+                                originalImageUri = originalImageUri?.toString()
                             )
                         )
                     },
+                    promptText = resultKey.prompt,
                     onAboutPress = {
                         backStack.add(About)
                     },
                     onBackPress = {
                         backStack.removeLastOrNull()
-                    },
-                    viewModel = resultsViewModel
-                )
-            }
-            entry<CustomizeExport> { shareKey ->
-                val customizeExportViewModel = hiltViewModel<CustomizeExportViewModel, CustomizeExportViewModel.Factory>(
-                    creationCallback = { factory ->
-                        factory.create(
-                            resultImageUrl = shareKey.resultImageUri,
-                            originalImageUrl = shareKey.originalImageUri
-                        )
+                        backStack.add(Create(fileName = resultKey.originalImageUri, prompt = resultKey.prompt))
                     }
                 )
+            }
+            entry<ShareResult> { shareKey ->
                 CustomizeAndExportScreen(
+                    resultImageUri = shareKey.resultUri.toUri(),
+                    originalImageUri = shareKey.originalImageUri?.toUri(),
                     onBackPress = {
                         backStack.removeLastOrNull()
                     },
                     onInfoPress = {
                         backStack.add(About)
-                    },
-                    viewModel = customizeExportViewModel
+                    }
                 )
             }
             entry<About> {
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
index 50930b0c..46f5f943 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
@@ -17,7 +17,6 @@
 
 package com.android.developers.androidify.navigation
 
-import android.net.Uri
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 
@@ -27,10 +26,7 @@ sealed interface NavigationRoute
 data object Home : NavigationRoute
 
 @Serializable
-data class Create(
-    @Serializable(with = UriSerializer::class) val fileName: Uri? = null,
-    val prompt: String? = null
-) : NavigationRoute
+data class Create(val fileName: String? = null, val prompt: String? = null) : NavigationRoute
 
 @Serializable
 object Camera : NavigationRoute
@@ -38,28 +34,8 @@ object Camera : NavigationRoute
 @Serializable
 object About : NavigationRoute
 
-/**
- * Represents the result of an image generation process, used for navigation.
- *
- * @param resultImageUri The URI of the generated image.
- * @param originalImageUri The URI of the original image used as a base for generation, if any.
- * @param prompt The text prompt used to generate the image, if any.
- */
 @Serializable
-data class Result(
-    @Serializable(with = UriSerializer::class) val resultImageUri: Uri,
-    @Serializable(with = UriSerializer::class) val originalImageUri: Uri? = null,
-    val prompt: String? = null
-) : NavigationRoute
+data class ImageResult(val originalImageUri: String? = null, val prompt: String? = null, val result: String) : NavigationRoute
 
-/**
- * Represents the navigation route to the screen for customizing and exporting a generated image.
- *
- * @param resultImageUri The URI of the generated image to be customized.
- * @param originalImageUri The URI of the original image, passed along for context.
- */
 @Serializable
-data class CustomizeExport(
-    @Serializable(with = UriSerializer::class) val resultImageUri: Uri,
-    @Serializable(with = UriSerializer::class) val originalImageUri: Uri?
-) : NavigationRoute
\ No newline at end of file
+data class ShareResult(val resultUri: String, val originalImageUri: String?) : NavigationRoute
\ No newline at end of file
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt b/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt
deleted file mode 100644
index 02733c09..00000000
--- a/app/src/main/java/com/android/developers/androidify/navigation/UriSerializer.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.android.developers.androidify.navigation
-
-import android.net.Uri
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import androidx.core.net.toUri
-
-object UriSerializer: KSerializer<Uri> {
-    override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
-
-    override fun serialize(encoder: Encoder, value: Uri) {
-        encoder.encodeString(value.toString())
-    }
-
-    override fun deserialize(decoder: Decoder): Uri = decoder.decodeString().toUri()
-}
\ No newline at end of file
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/LocalFileProvider.kt b/core/util/src/main/java/com/android/developers/androidify/util/LocalFileProvider.kt
index 4c2812d7..150fe769 100644
--- a/core/util/src/main/java/com/android/developers/androidify/util/LocalFileProvider.kt
+++ b/core/util/src/main/java/com/android/developers/androidify/util/LocalFileProvider.kt
@@ -18,7 +18,6 @@ package com.android.developers.androidify.util
 import android.app.Application
 import android.content.ContentValues
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
@@ -54,9 +53,6 @@ interface LocalFileProvider {
 
     @WorkerThread
     suspend fun saveUriToSharedStorage(inputUri: Uri, fileName: String, mimeType: String): Uri
-
-    @WorkerThread
-    suspend fun loadBitmapFromUri(uri: Uri): Bitmap?
 }
 
 @Singleton
@@ -124,20 +120,6 @@ class LocalFileProviderImpl @Inject constructor(
         return@withContext newUri
     }
 
-    override suspend fun loadBitmapFromUri(uri: Uri): Bitmap? {
-        return withContext(ioDispatcher) {
-            try {
-                application.contentResolver.openInputStream(uri)?.use {
-                    return@withContext BitmapFactory.decodeStream(it)
-                }
-                null
-            } catch (e: Exception) {
-                e.printStackTrace()
-                null
-            }
-        }
-    }
-
     @Throws(IOException::class)
     @WorkerThread
     private fun saveFileToUri(file: File, uri: Uri) {
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
index 059cb578..b27f371d 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
@@ -92,7 +92,6 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.ripple
 import androidx.compose.material3.toShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -125,11 +124,6 @@ import androidx.core.net.toUri
 import androidx.graphics.shapes.RoundedPolygon
 import androidx.graphics.shapes.rectangle
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.compose.LifecycleResumeEffect
-import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
@@ -165,7 +159,8 @@ import com.android.developers.androidify.creation.R as CreationR
 
 @Composable
 fun CreationScreen(
-    creationViewModel: CreationViewModel,
+    fileName: String? = null,
+    creationViewModel: CreationViewModel = hiltViewModel(),
     isMedium: Boolean = isAtLeastMedium(),
     onCameraPressed: () -> Unit = {},
     onBackPressed: () -> Unit,
@@ -178,28 +173,19 @@ fun CreationScreen(
     ) {
         creationViewModel.onBackPress()
     }
+    LaunchedEffect(Unit) {
+        if (fileName != null) {
+            creationViewModel.onImageSelected(fileName.toUri())
+        } else {
+            creationViewModel.onImageSelected(null)
+        }
+    }
     val pickMedia = rememberLauncherForActivityResult(PickVisualMedia()) { uri ->
         if (uri != null) {
             creationViewModel.onImageSelected(uri)
         }
     }
     val snackbarHostState by creationViewModel.snackbarHostState.collectAsStateWithLifecycle()
-
-    LaunchedEffect(uiState.resultBitmapUri) {
-        uiState.resultBitmapUri?.let { resultBitmapUri ->
-            onImageCreated(
-                resultBitmapUri,
-                uiState.descriptionText.text.toString(),
-                if (uiState.selectedPromptOption == PromptType.PHOTO) {
-                    uiState.imageUri
-                } else {
-                    null
-                }
-            )
-            creationViewModel.onResultDisplayed()
-        }
-    }
-
     when (uiState.screenState) {
         ScreenState.EDIT -> {
             EditScreen(
@@ -227,6 +213,18 @@ fun CreationScreen(
                 },
             )
         }
+
+        ScreenState.RESULT -> {
+            onImageCreated(
+                uiState.resultBitmapUri!!,
+                uiState.descriptionText.text.toString(),
+                if (uiState.selectedPromptOption == PromptType.PHOTO) {
+                    uiState.imageUri
+                } else {
+                    null
+                }
+            )
+        }
     }
 }
 
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
index 603e0ba9..499881cb 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
@@ -33,9 +33,6 @@ import com.android.developers.androidify.data.InternetConnectivityManager
 import com.android.developers.androidify.data.NoInternetException
 import com.android.developers.androidify.data.TextGenerationRepository
 import com.android.developers.androidify.util.LocalFileProvider
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Job
@@ -45,9 +42,8 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-@HiltViewModel(assistedFactory = CreationViewModel.Factory::class)
-class CreationViewModel @AssistedInject constructor(
-    @Assisted("originalImageUrl") originalImageUrl: Uri?,
+@HiltViewModel
+class CreationViewModel @Inject constructor(
     val internetConnectivityManager: InternetConnectivityManager,
     val imageGenerationRepository: ImageGenerationRepository,
     val textGenerationRepository: TextGenerationRepository,
@@ -57,9 +53,11 @@ class CreationViewModel @AssistedInject constructor(
     val context: Context,
 ) : ViewModel() {
 
-    @AssistedFactory
-    interface Factory {
-        fun create(@Assisted("originalImageUrl") originalImageUrl: Uri?): CreationViewModel
+    init {
+        viewModelScope.launch {
+            imageGenerationRepository.initialize()
+            textGenerationRepository.initialize()
+        }
     }
 
     private var _uiState = MutableStateFlow(CreationState())
@@ -75,14 +73,6 @@ class CreationViewModel @AssistedInject constructor(
     private var promptGenerationJob: Job? = null
     private var imageGenerationJob: Job? = null
 
-    init {
-        onImageSelected(originalImageUrl)
-        viewModelScope.launch {
-            imageGenerationRepository.initialize()
-            textGenerationRepository.initialize()
-        }
-    }
-
     fun onImageSelected(uri: Uri?) {
         _uiState.update {
             it.copy(
@@ -162,10 +152,7 @@ class CreationViewModel @AssistedInject constructor(
                         )
                     }
                     _uiState.update {
-                        it.copy(
-                            resultBitmapUri = imageGenerationRepository.saveImage(bitmap),
-                            screenState = ScreenState.EDIT
-                        )
+                        it.copy(resultBitmapUri = imageGenerationRepository.saveImage(bitmap), screenState = ScreenState.RESULT)
                     }
                 } catch (e: Exception) {
                     handleImageGenerationError(e)
@@ -230,17 +217,17 @@ class CreationViewModel @AssistedInject constructor(
                 cancelInProgressTask()
             }
 
+            ScreenState.RESULT -> {
+                _uiState.update {
+                    it.copy(screenState = ScreenState.EDIT, resultBitmapUri = null)
+                }
+            }
+
             ScreenState.EDIT -> {
                 // do nothing, back press handled outside
             }
         }
     }
-
-    fun onResultDisplayed() {
-        _uiState.update {
-            it.copy(resultBitmapUri = null)
-        }
-    }
 }
 
 data class CreationState(
@@ -258,6 +245,7 @@ data class CreationState(
 enum class ScreenState {
     EDIT,
     LOADING,
+    RESULT,
 }
 
 data class BotColor(
@@ -298,4 +286,4 @@ private fun getBotColors(): List<BotColor> {
 enum class PromptType(val displayName: String) {
     PHOTO("Photo"),
     TEXT("Prompt"),
-}
+}
\ No newline at end of file
diff --git a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt b/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
index 9f1f312a..5dba07c0 100644
--- a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
+++ b/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
@@ -41,15 +41,15 @@ class ResultsScreenTest {
     @get:Rule
     val composeTestRule = createAndroidComposeRule<ComponentActivity>()
 
-    // Create a test bitmap for testing
-    val testUri = android.net.Uri.parse("placeholder://image")
+    // Create a dummy bitmap for testing
+    val dummyUri = android.net.Uri.parse("dummy://image")
 
     @Test
     fun resultsScreenContents_displaysActionButtons() {
         val shareButtonText = composeTestRule.activity.getString(R.string.customize_and_share)
         // Note: Download button is identified by icon, harder to test reliably without tags/desc
 
-        val initialState = ResultState(resultImageUri = testUri, promptText = "test")
+        val initialState = ResultState(resultImageUri = dummyUri, promptText = "test")
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -78,7 +78,7 @@ class ResultsScreenTest {
         val frontCardDesc = composeTestRule.activity.getString(R.string.resultant_android_bot)
 
         // Ensure promptText is non-null when bitmap is present
-        val initialState = ResultState(resultImageUri = testUri, promptText = "test")
+        val initialState = ResultState(resultImageUri = dummyUri, promptText = "test")
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -106,9 +106,9 @@ class ResultsScreenTest {
         val photoOptionText = composeTestRule.activity.getString(R.string.photo)
         val frontCardDesc = composeTestRule.activity.getString(R.string.resultant_android_bot)
         val backCardDesc = composeTestRule.activity.getString(R.string.original_image)
-        val testUri = android.net.Uri.parse("placeholder://image")
+        val dummyUri = android.net.Uri.parse("dummy://image")
 
-        val initialState = ResultState(resultImageUri = testUri, originalImageUrl = testUri)
+        val initialState = ResultState(resultImageUri = dummyUri, originalImageUrl = dummyUri)
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -143,7 +143,7 @@ class ResultsScreenTest {
         val promptText = "test prompt"
         val promptPrefix = composeTestRule.activity.getString(R.string.my_bot_is_wearing)
 
-        val initialState = ResultState(resultImageUri = testUri, promptText = promptText) // No original image URI
+        val initialState = ResultState(resultImageUri = dummyUri, promptText = promptText) // No original image URI
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -173,10 +173,9 @@ class ResultsScreenTest {
         val botOptionText = composeTestRule.activity.getString(R.string.bot)
         val photoOptionText = composeTestRule.activity.getString(R.string.photo)
         val frontCardDesc = composeTestRule.activity.getString(R.string.resultant_android_bot)
-        val testUri = android.net.Uri.parse("placeholder://image")
+        val dummyUri = android.net.Uri.parse("dummy://image")
 
-
-        val initialState = ResultState(resultImageUri = testUri, originalImageUrl = testUri)
+        val initialState = ResultState(resultImageUri = dummyUri, originalImageUrl = dummyUri)
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -211,7 +210,7 @@ class ResultsScreenTest {
         var shareClicked = false
 
         // Ensure promptText is non-null when bitmap is present
-        val initialState = ResultState(resultImageUri = testUri, promptText = "test")
+        val initialState = ResultState(resultImageUri = dummyUri, promptText = "test")
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
index 9a8f5edc..1ba4ace7 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
@@ -93,16 +93,20 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.permissions.shouldShowRationale
 import com.android.developers.androidify.theme.R as ThemeR
-import android.content.ContentResolver
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CustomizeAndExportScreen(
+    resultImageUri: Uri,
+    originalImageUri: Uri?,
     onBackPress: () -> Unit,
     onInfoPress: () -> Unit,
     isMediumWindowSize: Boolean = isAtLeastMedium(),
-    viewModel: CustomizeExportViewModel,
+    viewModel: CustomizeExportViewModel = hiltViewModel<CustomizeExportViewModel>(),
 ) {
+    LaunchedEffect(resultImageUri, originalImageUri) {
+        viewModel.setArguments(resultImageUri, originalImageUri)
+    }
     val state = viewModel.state.collectAsStateWithLifecycle()
     val context = LocalContext.current
     LaunchedEffect(state.value.savedUri) {
@@ -426,7 +430,7 @@ fun CustomizeExportPreview() {
         AnimatedContent(true) { targetState ->
             targetState
             CompositionLocalProvider(LocalNavAnimatedContentScope provides this@AnimatedContent) {
-                val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+                val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
                 val state = CustomizeExportState(
                     exportImageCanvas = ExportImageCanvas(imageUri = imageUri),
                 )
@@ -453,7 +457,7 @@ fun CustomizeExportPreviewLarge() {
         AnimatedContent(true) { targetState ->
             targetState
             CompositionLocalProvider(LocalNavAnimatedContentScope provides this@AnimatedContent) {
-                val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+                val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
                 val state = CustomizeExportState(
                     exportImageCanvas = ExportImageCanvas(
                         imageUri = imageUri,
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index 6ac04930..5f2ac1bb 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -16,19 +16,18 @@
 package com.android.developers.androidify.customize
 
 import android.app.Application
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
 import com.android.developers.androidify.data.ImageGenerationRepository
-import com.android.developers.androidify.util.LocalFileProvider
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -36,12 +35,11 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
-@HiltViewModel(assistedFactory = CustomizeExportViewModel.Factory::class)
-class CustomizeExportViewModel @AssistedInject constructor(
-    @Assisted("resultImageUrl") val resultImageUrl: Uri,
-    @Assisted("originalImageUrl") val originalImageUrl: Uri?,
+@HiltViewModel
+class CustomizeExportViewModel @Inject constructor(
     val imageGenerationRepository: ImageGenerationRepository,
     val composableBitmapRenderer: ComposableBitmapRenderer,
     val localFileProvider: LocalFileProvider,
@@ -49,14 +47,6 @@ class CustomizeExportViewModel @AssistedInject constructor(
     application: Application,
 ) : AndroidViewModel(application) {
 
-    @AssistedFactory
-    interface Factory{
-        fun create(
-            @Assisted("resultImageUrl") resultImageUrl: Uri,
-            @Assisted("originalImageUrl")originalImageUrl: Uri?
-        ): CustomizeExportViewModel
-    }
-
     private val _state = MutableStateFlow(CustomizeExportState())
     val state = _state.asStateFlow()
 
@@ -253,7 +243,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
                 return@launch
             }
 
-            val image = state.value.exportImageCanvas.imageUri?.let { uri -> localFileProvider.loadBitmapFromUri(uri) }
+            val image = state.value.exportImageCanvas.imageUri?.let { uri -> convertUriToBitmap(uri) }
             if (image == null) {
                 return@launch
             }
@@ -309,4 +299,22 @@ class CustomizeExportViewModel @AssistedInject constructor(
             it.copy(selectedTool = tool)
         }
     }
+
+    suspend fun convertUriToBitmap(uri: Uri): Bitmap? {
+        return withContext(ioDispatcher()) {
+            try {
+                val inputStream = application.contentResolver.openInputStream(uri)
+                if (inputStream != null) {
+                    val bitmap = BitmapFactory.decodeStream(inputStream)
+                    inputStream.close()
+                    bitmap
+                } else {
+                    null
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                null
+            }
+        }
+    }
 }
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
index a113d060..736fd090 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
@@ -17,7 +17,6 @@
 
 package com.android.developers.androidify.customize
 
-import android.content.ContentResolver
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.animateBounds
 import androidx.compose.animation.core.animateFloatAsState
@@ -42,7 +41,6 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.layout
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.util.fastRoundToInt
@@ -211,7 +209,7 @@ private fun Modifier.safeAnimateBounds(): Modifier {
 @Preview
 @Composable
 private fun ImageRendererPreviewSquare() {
-    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
 
     AndroidifyTheme {
         ImageResult(
@@ -234,7 +232,7 @@ private fun ImageRendererPreviewSquare() {
 @Preview
 @Composable
 private fun ImageRendererPreviewBanner() {
-    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -256,7 +254,7 @@ private fun ImageRendererPreviewBanner() {
 @Preview
 @Composable
 private fun ImageRendererPreviewWallpaper() {
-    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -278,7 +276,7 @@ private fun ImageRendererPreviewWallpaper() {
 @Preview(widthDp = 1280, heightDp = 800)
 @Composable
 private fun ImageRendererPreviewWallpaperTablet() {
-    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -300,7 +298,7 @@ private fun ImageRendererPreviewWallpaperTablet() {
 @Preview
 @Composable
 private fun ImageRendererPreviewWallpaperSocial() {
-    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
@@ -322,7 +320,7 @@ private fun ImageRendererPreviewWallpaperSocial() {
 @Preview
 @Composable
 fun ImageRendererPreviewWallpaperIO() {
-    val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt b/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
index fd772d8d..4f78fd3d 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
@@ -66,11 +66,11 @@ fun BotResultCard(
         flippableState = flippableState,
         onFlipStateChanged = onFlipStateChanged,
         front = {
-            FrontCard(resultImageUri)
+            ImageCard(resultImageUri, isBack = false)
         },
         back = {
             if (originalImageUrl != null) {
-                BackCard(originalImageUrl)
+                ImageCard(originalImageUrl, isBack = true)
             } else {
                 BackCardPrompt(promptText!!)
             }
@@ -79,24 +79,10 @@ fun BotResultCard(
 }
 
 @Composable
-private fun FrontCard(resultImageUri: Uri) {
-    AsyncImage(
-        model = resultImageUri,
-        contentDescription = stringResource(R.string.resultant_android_bot),
-        contentScale = ContentScale.Crop,
-        modifier = Modifier
-            .fillMaxSize()
-            .aspectRatio(BOT_ASPECT_RATIO)
-            .shadow(8.dp, shape = MaterialTheme.shapes.large)
-            .clip(MaterialTheme.shapes.large),
-    )
-}
-
-@Composable
-private fun BackCard(originalImageUrl: Uri) {
+private fun ImageCard(originalImageUrl: Uri, isBack: Boolean) {
     AsyncImage(
         model = originalImageUrl,
-        contentDescription = stringResource(R.string.original_image),
+        contentDescription = if (isBack)stringResource(R.string.original_image) else stringResource(R.string.resultant_android_bot),
         contentScale = ContentScale.Crop,
         modifier = Modifier
             .fillMaxSize()
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
index c8e51dab..fd9df9ca 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
@@ -17,7 +17,6 @@
 
 package com.android.developers.androidify.results
 
-import android.content.ContentResolver
 import android.net.Uri
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.EaseOutBack
@@ -44,6 +43,7 @@ import androidx.compose.material3.SnackbarDefaults
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -51,9 +51,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -61,7 +63,7 @@ import androidx.compose.ui.text.font.FontWeight.Companion.Bold
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.net.toUri
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.theme.components.AndroidifyTopAppBar
@@ -72,23 +74,24 @@ import com.android.developers.androidify.util.SmallPhonePreview
 import com.android.developers.androidify.util.allowsFullContent
 import com.android.developers.androidify.util.isAtLeastMedium
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import androidx.core.net.toUri
 
 @Composable
 fun ResultsScreen(
-    /*resultImageUri: Uri,
+    resultImageUri: Uri,
     originalImageUri: Uri?,
-    promptText: String?,*/
+    promptText: String?,
     modifier: Modifier = Modifier,
     verboseLayout: Boolean = allowsFullContent(),
     onBackPress: () -> Unit,
     onAboutPress: () -> Unit,
     onNextPress: (resultImageUri:Uri, originalImageUri:Uri?) -> Unit,
-    viewModel: ResultsViewModel,
+    viewModel: ResultsViewModel = hiltViewModel(),
 ) {
     val state = viewModel.state.collectAsStateWithLifecycle()
-    /*LaunchedEffect(resultImageUri, originalImageUri, promptText) {
+    LaunchedEffect(resultImageUri, originalImageUri, promptText) {
         viewModel.setArguments(resultImageUri, originalImageUri, promptText)
-    }*/
+    }
     val snackbarHostState by viewModel.snackbarHostState.collectAsStateWithLifecycle()
     Scaffold(
         snackbarHost = {
@@ -119,12 +122,10 @@ fun ResultsScreen(
             state,
             verboseLayout = verboseLayout,
             onCustomizeShareClicked = {
-                viewModel.state.value.resultImageUri?.let {
-                    onNextPress(
-                        it,
-                        viewModel.state.value.originalImageUrl,
-                    )
-                }
+                onNextPress(
+                    resultImageUri,
+                    originalImageUri,
+                )
             },
         )
     }
@@ -136,7 +137,7 @@ fun ResultsScreen(
 @Composable
 private fun ResultsScreenPreview() {
     AndroidifyTheme {
-        val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+        val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
         val state = remember {
             mutableStateOf(
                 ResultState(
@@ -158,7 +159,7 @@ private fun ResultsScreenPreview() {
 @Composable
 private fun ResultsScreenPreviewSmall() {
     AndroidifyTheme {
-        val imageUri = ("${ContentResolver.SCHEME_ANDROID_RESOURCE}://${LocalContext.current.packageName}/${R.drawable.placeholderbot}").toUri()
+        val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
         val state = remember {
             mutableStateOf(
                 ResultState(
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
index 2b226d61..70c6ca5b 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
@@ -19,9 +19,6 @@ import android.graphics.Bitmap
 import android.net.Uri
 import androidx.compose.material3.SnackbarHostState
 import androidx.lifecycle.ViewModel
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -29,21 +26,9 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
-@HiltViewModel(assistedFactory = ResultsViewModel.Factory::class)
-class ResultsViewModel @AssistedInject constructor(
-    @Assisted("resultImageUrl") val resultImageUrl: Uri?,
-    @Assisted("originalImageUrl") val originalImageUrl: Uri?,
-    @Assisted("promptText") val promptText: String?
-) : ViewModel() {
+@HiltViewModel
+class ResultsViewModel @Inject constructor() : ViewModel() {
 
-    @AssistedFactory
-    interface Factory {
-        fun create(
-            @Assisted("resultImageUrl") resultImageUrl: Uri?,
-            @Assisted("originalImageUrl") originalImageUrl: Uri?,
-            @Assisted("promptText") promptText: String?,
-        ): ResultsViewModel
-    }
     private val _state = MutableStateFlow(ResultState())
     val state = _state.asStateFlow()
 
@@ -52,7 +37,11 @@ class ResultsViewModel @AssistedInject constructor(
     val snackbarHostState: StateFlow<SnackbarHostState>
         get() = _snackbarHostState
 
-    init{
+    fun setArguments(
+        resultImageUrl: Uri?,
+        originalImageUrl: Uri?,
+        promptText: String?,
+    ) {
         _state.update {
             ResultState(resultImageUrl, originalImageUrl, promptText = promptText)
         }
diff --git a/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt b/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt
index ff33b851..f03cfbd3 100644
--- a/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt
+++ b/feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt
@@ -32,7 +32,6 @@ import androidx.compose.ui.unit.dp
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.util.AdaptivePreview
 import com.android.developers.androidify.util.SmallPhonePreview
-import androidx.core.net.toUri
 
 class ResultsScreenScreenshotTest {
 
@@ -44,7 +43,7 @@ class ResultsScreenScreenshotTest {
         val state = remember {
             mutableStateOf(
                 ResultState(
-                    resultImageUri = "test://mockbitmap/${mockBitmap.hashCode()}".toUri(),
+                    resultImageBitmap = mockBitmap,
                     promptText = "wearing a hat with straw hair",
                 ),
             )
@@ -69,7 +68,7 @@ class ResultsScreenScreenshotTest {
         val state = remember {
             mutableStateOf(
                 ResultState(
-                    resultImageUri = "test://mockbitmap/${mockBitmap.hashCode()}".toUri(),
+                    resultImageBitmap = mockBitmap,
                     promptText = "wearing a hat with straw hair",
                 ),
             )
@@ -93,7 +92,7 @@ class ResultsScreenScreenshotTest {
         val state = remember {
             mutableStateOf(
                 ResultState(
-                    resultImageUri = "test://mockbitmap/${mockBitmap.hashCode()}".toUri(),
+                    resultImageBitmap = mockBitmap,
                     promptText = "wearing a hat with straw hair",
                 ),
             )

From 8e060fe23e2e5df29a2d0c1650cf1f8f0cdeab65 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:46:06 +0100
Subject: [PATCH 07/15] Revert "Refactor image saving and loading in Creation
 and Customize features"

This reverts commit 7bb6ccd7a4daec243177760354de6aadbb337d92.
---
 .../androidify/creation/CreationViewModel.kt  | 28 ++++++++++++++++++-
 .../customize/CustomizeExportViewModel.kt     | 23 +--------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
index 499881cb..45e0f3a2 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
@@ -16,6 +16,7 @@
 package com.android.developers.androidify.creation
 
 import android.content.Context
+import android.graphics.Bitmap
 import android.net.Uri
 import android.util.Log
 import androidx.compose.foundation.text.input.TextFieldState
@@ -35,11 +36,15 @@ import com.android.developers.androidify.data.TextGenerationRepository
 import com.android.developers.androidify.util.LocalFileProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
 import javax.inject.Inject
 
 @HiltViewModel
@@ -152,7 +157,7 @@ class CreationViewModel @Inject constructor(
                         )
                     }
                     _uiState.update {
-                        it.copy(resultBitmapUri = imageGenerationRepository.saveImage(bitmap), screenState = ScreenState.RESULT)
+                        it.copy(resultBitmapUri = saveBitmapToCache(context, bitmap), screenState = ScreenState.RESULT)
                     }
                 } catch (e: Exception) {
                     handleImageGenerationError(e)
@@ -286,4 +291,25 @@ private fun getBotColors(): List<BotColor> {
 enum class PromptType(val displayName: String) {
     PHOTO("Photo"),
     TEXT("Prompt"),
+}
+
+suspend fun saveBitmapToCache(
+    context: Context,
+    bitmap: Bitmap,
+    compressionFormat: Bitmap.CompressFormat = Bitmap.CompressFormat.JPEG,
+    quality: Int = 100
+): Uri? = withContext(Dispatchers.IO) {
+
+    val cacheDir = context.cacheDir
+    val fileName = File(cacheDir, "temp_image_${System.currentTimeMillis()}.jpg")
+    try {
+        FileOutputStream(fileName).use { outputStream ->
+            bitmap.compress(compressionFormat, quality, outputStream)
+        }
+        Uri.fromFile(fileName)
+    } catch (e: Exception) {
+        e.printStackTrace()
+        null
+    }
+
 }
\ No newline at end of file
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index 5f2ac1bb..ba11f466 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -17,14 +17,12 @@ package com.android.developers.androidify.customize
 
 import android.app.Application
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
 import com.android.developers.androidify.data.ImageGenerationRepository
@@ -35,7 +33,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @HiltViewModel
@@ -243,7 +240,7 @@ class CustomizeExportViewModel @Inject constructor(
                 return@launch
             }
 
-            val image = state.value.exportImageCanvas.imageUri?.let { uri -> convertUriToBitmap(uri) }
+            val image = state.value.exportImageCanvas.imageBitmap
             if (image == null) {
                 return@launch
             }
@@ -299,22 +296,4 @@ class CustomizeExportViewModel @Inject constructor(
             it.copy(selectedTool = tool)
         }
     }
-
-    suspend fun convertUriToBitmap(uri: Uri): Bitmap? {
-        return withContext(ioDispatcher()) {
-            try {
-                val inputStream = application.contentResolver.openInputStream(uri)
-                if (inputStream != null) {
-                    val bitmap = BitmapFactory.decodeStream(inputStream)
-                    inputStream.close()
-                    bitmap
-                } else {
-                    null
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                null
-            }
-        }
-    }
 }

From 9a92e4ec9140185c5611410f28f1c9c2bd896978 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:46:06 +0100
Subject: [PATCH 08/15] Revert "Moved ResultsScreen.kt &
 CustomizeExportScreen.kt to open from MainNavigation.kt using Nav3 instead of
 driving them from CreationScreen.kt"

This reverts commit df7c28c858d3edcf65fb435920f6badbd507f13e.
---
 .../androidify/navigation/MainNavigation.kt   | 48 -------------------
 .../androidify/navigation/NavigationRoutes.kt |  6 ---
 .../androidify/creation/CreationScreen.kt     | 37 ++++++++++++--
 .../androidify/creation/CreationViewModel.kt  | 44 +++++++----------
 .../creation/CreationViewModelTest.kt         |  4 +-
 .../androidify/results/ResultsScreenTest.kt   | 14 +++---
 .../customize/CustomizeExportScreen.kt        | 16 +++----
 .../customize/CustomizeExportViewModel.kt     |  4 +-
 .../androidify/customize/CustomizeState.kt    |  2 +-
 .../androidify/customize/ImageRenderer.kt     | 33 +++++++------
 .../androidify/results/BotResultCard.kt       | 24 ++++++++--
 .../androidify/results/ResultsScreen.kt       | 31 +++++-------
 .../androidify/results/ResultsViewModel.kt    |  4 +-
 13 files changed, 118 insertions(+), 149 deletions(-)

diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
index 2d302a21..8eab6f36 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
@@ -32,7 +32,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.IntOffset
-import androidx.core.net.toUri
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.entry
 import androidx.navigation3.runtime.entryProvider
@@ -40,10 +39,8 @@ import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import com.android.developers.androidify.camera.CameraPreviewScreen
 import com.android.developers.androidify.creation.CreationScreen
-import com.android.developers.androidify.customize.CustomizeAndExportScreen
 import com.android.developers.androidify.home.AboutScreen
 import com.android.developers.androidify.home.HomeScreen
-import com.android.developers.androidify.results.ResultsScreen
 import com.android.developers.androidify.theme.transitions.ColorSplashTransitionScreen
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 
@@ -113,51 +110,6 @@ fun MainNavigation() {
                     onAboutPressed = {
                         backStack.add(About)
                     },
-                    onImageCreated = { resultImageUri, prompt, originalImageUri ->
-                        backStack.removeAll{ it is ImageResult}
-                        backStack.add(
-                            ImageResult(
-                                result = resultImageUri.toString(),
-                                prompt = prompt,
-                                originalImageUri = originalImageUri?.toString()
-                            )
-                        )
-                    }
-                )
-            }
-            entry<ImageResult> { resultKey ->
-                ResultsScreen(
-                    resultImageUri = resultKey.result.toUri(),
-                    originalImageUri = resultKey.originalImageUri?.toUri(),
-                    onNextPress = { resultImageUri, originalImageUri ->
-                        backStack.removeAll{ it is ImageResult}
-                        backStack.add(
-                            ShareResult(
-                                resultUri = resultImageUri.toString(),
-                                originalImageUri = originalImageUri?.toString()
-                            )
-                        )
-                    },
-                    promptText = resultKey.prompt,
-                    onAboutPress = {
-                        backStack.add(About)
-                    },
-                    onBackPress = {
-                        backStack.removeLastOrNull()
-                        backStack.add(Create(fileName = resultKey.originalImageUri, prompt = resultKey.prompt))
-                    }
-                )
-            }
-            entry<ShareResult> { shareKey ->
-                CustomizeAndExportScreen(
-                    resultImageUri = shareKey.resultUri.toUri(),
-                    originalImageUri = shareKey.originalImageUri?.toUri(),
-                    onBackPress = {
-                        backStack.removeLastOrNull()
-                    },
-                    onInfoPress = {
-                        backStack.add(About)
-                    }
                 )
             }
             entry<About> {
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
index 46f5f943..81c8338f 100644
--- a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
+++ b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
@@ -33,9 +33,3 @@ object Camera : NavigationRoute
 
 @Serializable
 object About : NavigationRoute
-
-@Serializable
-data class ImageResult(val originalImageUri: String? = null, val prompt: String? = null, val result: String) : NavigationRoute
-
-@Serializable
-data class ShareResult(val resultUri: String, val originalImageUri: String?) : NavigationRoute
\ No newline at end of file
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
index b27f371d..c16c1de6 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
@@ -165,7 +165,6 @@ fun CreationScreen(
     onCameraPressed: () -> Unit = {},
     onBackPressed: () -> Unit,
     onAboutPressed: () -> Unit,
-    onImageCreated: (resultImageUri: Uri, prompt: String?, originalImageUri: Uri?) -> Unit,
 ) {
     val uiState by creationViewModel.uiState.collectAsStateWithLifecycle()
     BackHandler(
@@ -215,16 +214,44 @@ fun CreationScreen(
         }
 
         ScreenState.RESULT -> {
-            onImageCreated(
-                uiState.resultBitmapUri!!,
-                uiState.descriptionText.text.toString(),
+            val prompt = uiState.descriptionText.text.toString()
+            val key = if (uiState.descriptionText.text.isBlank()) {
+                uiState.imageUri.toString()
+            } else {
+                prompt
+            }
+            ResultsScreen(
+                uiState.resultBitmap!!,
                 if (uiState.selectedPromptOption == PromptType.PHOTO) {
                     uiState.imageUri
                 } else {
                     null
-                }
+                },
+                promptText = prompt,
+                viewModel = hiltViewModel(key = key),
+                onAboutPress = onAboutPressed,
+                onBackPress = onBackPressed,
+                onNextPress = creationViewModel::customizeExportClicked,
             )
         }
+
+        ScreenState.CUSTOMIZE -> {
+            val prompt = uiState.descriptionText.text.toString()
+            val key = if (uiState.descriptionText.text.isBlank()) {
+                uiState.imageUri.toString()
+            } else {
+                prompt
+            }
+            uiState.resultBitmap?.let { bitmap ->
+                CustomizeAndExportScreen(
+                    resultImage = bitmap,
+                    originalImageUri = uiState.imageUri,
+                    onBackPress = onBackPressed,
+                    onInfoPress = onAboutPressed,
+                    viewModel = hiltViewModel<CustomizeExportViewModel>(key = key),
+                )
+            }
+        }
     }
 }
 
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
index 45e0f3a2..b9e34558 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
@@ -36,15 +36,11 @@ import com.android.developers.androidify.data.TextGenerationRepository
 import com.android.developers.androidify.util.LocalFileProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.FileOutputStream
 import javax.inject.Inject
 
 @HiltViewModel
@@ -157,7 +153,7 @@ class CreationViewModel @Inject constructor(
                         )
                     }
                     _uiState.update {
-                        it.copy(resultBitmapUri = saveBitmapToCache(context, bitmap), screenState = ScreenState.RESULT)
+                        it.copy(resultBitmap = bitmap, screenState = ScreenState.RESULT)
                     }
                 } catch (e: Exception) {
                     handleImageGenerationError(e)
@@ -224,13 +220,25 @@ class CreationViewModel @Inject constructor(
 
             ScreenState.RESULT -> {
                 _uiState.update {
-                    it.copy(screenState = ScreenState.EDIT, resultBitmapUri = null)
+                    it.copy(screenState = ScreenState.EDIT, resultBitmap = null)
                 }
             }
 
             ScreenState.EDIT -> {
                 // do nothing, back press handled outside
             }
+
+            ScreenState.CUSTOMIZE -> {
+                _uiState.update {
+                    it.copy(screenState = ScreenState.RESULT)
+                }
+            }
+        }
+    }
+
+    fun customizeExportClicked() {
+        _uiState.update {
+            it.copy(screenState = ScreenState.CUSTOMIZE)
         }
     }
 }
@@ -244,13 +252,14 @@ data class CreationState(
     val generatedPrompt: String? = null,
     val promptGenerationInProgress: Boolean = false,
     val screenState: ScreenState = ScreenState.EDIT,
-    val resultBitmapUri: Uri? = null,
+    val resultBitmap: Bitmap? = null,
 )
 
 enum class ScreenState {
     EDIT,
     LOADING,
     RESULT,
+    CUSTOMIZE,
 }
 
 data class BotColor(
@@ -292,24 +301,3 @@ enum class PromptType(val displayName: String) {
     PHOTO("Photo"),
     TEXT("Prompt"),
 }
-
-suspend fun saveBitmapToCache(
-    context: Context,
-    bitmap: Bitmap,
-    compressionFormat: Bitmap.CompressFormat = Bitmap.CompressFormat.JPEG,
-    quality: Int = 100
-): Uri? = withContext(Dispatchers.IO) {
-
-    val cacheDir = context.cacheDir
-    val fileName = File(cacheDir, "temp_image_${System.currentTimeMillis()}.jpg")
-    try {
-        FileOutputStream(fileName).use { outputStream ->
-            bitmap.compress(compressionFormat, quality, outputStream)
-        }
-        Uri.fromFile(fileName)
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
-    }
-
-}
\ No newline at end of file
diff --git a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
index a1d76da8..4ef52369 100644
--- a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
+++ b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
@@ -135,7 +135,7 @@ class CreationViewModelTest {
         viewModel.onSelectedPromptOptionChanged(PromptType.PHOTO)
         viewModel.startClicked()
         assertEquals(ScreenState.RESULT, viewModel.uiState.value.screenState)
-        assertNotNull(viewModel.uiState.value.resultBitmapUri)
+        assertNotNull(viewModel.uiState.value.resultBitmap)
     }
 
     @Test
@@ -196,7 +196,7 @@ class CreationViewModelTest {
         }
         viewModel.startClicked()
         assertEquals(ScreenState.RESULT, viewModel.uiState.value.screenState)
-        assertNotNull(viewModel.uiState.value.resultBitmapUri)
+        assertNotNull(viewModel.uiState.value.resultBitmap)
     }
 
     @Test
diff --git a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt b/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
index 5dba07c0..cad23c8c 100644
--- a/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
+++ b/feature/results/src/androidTest/java/com/android/developers/androidify/results/ResultsScreenTest.kt
@@ -42,14 +42,14 @@ class ResultsScreenTest {
     val composeTestRule = createAndroidComposeRule<ComponentActivity>()
 
     // Create a dummy bitmap for testing
-    val dummyUri = android.net.Uri.parse("dummy://image")
+    private val testBitmap: Bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)
 
     @Test
     fun resultsScreenContents_displaysActionButtons() {
         val shareButtonText = composeTestRule.activity.getString(R.string.customize_and_share)
         // Note: Download button is identified by icon, harder to test reliably without tags/desc
 
-        val initialState = ResultState(resultImageUri = dummyUri, promptText = "test")
+        val initialState = ResultState(resultImageBitmap = testBitmap, promptText = "test")
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -78,7 +78,7 @@ class ResultsScreenTest {
         val frontCardDesc = composeTestRule.activity.getString(R.string.resultant_android_bot)
 
         // Ensure promptText is non-null when bitmap is present
-        val initialState = ResultState(resultImageUri = dummyUri, promptText = "test")
+        val initialState = ResultState(resultImageBitmap = testBitmap, promptText = "test")
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -108,7 +108,7 @@ class ResultsScreenTest {
         val backCardDesc = composeTestRule.activity.getString(R.string.original_image)
         val dummyUri = android.net.Uri.parse("dummy://image")
 
-        val initialState = ResultState(resultImageUri = dummyUri, originalImageUrl = dummyUri)
+        val initialState = ResultState(resultImageBitmap = testBitmap, originalImageUrl = dummyUri)
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -143,7 +143,7 @@ class ResultsScreenTest {
         val promptText = "test prompt"
         val promptPrefix = composeTestRule.activity.getString(R.string.my_bot_is_wearing)
 
-        val initialState = ResultState(resultImageUri = dummyUri, promptText = promptText) // No original image URI
+        val initialState = ResultState(resultImageBitmap = testBitmap, promptText = promptText) // No original image URI
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -175,7 +175,7 @@ class ResultsScreenTest {
         val frontCardDesc = composeTestRule.activity.getString(R.string.resultant_android_bot)
         val dummyUri = android.net.Uri.parse("dummy://image")
 
-        val initialState = ResultState(resultImageUri = dummyUri, originalImageUrl = dummyUri)
+        val initialState = ResultState(resultImageBitmap = testBitmap, originalImageUrl = dummyUri)
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
@@ -210,7 +210,7 @@ class ResultsScreenTest {
         var shareClicked = false
 
         // Ensure promptText is non-null when bitmap is present
-        val initialState = ResultState(resultImageUri = dummyUri, promptText = "test")
+        val initialState = ResultState(resultImageBitmap = testBitmap, promptText = "test")
         val state = mutableStateOf(initialState)
 
         composeTestRule.setContent {
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
index 1ba4ace7..0778e228 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
@@ -62,6 +62,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.dropShadow
 import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.graphics.shadow.Shadow
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.LookaheadScope
@@ -71,7 +72,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
@@ -97,15 +97,15 @@ import com.android.developers.androidify.theme.R as ThemeR
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CustomizeAndExportScreen(
-    resultImageUri: Uri,
+    resultImage: Bitmap,
     originalImageUri: Uri?,
     onBackPress: () -> Unit,
     onInfoPress: () -> Unit,
     isMediumWindowSize: Boolean = isAtLeastMedium(),
     viewModel: CustomizeExportViewModel = hiltViewModel<CustomizeExportViewModel>(),
 ) {
-    LaunchedEffect(resultImageUri, originalImageUri) {
-        viewModel.setArguments(resultImageUri, originalImageUri)
+    LaunchedEffect(resultImage, originalImageUri) {
+        viewModel.setArguments(resultImage, originalImageUri)
     }
     val state = viewModel.state.collectAsStateWithLifecycle()
     val context = LocalContext.current
@@ -430,9 +430,9 @@ fun CustomizeExportPreview() {
         AnimatedContent(true) { targetState ->
             targetState
             CompositionLocalProvider(LocalNavAnimatedContentScope provides this@AnimatedContent) {
-                val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+                val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
                 val state = CustomizeExportState(
-                    exportImageCanvas = ExportImageCanvas(imageUri = imageUri),
+                    exportImageCanvas = ExportImageCanvas(imageBitmap = bitmap.asAndroidBitmap()),
                 )
                 CustomizeExportContents(
                     state = state,
@@ -457,10 +457,10 @@ fun CustomizeExportPreviewLarge() {
         AnimatedContent(true) { targetState ->
             targetState
             CompositionLocalProvider(LocalNavAnimatedContentScope provides this@AnimatedContent) {
-                val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+                val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
                 val state = CustomizeExportState(
                     exportImageCanvas = ExportImageCanvas(
-                        imageUri = imageUri,
+                        imageBitmap = bitmap.asAndroidBitmap(),
                         aspectRatioOption = SizeOption.Square,
                     ),
                     selectedTool = CustomizeTool.Background,
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index ba11f466..edb3fb4e 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -96,13 +96,13 @@ class CustomizeExportViewModel @Inject constructor(
     }
 
     fun setArguments(
-        resultImageUrl: Uri,
+        resultImageUrl: Bitmap,
         originalImageUrl: Uri?,
     ) {
         _state.update {
             CustomizeExportState(
                 originalImageUrl,
-                exportImageCanvas = it.exportImageCanvas.copy(imageUri = resultImageUrl),
+                exportImageCanvas = it.exportImageCanvas.copy(imageBitmap = resultImageUrl),
             )
         }
     }
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
index 8228ba31..5137227c 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
@@ -65,7 +65,7 @@ data class BackgroundToolState(
 ) : ToolState
 
 data class ExportImageCanvas(
-    val imageUri: Uri? = null,
+    val imageBitmap: Bitmap? = null,
     val imageBitmapRemovedBackground: Bitmap? = null,
     val aspectRatioOption: SizeOption = SizeOption.Square,
     val canvasSize: Size = Size(1000f, 1000f),
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
index 736fd090..b65673a3 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
@@ -38,14 +38,13 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.layout
 import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.util.fastRoundToInt
-import androidx.core.net.toUri
-import coil3.compose.AsyncImage
 import com.android.developers.androidify.results.R
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.theme.LocalAnimateBoundsScope
@@ -92,9 +91,9 @@ fun ImageResult(
                         contentScale = ContentScale.Crop,
                         contentDescription = null,
                     )
-                } else if (exportImageCanvas.imageUri != null) {
-                    AsyncImage(
-                        model = exportImageCanvas.imageUri,
+                } else if (exportImageCanvas.imageBitmap != null) {
+                    Image(
+                        bitmap = exportImageCanvas.imageBitmap.asImageBitmap(),
                         modifier = Modifier
                             .fillMaxSize(),
                         contentScale = ContentScale.Crop,
@@ -209,12 +208,12 @@ private fun Modifier.safeAnimateBounds(): Modifier {
 @Preview
 @Composable
 private fun ImageRendererPreviewSquare() {
-    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+    val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
 
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
-                imageUri = imageUri,
+                imageBitmap = bitmap.asAndroidBitmap(),
                 canvasSize = Size(1000f, 1000f),
                 aspectRatioOption = SizeOption.Square,
                 selectedBackgroundOption = BackgroundOption.IO,
@@ -232,11 +231,11 @@ private fun ImageRendererPreviewSquare() {
 @Preview
 @Composable
 private fun ImageRendererPreviewBanner() {
-    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+    val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
-                imageUri = imageUri,
+                imageBitmap = bitmap.asAndroidBitmap(),
                 canvasSize = Size(1000f, 1000f),
                 aspectRatioOption = SizeOption.Banner,
                 selectedBackgroundOption = BackgroundOption.Lightspeed,
@@ -254,11 +253,11 @@ private fun ImageRendererPreviewBanner() {
 @Preview
 @Composable
 private fun ImageRendererPreviewWallpaper() {
-    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+    val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
-                imageUri = imageUri,
+                imageBitmap = bitmap.asAndroidBitmap(),
                 canvasSize = Size(1000f, 1000f),
                 aspectRatioOption = SizeOption.Wallpaper,
                 selectedBackgroundOption = BackgroundOption.Lightspeed,
@@ -276,11 +275,11 @@ private fun ImageRendererPreviewWallpaper() {
 @Preview(widthDp = 1280, heightDp = 800)
 @Composable
 private fun ImageRendererPreviewWallpaperTablet() {
-    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+    val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
-                imageUri = imageUri,
+                imageBitmap = bitmap.asAndroidBitmap(),
                 canvasSize = Size(1280f, 800f),
                 aspectRatioOption = SizeOption.WallpaperTablet,
                 selectedBackgroundOption = BackgroundOption.Lightspeed,
@@ -298,11 +297,11 @@ private fun ImageRendererPreviewWallpaperTablet() {
 @Preview
 @Composable
 private fun ImageRendererPreviewWallpaperSocial() {
-    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+    val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
-                imageUri = imageUri,
+                imageBitmap = bitmap.asAndroidBitmap(),
                 canvasSize = Size(1600f, 900f),
                 aspectRatioOption = SizeOption.SocialHeader,
                 selectedBackgroundOption = BackgroundOption.Lightspeed,
@@ -320,11 +319,11 @@ private fun ImageRendererPreviewWallpaperSocial() {
 @Preview
 @Composable
 fun ImageRendererPreviewWallpaperIO() {
-    val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+    val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
     AndroidifyTheme {
         ImageResult(
             ExportImageCanvas(
-                imageUri = imageUri,
+                imageBitmap = bitmap.asAndroidBitmap(),
                 canvasSize = Size(1600f, 900f),
                 aspectRatioOption = SizeOption.SocialHeader,
                 selectedBackgroundOption = BackgroundOption.IO,
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt b/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
index 4f78fd3d..0934b485 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/BotResultCard.kt
@@ -50,7 +50,7 @@ import coil3.compose.AsyncImage
 
 @Composable
 fun BotResultCard(
-    resultImageUri: Uri,
+    resultImage: Bitmap,
     originalImageUrl: Uri?,
     promptText: String?,
     flippableState: FlippableState,
@@ -66,11 +66,11 @@ fun BotResultCard(
         flippableState = flippableState,
         onFlipStateChanged = onFlipStateChanged,
         front = {
-            ImageCard(resultImageUri, isBack = false)
+            FrontCard(resultImage)
         },
         back = {
             if (originalImageUrl != null) {
-                ImageCard(originalImageUrl, isBack = true)
+                BackCard(originalImageUrl)
             } else {
                 BackCardPrompt(promptText!!)
             }
@@ -79,10 +79,24 @@ fun BotResultCard(
 }
 
 @Composable
-private fun ImageCard(originalImageUrl: Uri, isBack: Boolean) {
+private fun FrontCard(bitmap: Bitmap) {
+    AsyncImage(
+        model = bitmap,
+        contentDescription = stringResource(R.string.resultant_android_bot),
+        contentScale = ContentScale.Crop,
+        modifier = Modifier
+            .fillMaxSize()
+            .aspectRatio(BOT_ASPECT_RATIO)
+            .shadow(8.dp, shape = MaterialTheme.shapes.large)
+            .clip(MaterialTheme.shapes.large),
+    )
+}
+
+@Composable
+private fun BackCard(originalImageUrl: Uri) {
     AsyncImage(
         model = originalImageUrl,
-        contentDescription = if (isBack)stringResource(R.string.original_image) else stringResource(R.string.resultant_android_bot),
+        contentDescription = stringResource(R.string.original_image),
         contentScale = ContentScale.Crop,
         modifier = Modifier
             .fillMaxSize()
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
index fd9df9ca..a6c2036c 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
@@ -17,6 +17,7 @@
 
 package com.android.developers.androidify.results
 
+import android.graphics.Bitmap
 import android.net.Uri
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.EaseOutBack
@@ -74,23 +75,22 @@ import com.android.developers.androidify.util.SmallPhonePreview
 import com.android.developers.androidify.util.allowsFullContent
 import com.android.developers.androidify.util.isAtLeastMedium
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import androidx.core.net.toUri
 
 @Composable
 fun ResultsScreen(
-    resultImageUri: Uri,
+    resultImage: Bitmap,
     originalImageUri: Uri?,
     promptText: String?,
     modifier: Modifier = Modifier,
     verboseLayout: Boolean = allowsFullContent(),
     onBackPress: () -> Unit,
     onAboutPress: () -> Unit,
-    onNextPress: (resultImageUri:Uri, originalImageUri:Uri?) -> Unit,
-    viewModel: ResultsViewModel = hiltViewModel(),
+    onNextPress: () -> Unit,
+    viewModel: ResultsViewModel = hiltViewModel<ResultsViewModel>(),
 ) {
     val state = viewModel.state.collectAsStateWithLifecycle()
-    LaunchedEffect(resultImageUri, originalImageUri, promptText) {
-        viewModel.setArguments(resultImageUri, originalImageUri, promptText)
+    LaunchedEffect(resultImage, originalImageUri, promptText) {
+        viewModel.setArguments(resultImage, originalImageUri, promptText)
     }
     val snackbarHostState by viewModel.snackbarHostState.collectAsStateWithLifecycle()
     Scaffold(
@@ -121,12 +121,7 @@ fun ResultsScreen(
             contentPadding,
             state,
             verboseLayout = verboseLayout,
-            onCustomizeShareClicked = {
-                onNextPress(
-                    resultImageUri,
-                    originalImageUri,
-                )
-            },
+            onCustomizeShareClicked = onNextPress,
         )
     }
 }
@@ -137,11 +132,11 @@ fun ResultsScreen(
 @Composable
 private fun ResultsScreenPreview() {
     AndroidifyTheme {
-        val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+        val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
         val state = remember {
             mutableStateOf(
                 ResultState(
-                    resultImageUri = imageUri,
+                    resultImageBitmap = bitmap.asAndroidBitmap(),
                     promptText = "wearing a hat with straw hair",
                 ),
             )
@@ -159,11 +154,11 @@ private fun ResultsScreenPreview() {
 @Composable
 private fun ResultsScreenPreviewSmall() {
     AndroidifyTheme {
-        val imageUri = ("android.resource://com.android.developers.androidify.results/" + R.drawable.placeholderbot).toUri()
+        val bitmap = ImageBitmap.imageResource(R.drawable.placeholderbot)
         val state = remember {
             mutableStateOf(
                 ResultState(
-                    resultImageUri = imageUri,
+                    resultImageBitmap = bitmap.asAndroidBitmap(),
                     promptText = "wearing a hat with straw hair",
                 ),
             )
@@ -187,7 +182,7 @@ fun ResultsScreenContents(
     defaultSelectedResult: ResultOption = ResultOption.ResultImage,
 ) {
     ResultsBackground()
-    val showResult = state.value.resultImageUri != null
+    val showResult = state.value.resultImageBitmap != null
     var selectedResultOption by remember {
         mutableStateOf(defaultSelectedResult)
     }
@@ -215,7 +210,7 @@ fun ResultsScreenContents(
                     .fillMaxSize(),
             ) {
                 BotResultCard(
-                    state.value.resultImageUri!!,
+                    state.value.resultImageBitmap!!,
                     state.value.originalImageUrl,
                     state.value.promptText,
                     modifier = Modifier.align(Alignment.Center),
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
index 70c6ca5b..a54af8ea 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
@@ -38,7 +38,7 @@ class ResultsViewModel @Inject constructor() : ViewModel() {
         get() = _snackbarHostState
 
     fun setArguments(
-        resultImageUrl: Uri?,
+        resultImageUrl: Bitmap,
         originalImageUrl: Uri?,
         promptText: String?,
     ) {
@@ -49,7 +49,7 @@ class ResultsViewModel @Inject constructor() : ViewModel() {
 }
 
 data class ResultState(
-    val resultImageUri: Uri? = null,
+    val resultImageBitmap: Bitmap? = null,
     val originalImageUrl: Uri? = null,
     val promptText: String? = null,
 )

From 34f20bfb31fdeae554cc653d729f21ffb98e563c Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:49:15 +0100
Subject: [PATCH 09/15] Fix failed revert.

---
 .../androidify/customize/CustomizeExportViewModel.kt          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index edb3fb4e..b34da162 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -26,8 +26,8 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
 import com.android.developers.androidify.data.ImageGenerationRepository
+import com.android.developers.androidify.util.LocalFileProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -78,8 +78,6 @@ class CustomizeExportViewModel @Inject constructor(
 
         _state.update {
             CustomizeExportState(
-                originalImageUrl = originalImageUrl,
-                exportImageCanvas = it.exportImageCanvas.copy(imageUri = resultImageUrl),
                 toolState = mapOf(
                     CustomizeTool.Size to AspectRatioToolState(),
                     CustomizeTool.Background to BackgroundToolState(

From 914269cd3cf1b51ecfcbc9ee53de25ffba21be57 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:53:42 +0100
Subject: [PATCH 10/15] Fix failed revert.

---
 .../androidify/customize/CustomizeViewModelTest.kt   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
index 670305ea..5a35e602 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
@@ -56,8 +56,6 @@ class CustomizeViewModelTest {
         val remoteConfigDataSource = TestRemoteConfigDataSource(true)
         remoteConfigDataSource.backgroundVibeEnabled = false
         viewModel = CustomizeExportViewModel(
-            fakeUri,
-            originalFakeUri,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
@@ -94,15 +92,15 @@ class CustomizeViewModelTest {
         val remoteConfigDataSource = TestRemoteConfigDataSource(true)
         remoteConfigDataSource.backgroundVibeEnabled = false
         val viewModel = CustomizeExportViewModel(
-        viewModel.setArguments(
-            fakeBitmap,
-            null,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
             localFileProvider = TestFileProvider(),
             remoteConfigDataSource = remoteConfigDataSource,
         )
+        viewModel.setArguments(
+            fakeBitmap,
+            null)
         assertEquals(
             CustomizeExportState(
                 exportImageCanvas = ExportImageCanvas(imageBitmap = fakeBitmap),
@@ -225,14 +223,14 @@ class CustomizeViewModelTest {
         val remoteConfigDataSource = TestRemoteConfigDataSource(true)
         remoteConfigDataSource.backgroundVibeEnabled = true
         val viewModel = CustomizeExportViewModel(
-            fakeBitmap,
-            null,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
             localFileProvider = TestFileProvider(),
             remoteConfigDataSource = remoteConfigDataSource,
         )
+        viewModel.setArguments(fakeBitmap,
+            null)
         val state = viewModel.state.value.toolState[CustomizeTool.Background] as BackgroundToolState
 
         assertTrue(state.options.size > 5)

From 59953f94a74f4140d753fd03c105458f128df1f5 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:54:43 +0100
Subject: [PATCH 11/15] Up to version 1.1.3 - code 5.

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 374c7e2c..58035461 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,8 +37,8 @@ android {
         applicationId = "com.android.developers.androidify"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = 36
-        versionCode = 4
-        versionName = "1.1.2"
+        versionCode = 5
+        versionName = "1.1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

From cac8f9773aa9bc239aae243d501c7c5832b73867 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:58:24 +0100
Subject: [PATCH 12/15] Add back debug appCheck

---
 .../startup/FirebaseAppCheckInitializer.kt       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt b/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt
index 00b9b54c..ffa5d0c0 100644
--- a/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt
+++ b/core/network/src/main/java/com/android/developers/androidify/startup/FirebaseAppCheckInitializer.kt
@@ -19,9 +19,11 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
 import androidx.startup.Initializer
+import com.android.developers.androidify.network.BuildConfig
 import com.google.firebase.Firebase
 import com.google.firebase.appcheck.FirebaseAppCheck
 import com.google.firebase.appcheck.appCheck
+import com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory
 import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory
 
 /**
@@ -31,9 +33,17 @@ import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderF
 class FirebaseAppCheckInitializer : Initializer<FirebaseAppCheck> {
     override fun create(context: Context): FirebaseAppCheck {
         return Firebase.appCheck.apply {
-            installAppCheckProviderFactory(
-                PlayIntegrityAppCheckProviderFactory.getInstance(),
-            )
+            if (BuildConfig.DEBUG) {
+                Log.i("AndroidifyAppCheck", "Firebase debug")
+                installAppCheckProviderFactory(
+                    DebugAppCheckProviderFactory.getInstance(),
+                )
+            } else {
+                Log.i("AndroidifyAppCheck", "Play integrity")
+                installAppCheckProviderFactory(
+                    PlayIntegrityAppCheckProviderFactory.getInstance(),
+                )
+            }
         }
     }
 

From b5228ef75fadb83098049adb31c324dbc4d8807d Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 17:59:19 +0100
Subject: [PATCH 13/15] spotless

---
 app/src/main/AndroidManifest.xml                 |  3 ++-
 .../ondevice/LocalSegmentationDataSource.kt      |  8 ++++----
 .../androidify/vertexai/FirebaseAiDataSource.kt  | 12 ++++++------
 .../androidify/data/ImageGenerationRepository.kt |  4 ++--
 .../customize/ComposableBitmapRendererImpl.kt    | 16 ++++++++--------
 .../customize/CustomizeExportViewModel.kt        |  8 ++++----
 .../androidify/customize/ImageRenderer.kt        |  5 +++--
 .../androidify/customize/CustomizeStateTest.kt   |  2 +-
 .../customize/CustomizeViewModelTest.kt          | 11 +++++++----
 9 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7db43670..968b3708 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
      Copyright 2025 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt
index d9e96128..e9118cf4 100644
--- a/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt
+++ b/core/network/src/main/java/com/android/developers/androidify/ondevice/LocalSegmentationDataSource.kt
@@ -37,7 +37,7 @@ interface LocalSegmentationDataSource {
 }
 
 class LocalSegmentationDataSourceImpl @Inject constructor(
-    private val moduleInstallClient: ModuleInstallClient
+    private val moduleInstallClient: ModuleInstallClient,
 ) : LocalSegmentationDataSource {
     private val segmenter by lazy {
         val options = SubjectSegmenterOptions.Builder()
@@ -60,7 +60,7 @@ class LocalSegmentationDataSourceImpl @Inject constructor(
         return areModulesAvailable
     }
     private class CustomInstallStatusListener(
-        val continuation: CancellableContinuation<Boolean>
+        val continuation: CancellableContinuation<Boolean>,
     ) : InstallStatusListener {
 
         override fun onInstallStatusUpdated(update: ModuleInstallStatusUpdate) {
@@ -70,7 +70,7 @@ class LocalSegmentationDataSourceImpl @Inject constructor(
                 continuation.resume(true)
             } else if (update.installState == STATE_FAILED || update.installState == STATE_CANCELED) {
                 continuation.resumeWithException(
-                    ImageSegmentationException("Module download failed or was canceled. State: ${update.installState}")
+                    ImageSegmentationException("Module download failed or was canceled. State: ${update.installState}"),
                 )
             } else {
                 Log.d("LocalSegmentationDataSource", "State update: ${update.installState}")
@@ -128,4 +128,4 @@ class LocalSegmentationDataSourceImpl @Inject constructor(
     }
 }
 
-class ImageSegmentationException(message: String? = null): Exception(message)
\ No newline at end of file
+class ImageSegmentationException(message: String? = null) : Exception(message)
diff --git a/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
index 20103ff6..fef0f431 100644
--- a/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
+++ b/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
@@ -85,12 +85,12 @@ class FirebaseAiDataSourceImpl @Inject constructor(
         return Firebase.ai(backend = GenerativeBackend.vertexAI()).imagenModel(
             remoteConfigDataSource.imageModelName(),
             safetySettings =
-                ImagenSafetySettings(
-                    safetyFilterLevel = ImagenSafetyFilterLevel.BLOCK_LOW_AND_ABOVE,
-                    // Uses `ALLOW_ADULT` filter since `ALLOW_ALL` requires a special approval
-                    // See https://cloud.google.com/vertex-ai/generative-ai/docs/image/responsible-ai-imagen#person-face-gen
-                    personFilterLevel = ImagenPersonFilterLevel.ALLOW_ADULT,
-                ),
+            ImagenSafetySettings(
+                safetyFilterLevel = ImagenSafetyFilterLevel.BLOCK_LOW_AND_ABOVE,
+                // Uses `ALLOW_ADULT` filter since `ALLOW_ALL` requires a special approval
+                // See https://cloud.google.com/vertex-ai/generative-ai/docs/image/responsible-ai-imagen#person-face-gen
+                personFilterLevel = ImagenPersonFilterLevel.ALLOW_ADULT,
+            ),
         )
     }
 
diff --git a/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt b/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
index 7016ee46..9e335077 100644
--- a/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
+++ b/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
@@ -38,7 +38,7 @@ interface ImageGenerationRepository {
     suspend fun saveImageToExternalStorage(imageBitmap: Bitmap): Uri
     suspend fun saveImageToExternalStorage(imageUri: Uri): Uri
 
-    suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String) : Bitmap
+    suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String): Bitmap
     suspend fun removeBackground(image: Bitmap): Bitmap
 }
 
@@ -134,7 +134,7 @@ internal class ImageGenerationRepositoryImpl @Inject constructor(
 
     override suspend fun addBackgroundToBot(image: Bitmap, backgroundPrompt: String): Bitmap {
         val backgroundBotInstructions = remoteConfigDataSource.getBotBackgroundInstructionPrompt() +
-               "\"" +  backgroundPrompt + "\""
+            "\"" + backgroundPrompt + "\""
         return firebaseAiDataSource.generateImageWithEdit(image, backgroundBotInstructions)
     }
 
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt
index 6522028a..9b2c0d3c 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/ComposableBitmapRendererImpl.kt
@@ -80,14 +80,14 @@ class ComposableBitmapRendererImpl @Inject constructor(private val application:
         val texture = SurfaceTexture(false)
         val surface = Surface(texture)
         val virtualDisplay: VirtualDisplay? =
-                (application.getSystemService(DISPLAY_SERVICE) as DisplayManager).createVirtualDisplay(
-                    "virtualDisplay",
-                    1,
-                    1,
-                    72,
-                    surface,
-                    DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY,
-                )
+            (application.getSystemService(DISPLAY_SERVICE) as DisplayManager).createVirtualDisplay(
+                "virtualDisplay",
+                1,
+                1,
+                72,
+                surface,
+                DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY,
+            )
 
         val result = callback(virtualDisplay!!.display)
         virtualDisplay.release()
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index b34da162..feba3171 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -88,7 +88,6 @@ class CustomizeExportViewModel @Inject constructor(
         }
     }
 
-
     override fun onCleared() {
         super.onCleared()
     }
@@ -152,7 +151,7 @@ class CustomizeExportViewModel @Inject constructor(
                 snackbarHostState.value.showSnackbar("Background removal failed")
                 _state.update {
                     val aspectRatioToolState = (it.toolState[CustomizeTool.Size] as AspectRatioToolState)
-                        .copy(selectedToolOption =  previousSizeOption)
+                        .copy(selectedToolOption = previousSizeOption)
                     it.copy(
                         toolState = it.toolState + (CustomizeTool.Size to aspectRatioToolState),
                         showImageEditProgress = false,
@@ -193,7 +192,7 @@ class CustomizeExportViewModel @Inject constructor(
             is SizeOption -> {
                 val selectedSizeOption = toolState.selectedToolOption as SizeOption
                 val needsBackgroundRemoval = selectedSizeOption == SizeOption.Sticker &&
-                        state.value.exportImageCanvas.imageBitmapRemovedBackground == null
+                    state.value.exportImageCanvas.imageBitmapRemovedBackground == null
 
                 val imageBitmap = state.value.exportImageCanvas.imageBitmap
                 if (needsBackgroundRemoval && imageBitmap != null) {
@@ -246,7 +245,8 @@ class CustomizeExportViewModel @Inject constructor(
             _state.update { it.copy(showImageEditProgress = true) }
             try {
                 val bitmap = imageGenerationRepository.addBackgroundToBot(
-                    image, backgroundOption.prompt,
+                    image,
+                    backgroundOption.prompt,
                 )
                 _state.update {
                     it.copy(
diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
index b65673a3..18cd1bef 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/ImageRenderer.kt
@@ -172,8 +172,9 @@ fun BackgroundLayout(
                 .then(safeAnimateBounds)
                 .rotate(rotationAnimation),
         ) {
-            val clip = if (exportImageCanvas.selectedBackgroundOption == BackgroundOption.None
-                || exportImageCanvas.selectedBackgroundOption.aiBackground) {
+            val clip = if (exportImageCanvas.selectedBackgroundOption == BackgroundOption.None ||
+                exportImageCanvas.selectedBackgroundOption.aiBackground
+            ) {
                 Modifier
             } else {
                 Modifier.clip(RoundedCornerShape(6))
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
index 27afd8cc..fee29d60 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeStateTest.kt
@@ -53,7 +53,7 @@ class CustomizeStateTest {
                 SizeOption.WallpaperTablet,
                 SizeOption.Banner,
                 SizeOption.SocialHeader,
-                SizeOption.Sticker
+                SizeOption.Sticker,
             ),
             state.options,
         )
diff --git a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
index 5a35e602..7a5df4b9 100644
--- a/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
+++ b/feature/results/src/test/kotlin/com/android/developers/androidify/customize/CustomizeViewModelTest.kt
@@ -100,7 +100,8 @@ class CustomizeViewModelTest {
         )
         viewModel.setArguments(
             fakeBitmap,
-            null)
+            null,
+        )
         assertEquals(
             CustomizeExportState(
                 exportImageCanvas = ExportImageCanvas(imageBitmap = fakeBitmap),
@@ -160,7 +161,7 @@ class CustomizeViewModelTest {
             application = ApplicationProvider.getApplicationContext(),
             localFileProvider = TestFileProvider(),
             remoteConfigDataSource = TestRemoteConfigDataSource(false),
-            )
+        )
         val values = mutableListOf<CustomizeExportState>()
         // Launch collector on the backgroundScope directly to use runTest's scheduler
         backgroundScope.launch(UnconfinedTestDispatcher()) {
@@ -229,8 +230,10 @@ class CustomizeViewModelTest {
             localFileProvider = TestFileProvider(),
             remoteConfigDataSource = remoteConfigDataSource,
         )
-        viewModel.setArguments(fakeBitmap,
-            null)
+        viewModel.setArguments(
+            fakeBitmap,
+            null,
+        )
         val state = viewModel.state.value.toolState[CustomizeTool.Background] as BackgroundToolState
 
         assertTrue(state.options.size > 5)

From 829dd91bf6d773c95e5c41f44148f0299314b718 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 18:08:02 +0100
Subject: [PATCH 14/15] fix tests

---
 .../developers/androidify/creation/CreationViewModelTest.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
index 4ef52369..574fda1e 100644
--- a/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
+++ b/feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt
@@ -51,6 +51,7 @@ class CreationViewModelTest {
     private val internetConnectivityManager = TestInternetConnectivityManager(true)
     private val imageGenerationRepository = FakeImageGenerationRepository()
 
+    private val fakeUri = Uri.parse("test.jpeg")
     @Before
     fun setup() {
         viewModel = CreationViewModel(
@@ -61,10 +62,12 @@ class CreationViewModelTest {
             FakeDropImageFactory(),
             context = RuntimeEnvironment.getApplication(),
         )
+
     }
 
     @Test
     fun stateInitialEdit_WithImage() = runTest {
+        viewModel.onImageSelected(fakeUri)
         assertEquals(
             ScreenState.EDIT,
             viewModel.uiState.value.screenState,
@@ -76,7 +79,6 @@ class CreationViewModelTest {
     @Test
     fun stateInitialEdit_WithOutImage() = runTest {
         viewModel = CreationViewModel(
-            originalImageUrl = null,
             internetConnectivityManager,
             imageGenerationRepository,
             TestTextGenerationRepository(),

From 307cf4aae189b321fe47218bc12359c3d15d8a56 Mon Sep 17 00:00:00 2001
From: Rebecca Franks <riggaroo@google.com>
Date: Fri, 5 Sep 2025 18:16:57 +0100
Subject: [PATCH 15/15] Fix state tests and dont override whole Customize state
 on url set.

---
 .../developers/androidify/customize/CustomizeExportViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
index feba3171..994ee956 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
@@ -97,7 +97,7 @@ class CustomizeExportViewModel @Inject constructor(
         originalImageUrl: Uri?,
     ) {
         _state.update {
-            CustomizeExportState(
+            _state.value.copy(
                 originalImageUrl,
                 exportImageCanvas = it.exportImageCanvas.copy(imageBitmap = resultImageUrl),
             )