Merge branch 'main' into feature/app-updates

Author: riggaroo

README.md

@@ -31,7 +31,12 @@ The app combines a variety of different Google technologies, such as:
    Place the file in the app folder: `app/google-services.json`. Be sure to enable [Vertex AI API](https://console.cloud.google.com/apis/library/aiplatform.googleapis.com).
    Ensure to also enable [AppCheck](https://console.firebase.google.com/project/_/appcheck) on your Firebase project to prevent API abuse.
 3. This project makes use of remote config on Firebase. In [`remote_config_defaults.xml`](core/network/src/main/res/xml/remote_config_defaults.xml), update the value of [`use_imagen`](core/network/src/main/res/xml/remote_config_defaults.xml#L40) to `true`, then import the [Firebase Remote config](https://firebase.google.com/docs/remote-config) settings from 
-[`remote_config_defaults.xml`](core/network/src/main/res/xml/remote_config_defaults.xml)
+   [`remote_config_defaults.xml`](core/network/src/main/res/xml/remote_config_defaults.xml).
+   - Navigate to your Firebase project console.
+   - In the left-hand menu, under the "Run" section, select "Remote Config".
+   - Click on the "Upload template" button.
+   - Browse and select the `[setup/remote_config_defaults.json](setup/remote_config_defaults.json)` file from your local repository.
+   - Click "Publish" to apply the settings.
 4. If you'd like to change the font that the app renders with, an optional spec can be placed in
    `~/.gradle/gradle.properties` file:
 

feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt

@@ -89,7 +89,7 @@ fun CreationScreen(
                 onUndoPressed = creationViewModel::onUndoPressed,
                 onPromptGenerationPressed = creationViewModel::onPromptGenerationClicked,
                 onBotColorSelected = creationViewModel::onBotColorChanged,
-                onStartClicked = creationViewModel::startClicked,
+                onStartClicked = creationViewModel::onStartClicked,
                 onDropCallback = creationViewModel::onImageSelected,
             )
         }

feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt

@@ -132,7 +132,7 @@ class CreationViewModel @AssistedInject constructor(
         }
     }
 
-    fun startClicked() {
+    fun onStartClicked() {
         imageGenerationJob?.cancel()
         imageGenerationJob = viewModelScope.launch {
             if (internetConnectivityManager.isInternetAvailable()) {

feature/creation/src/test/kotlin/com/android/developers/androidify/creation/CreationViewModelTest.kt

@@ -130,7 +130,7 @@ class CreationViewModelTest {
     }
 
     @Test
-    fun startClicked_GenerateBotFromPhoto() = runTest {
+    fun onStartClicked_GenerateBotFromPhoto() = runTest {
         val screenStateValues = mutableListOf<ScreenState>()
         backgroundScope.launch(UnconfinedTestDispatcher()) {
             viewModel.uiState.collect {
@@ -140,13 +140,13 @@ class CreationViewModelTest {
 
         viewModel.onImageSelected(Uri.parse("content://test/image.jpg"))
         viewModel.onSelectedPromptOptionChanged(PromptType.PHOTO)
-        viewModel.startClicked()
+        viewModel.onStartClicked()
         assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState)
         assertNotNull(viewModel.uiState.value.resultBitmapUri)
     }
 
     @Test
-    fun startClicked_GenerateBotFromPhoto_NoPhotoSelected() = runTest {
+    fun onStartClicked_GenerateBotFromPhoto_NoPhotoSelected() = runTest {
         val values = mutableListOf<SnackbarHostState>()
 
         backgroundScope.launch(UnconfinedTestDispatcher()) {
@@ -156,7 +156,7 @@ class CreationViewModelTest {
         }
 
         viewModel.onSelectedPromptOptionChanged(PromptType.PHOTO)
-        viewModel.startClicked()
+        viewModel.onStartClicked()
         assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState)
         assertNotNull(
             "Choose an image or use a prompt instead.",
@@ -165,7 +165,7 @@ class CreationViewModelTest {
     }
 
     @Test
-    fun startClicked_GenerateBotFromPrompt_TextEmpty() = runTest {
+    fun onStartClicked_GenerateBotFromPrompt_TextEmpty() = runTest {
         val values = mutableListOf<SnackbarHostState>()
 
         backgroundScope.launch(UnconfinedTestDispatcher()) {
@@ -182,7 +182,7 @@ class CreationViewModelTest {
         imageGenerationRepository.exceptionToThrow = InsufficientInformationException()
 
         viewModel.onSelectedPromptOptionChanged(PromptType.TEXT)
-        viewModel.startClicked()
+        viewModel.onStartClicked()
 
         assertEquals(ScreenState.EDIT, screenStateValues[1])
         assertEquals(
@@ -193,7 +193,7 @@ class CreationViewModelTest {
     }
 
     @Test
-    fun startClicked_GenerateBotFromPrompt() = runTest {
+    fun onStartClicked_GenerateBotFromPrompt() = runTest {
         val screenStateValues = mutableListOf<ScreenState>()
         backgroundScope.launch(UnconfinedTestDispatcher()) {
             viewModel.uiState.collect {
@@ -204,21 +204,21 @@ class CreationViewModelTest {
         viewModel.uiState.value.descriptionText.edit {
             "testing input description"
         }
-        viewModel.startClicked()
+        viewModel.onStartClicked()
         assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState)
         assertNotNull(viewModel.uiState.value.resultBitmapUri)
     }
 
     @Test
-    fun startClicked_NoInternet_DisplaysError() = runTest {
+    fun onStartClicked_NoInternet_DisplaysError() = runTest {
         val values = mutableListOf<SnackbarHostState>()
         backgroundScope.launch(UnconfinedTestDispatcher()) {
             viewModel.snackbarHostState.collect {
                 values.add(it)
             }
         }
         internetConnectivityManager.internetAvailable = false
-        viewModel.startClicked()
+        viewModel.onStartClicked()
         advanceUntilIdle()
         assertEquals(ScreenState.EDIT, viewModel.uiState.value.screenState)
         assertEquals(