Merge pull request #113 from android/feature/toggle-background-vibes

riggaroo · web-flow · commit be4d76b0ace0 · 2025-09-05T13:54:55.000+01:00
Add a feature toggle for background vibes
diff --git a/core/network/src/main/java/com/android/developers/androidify/RemoteConfigDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/RemoteConfigDataSource.kt
@@ -24,6 +24,7 @@ interface RemoteConfigDataSource {
     fun isAppInactive(): Boolean
     fun textModelName(): String
     fun imageModelName(): String
+    fun isBackgroundVibesFeatureEnabled(): Boolean
     fun promptTextVerify(): String
     fun promptImageValidation(): String
     fun promptImageDescription(): String
@@ -60,6 +61,10 @@ class RemoteConfigDataSourceImpl @Inject constructor() : RemoteConfigDataSource
         return remoteConfig.getString("image_model_name")
     }
 
+    override fun isBackgroundVibesFeatureEnabled(): Boolean {
+        return remoteConfig.getBoolean("background_vibes_feature_enabled")
+    }
+
     override fun promptTextVerify(): String {
         return remoteConfig.getString("prompt_text_verify")
     }
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
@@ -36,13 +36,13 @@ class FirebaseAppCheckInitializer : Initializer<FirebaseAppCheck> {
             if (BuildConfig.DEBUG) {
                 Log.i("AndroidifyAppCheck", "Firebase debug")
                 installAppCheckProviderFactory(
-                    DebugAppCheckProviderFactory.getInstance()
+                    DebugAppCheckProviderFactory.getInstance(),
                 )
             } else {
                 Log.i("AndroidifyAppCheck", "Play integrity")
                 installAppCheckProviderFactory(
                     PlayIntegrityAppCheckProviderFactory.getInstance(),
-                    )
+                )
             }
         }
     }
diff --git a/core/network/src/main/res/xml/remote_config_defaults.xml b/core/network/src/main/res/xml/remote_config_defaults.xml
@@ -15,6 +15,10 @@
      limitations under the License.
 -->
 <defaults>
+    <entry>
+        <key>background_vibes_feature_enabled</key>
+        <value>false</value>
+    </entry>
     <entry>
         <key>bot_background_instruction_prompt</key>
         <value>Add the input image android bot as the main subject to the result,
diff --git a/core/testing/src/main/java/com/android/developers/testing/network/TestRemoteConfigDataSource.kt b/core/testing/src/main/java/com/android/developers/testing/network/TestRemoteConfigDataSource.kt
@@ -29,6 +29,10 @@ class TestRemoteConfigDataSource(private val useGeminiNano: Boolean) : RemoteCon
     override fun imageModelName(): String {
         TODO("Not yet implemented")
     }
+    var backgroundVibeEnabled: Boolean = true
+    override fun isBackgroundVibesFeatureEnabled(): Boolean {
+        return backgroundVibeEnabled
+    }
 
     override fun promptTextVerify(): String {
         TODO("Not yet implemented")
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
@@ -493,8 +493,8 @@ private fun MainCreationPane(
                     // Workaround for https://issuetracker.google.com/432431393
                     val showTextPrompt by remember {
                         derivedStateOf {
-                            pagerState.currentPage == PromptType.TEXT.ordinal
-                                    && pagerState.targetPage == pagerState.currentPage
+                            pagerState.currentPage == PromptType.TEXT.ordinal &&
+                                pagerState.targetPage == pagerState.currentPage
                         }
                     }
                     if (showTextPrompt) {
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
@@ -72,7 +72,7 @@ class CreationViewModelTest {
             viewModel.uiState.value.screenState,
         )
         assertEquals(false, viewModel.uiState.value.promptGenerationInProgress)
-        assertEquals( fakeUri, viewModel.uiState.value.imageUri)
+        assertEquals(fakeUri, viewModel.uiState.value.imageUri)
     }
 
     @Test
@@ -91,7 +91,7 @@ class CreationViewModelTest {
             viewModel.uiState.value.screenState,
         )
         assertEquals(false, viewModel.uiState.value.promptGenerationInProgress)
-        assertEquals( null, viewModel.uiState.value.imageUri)
+        assertEquals(null, viewModel.uiState.value.imageUri)
     }
 
     @Test
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
@@ -22,7 +22,6 @@ 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
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
@@ -24,6 +24,7 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.ui.Modifier
 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.assisted.Assisted
@@ -43,6 +44,7 @@ class CustomizeExportViewModel @AssistedInject constructor(
     val imageGenerationRepository: ImageGenerationRepository,
     val composableBitmapRenderer: ComposableBitmapRenderer,
     val localFileProvider: LocalFileProvider,
+    val remoteConfigDataSource: RemoteConfigDataSource,
     application: Application,
 ) : AndroidViewModel(application) {
 
@@ -63,10 +65,39 @@ class CustomizeExportViewModel @AssistedInject constructor(
         get() = _snackbarHostState
 
     init {
+        val enableBackgroundVibes = remoteConfigDataSource.isBackgroundVibesFeatureEnabled()
+        var backgrounds = mutableListOf(
+            BackgroundOption.None,
+            BackgroundOption.Plain,
+            BackgroundOption.Lightspeed,
+            BackgroundOption.IO,
+        )
+        if (enableBackgroundVibes) {
+            val backgroundVibes = listOf(
+                BackgroundOption.MusicLover,
+                BackgroundOption.PoolMaven,
+                BackgroundOption.SoccerFanatic,
+                BackgroundOption.StarGazer,
+                BackgroundOption.FitnessBuff,
+                BackgroundOption.Fandroid,
+                BackgroundOption.GreenThumb,
+                BackgroundOption.Gamer,
+                BackgroundOption.Jetsetter,
+                BackgroundOption.Chef,
+            )
+            backgrounds.addAll(backgroundVibes)
+        }
+
         _state.update {
             it.copy(
                 originalImageUrl = originalImageUrl,
                 exportImageCanvas = it.exportImageCanvas.copy(imageUri = resultImageUrl),
+                toolState = mapOf(
+                    CustomizeTool.Size to AspectRatioToolState(),
+                    CustomizeTool.Background to BackgroundToolState(
+                        options = backgrounds,
+                    ),
+                ),
             )
         }
         loadInitialBitmap(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
@@ -61,16 +61,6 @@ data class BackgroundToolState(
         BackgroundOption.Plain,
         BackgroundOption.Lightspeed,
         BackgroundOption.IO,
-        BackgroundOption.MusicLover,
-        BackgroundOption.PoolMaven,
-        BackgroundOption.SoccerFanatic,
-        BackgroundOption.StarGazer,
-        BackgroundOption.FitnessBuff,
-        BackgroundOption.Fandroid,
-        BackgroundOption.GreenThumb,
-        BackgroundOption.Gamer,
-        BackgroundOption.Jetsetter,
-        BackgroundOption.Chef,
     ),
 ) : ToolState
 
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
@@ -69,16 +69,6 @@ class CustomizeStateTest {
                 BackgroundOption.Plain,
                 BackgroundOption.Lightspeed,
                 BackgroundOption.IO,
-                BackgroundOption.MusicLover,
-                BackgroundOption.PoolMaven,
-                BackgroundOption.SoccerFanatic,
-                BackgroundOption.StarGazer,
-                BackgroundOption.FitnessBuff,
-                BackgroundOption.Fandroid,
-                BackgroundOption.GreenThumb,
-                BackgroundOption.Gamer,
-                BackgroundOption.Jetsetter,
-                BackgroundOption.Chef,
             ),
             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
@@ -21,6 +21,7 @@ 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
 import com.android.developers.testing.util.MainDispatcherRule
@@ -52,13 +53,16 @@ class CustomizeViewModelTest {
 
     @Before
     fun setup() {
+        val remoteConfigDataSource = TestRemoteConfigDataSource(true)
+        remoteConfigDataSource.backgroundVibeEnabled = false
         viewModel = CustomizeExportViewModel(
             fakeUri,
             originalFakeUri,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
             localFileProvider = TestFileProvider(),
+            remoteConfigDataSource = remoteConfigDataSource,
         )
     }
 
@@ -82,13 +86,16 @@ class CustomizeViewModelTest {
 
     @Test
     fun setArgumentsWithPrompt() = runTest {
+        val remoteConfigDataSource = TestRemoteConfigDataSource(true)
+        remoteConfigDataSource.backgroundVibeEnabled = false
         val viewModel = CustomizeExportViewModel(
             fakeUri,
             null,
             FakeImageGenerationRepository(),
             composableBitmapRenderer = FakeComposableBitmapRenderer(),
             application = ApplicationProvider.getApplicationContext(),
             localFileProvider = TestFileProvider(),
+            remoteConfigDataSource = remoteConfigDataSource,
         )
         assertEquals(
             CustomizeExportState(
@@ -141,6 +148,7 @@ class CustomizeViewModelTest {
             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
@@ -190,4 +198,23 @@ class CustomizeViewModelTest {
         assertTrue { !values[values.lastIndex].showImageEditProgress }
         assertNull(values.last().exportImageCanvas.imageWithEdit)
     }
+
+    @Test
+    fun remoteConfigDataSource_BackgroundVibesFeatureEnabled_ContainsVibeList() = runTest {
+        val remoteConfigDataSource = TestRemoteConfigDataSource(true)
+        remoteConfigDataSource.backgroundVibeEnabled = true
+        val viewModel = CustomizeExportViewModel(
+            fakeUri,
+            null,
+            FakeImageGenerationRepository(),
+            composableBitmapRenderer = FakeComposableBitmapRenderer(),
+            application = ApplicationProvider.getApplicationContext(),
+            localFileProvider = TestFileProvider(),
+            remoteConfigDataSource = remoteConfigDataSource,
+        )
+        val state = viewModel.state.value.toolState[CustomizeTool.Background] as BackgroundToolState
+
+        assertTrue(state.options.size > 5)
+        assertTrue(state.options.any { it.aiBackground })
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,7 +34,7 @@ hiltAndroid = "2.56.2"
 hiltLifecycleViewmodel = "1.0.0-alpha03"
 hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
-junitVersion = "1.2.1"
+junitVersion = "1.3.0"
 kotlin = "2.2.0"
 ksp = "2.2.0-2.0.2"
 kotlinxCoroutines = "1.10.2"

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,13 @@ class FirebaseAppCheckInitializer : Initializer<FirebaseAppCheck> {`
`36`	`36`	`if (BuildConfig.DEBUG) {`
`37`	`37`	`Log.i("AndroidifyAppCheck", "Firebase debug")`
`38`	`38`	`installAppCheckProviderFactory(`
`39`		`- DebugAppCheckProviderFactory.getInstance()`
	`39`	`+ DebugAppCheckProviderFactory.getInstance(),`
`40`	`40`	`)`
`41`	`41`	`} else {`
`42`	`42`	`Log.i("AndroidifyAppCheck", "Play integrity")`
`43`	`43`	`installAppCheckProviderFactory(`
`44`	`44`	`PlayIntegrityAppCheckProviderFactory.getInstance(),`
`45`		`- )`
	`45`	`+ )`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -493,8 +493,8 @@ private fun MainCreationPane(`
`493`	`493`	`// Workaround for https://issuetracker.google.com/432431393`
`494`	`494`	`val showTextPrompt by remember {`
`495`	`495`	`derivedStateOf {`
`496`		`- pagerState.currentPage == PromptType.TEXT.ordinal`
`497`		`- && pagerState.targetPage == pagerState.currentPage`
	`496`	`+ pagerState.currentPage == PromptType.TEXT.ordinal &&`
	`497`	`+ pagerState.targetPage == pagerState.currentPage`
`498`	`498`	`}`
`499`	`499`	`}`
`500`	`500`	`if (showTextPrompt) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class CreationViewModelTest {`
`72`	`72`	`viewModel.uiState.value.screenState,`
`73`	`73`	`)`
`74`	`74`	`assertEquals(false, viewModel.uiState.value.promptGenerationInProgress)`
`75`		`- assertEquals( fakeUri, viewModel.uiState.value.imageUri)`
	`75`	`+ assertEquals(fakeUri, viewModel.uiState.value.imageUri)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Test`
`@@ -91,7 +91,7 @@ class CreationViewModelTest {`
`91`	`91`	`viewModel.uiState.value.screenState,`
`92`	`92`	`)`
`93`	`93`	`assertEquals(false, viewModel.uiState.value.promptGenerationInProgress)`
`94`		`- assertEquals( null, viewModel.uiState.value.imageUri)`
	`94`	`+ assertEquals(null, viewModel.uiState.value.imageUri)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Test`