Misc code clean up (#43)

* General code clean up

* VertexAI API provider for video summarization

Use VertexAI API provider for video summarization sample

Author: lethargicpanda

ai-catalog/app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AISampleCatalog"
         tools:targetApi="31"
-        android:name=".CatalogApp"
+        android:name=".CatalogApplication"
         android:enableOnBackInvokedCallback="true"
         >
         <activity

ai-catalog/app/src/main/java/com/android/ai/catalog/CatalogApp.kt renamed to ai-catalog/app/src/main/java/com/android/ai/catalog/CatalogApplication.kt

@@ -19,4 +19,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class CatalogApp: Application()
+class CatalogApplication: Application()

ai-catalog/app/src/main/java/com/android/ai/catalog/MainActivity.kt

@@ -23,7 +23,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
-import com.android.ai.catalog.ui.CatalogScreen
+import com.android.ai.catalog.ui.CatalogApp
 import com.android.ai.catalog.ui.theme.AISampleCatalogTheme
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -34,7 +34,7 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             AISampleCatalogTheme {
-                CatalogScreen(modifier = Modifier.fillMaxSize())
+                CatalogApp(modifier = Modifier.fillMaxSize())
             }
         }
     }

ai-catalog/app/src/main/java/com/android/ai/catalog/ui/CatalogScreen.kt renamed to ai-catalog/app/src/main/java/com/android/ai/catalog/ui/CatalogApp.kt

@@ -55,19 +55,17 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.android.ai.catalog.R
-import com.android.ai.catalog.ui.domain.SampleCatalog
 import com.android.ai.catalog.ui.domain.SampleCatalogItem
 import com.google.firebase.FirebaseApp
 import kotlinx.serialization.Serializable
+import androidx.core.net.toUri
+import com.android.ai.catalog.ui.domain.sampleCatalog
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun CatalogScreen(modifier: Modifier = Modifier) {
+fun CatalogApp(modifier: Modifier = Modifier) {
     val context = LocalContext.current
     val navController = rememberNavController()
-    val catalog = SampleCatalog(
-        context
-    )
 
     var isDialogOpened by remember { mutableStateOf(false) }
 
@@ -92,7 +90,7 @@ fun CatalogScreen(modifier: Modifier = Modifier) {
                 LazyColumn(
                     modifier = Modifier.padding(innerPadding)
                 ) {
-                    items(catalog.list) {
+                    items(sampleCatalog) {
                         CatalogListItem(catalogItem = it) {
                             if (it.needsFirebase && !isFirebaseInitialized()) {
                                 isDialogOpened = true
@@ -105,7 +103,7 @@ fun CatalogScreen(modifier: Modifier = Modifier) {
             }
         }
 
-        catalog.list.forEach {
+        sampleCatalog.forEach {
             val catalogItem = it
             composable(catalogItem.route) {
                 catalogItem.sampleEntryScreen()
@@ -115,11 +113,12 @@ fun CatalogScreen(modifier: Modifier = Modifier) {
 
 
     if (isDialogOpened) {
-        firebaseRequiredAlert(
+        FirebaseRequiredAlert(
             onDismiss = { isDialogOpened = false },
             onOpenFirebaseDocClick = {
                 isDialogOpened = false
-                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://firebase.google.com/docs/vertex-ai/get-started#no-existing-firebase"))
+                val intent = Intent(Intent.ACTION_VIEW,
+                    "https://firebase.google.com/docs/vertex-ai/get-started#no-existing-firebase".toUri())
                 context.startActivity(intent)
             }
         )
@@ -131,6 +130,7 @@ fun CatalogListItem(
     catalogItem: SampleCatalogItem,
     onButtonClick: () -> Unit
 ) {
+    val context = LocalContext.current
     ElevatedCard(
         modifier = Modifier.padding(18.dp),
         onClick = {
@@ -146,11 +146,11 @@ fun CatalogListItem(
                     .padding(bottom = 8.dp),
                 fontSize = 20.sp,
                 fontWeight = FontWeight.Bold,
-                text = catalogItem.title
+                text =  context.getString(catalogItem.title)
             )
             Text(
                 modifier = Modifier.padding(bottom = 8.dp),
-                text = catalogItem.description,
+                text = context.getString(catalogItem.description),
             )
             Row {
                 Spacer(Modifier.weight(1f))
@@ -182,7 +182,7 @@ fun CatalogListItem(
 object HomeScreen
 
 @Composable
-fun firebaseRequiredAlert(
+fun FirebaseRequiredAlert(
     onDismiss: () -> Unit = {},
     onOpenFirebaseDocClick: () -> Unit = {}
 ) {
@@ -221,12 +221,7 @@ fun firebaseRequiredAlert(
 fun isFirebaseInitialized(): Boolean {
     return try {
         val firebaseApp = FirebaseApp.getInstance()
-        Log.d("CatalogScreen", "firebaseApp.options.projectId: ${firebaseApp.options.projectId}")
-        if (firebaseApp.options.projectId == "mock_project") {
-            Log.e("CatalogScreen", "Firebase is not initialized")
-            return false
-        }
-        return true
+        return firebaseApp.options.projectId != "mock_project"
     } catch (e: IllegalStateException) {
         Log.e("CatalogScreen", "Firebase is not initialized")
         return false

ai-catalog/app/src/main/java/com/android/ai/catalog/ui/domain/SampleCatalog.kt

@@ -17,7 +17,7 @@
 
 package com.android.ai.catalog.ui.domain
 
-import android.content.Context
+import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import com.android.ai.catalog.R
@@ -30,81 +30,76 @@ import com.android.ai.samples.genai_writing_assistance.GenAIWritingAssistanceScr
 import com.android.ai.samples.imagen.ImagenScreen
 import com.android.ai.samples.magicselfie.MagicSelfieScreen
 
-class SampleCatalog(
-    context: Context
-) {
-
-    val list = listOf(
-        SampleCatalogItem(
-            title = context.getString(R.string.gemini_multimodal_sample_title),
-            description = context.getString(R.string.gemini_multimodal_sample_description),
-            route = "GeminiMultimodalScreen",
-            sampleEntryScreen = { GeminiMultimodalScreen() },
-            tags = listOf(SampleTags.GEMINI_2_0_FLASH, SampleTags.FIREBASE),
-            needsFirebase = true
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.gemini_chatbot_sample_title),
-            description = context.getString(R.string.gemini_chatbot_sample_description),
-            route = "GeminiChitchatScreen",
-            sampleEntryScreen = { GeminiChatbotScreen() },
-            tags = listOf(SampleTags.GEMINI_2_0_FLASH, SampleTags.FIREBASE),
-            needsFirebase = true
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.genai_summarization_sample_title),
-            description = context.getString(R.string.genai_summarization_sample_description),
-            route = "GenAISummarizationScreen",
-            sampleEntryScreen = { GenAISummarizationScreen() },
-            tags = listOf(SampleTags.GEMINI_NANO, SampleTags.ML_KIT)
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.genai_image_description_sample_title),
-            description = context.getString(R.string.genai_image_description_sample_description),
-            route = "GenAIImageDescriptionScreen",
-            sampleEntryScreen = { GenAIImageDescriptionScreen() },
-            tags = listOf(SampleTags.GEMINI_NANO, SampleTags.ML_KIT)
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.genai_writing_assistance_sample_title),
-            description = context.getString(R.string.genai_writing_assistance_sample_description),
-            route = "GenAIWritingAssistanceScreen",
-            sampleEntryScreen = { GenAIWritingAssistanceScreen() },
-            tags = listOf(SampleTags.GEMINI_NANO, SampleTags.ML_KIT)
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.imagen_sample_title),
-            description = context.getString(R.string.imagen_sample_description),
-            route = "ImagenImageGenerationScreen",
-            sampleEntryScreen = { ImagenScreen() },
-            tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE),
-            needsFirebase = true
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.magic_selfie_sample_title),
-            description = context.getString(R.string.magic_selfie_sample_description),
-            route = "MagicSelfieScreen",
-            sampleEntryScreen = { MagicSelfieScreen() },
-            tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE, SampleTags.ML_KIT),
-            needsFirebase = true
-        ),
-        SampleCatalogItem(
-            title = context.getString(R.string.gemini_video_summarization_sample_title),
-            description = context.getString(R.string.gemini_video_summarization_sample_description),
-            route = "VideoSummarizationScreen",
-            sampleEntryScreen = { VideoSummarizationScreen() },
-            tags = listOf(SampleTags.GEMINI_2_0_FLASH, SampleTags.FIREBASE, SampleTags.MEDIA3),
-            needsFirebase = true
-        ),
+val sampleCatalog = listOf<SampleCatalogItem>(
+    SampleCatalogItem(
+        title = R.string.gemini_multimodal_sample_title,
+        description = R.string.gemini_multimodal_sample_description,
+        route = "GeminiMultimodalScreen",
+        sampleEntryScreen = { GeminiMultimodalScreen() },
+        tags = listOf(SampleTags.GEMINI_2_0_FLASH, SampleTags.FIREBASE),
+        needsFirebase = true
+    ),
+    SampleCatalogItem(
+        title = R.string.gemini_chatbot_sample_title,
+        description = R.string.gemini_chatbot_sample_description,
+        route = "GeminiChitchatScreen",
+        sampleEntryScreen = { GeminiChatbotScreen() },
+        tags = listOf(SampleTags.GEMINI_2_0_FLASH, SampleTags.FIREBASE),
+        needsFirebase = true
+    ),
+    SampleCatalogItem(
+        title = R.string.genai_summarization_sample_title,
+        description = R.string.genai_summarization_sample_description,
+        route = "GenAISummarizationScreen",
+        sampleEntryScreen = { GenAISummarizationScreen() },
+        tags = listOf(SampleTags.GEMINI_NANO, SampleTags.ML_KIT)
+    ),
+    SampleCatalogItem(
+        title = R.string.genai_image_description_sample_title,
+        description = R.string.genai_image_description_sample_description,
+        route = "GenAIImageDescriptionScreen",
+        sampleEntryScreen = { GenAIImageDescriptionScreen() },
+        tags = listOf(SampleTags.GEMINI_NANO, SampleTags.ML_KIT)
+    ),
+    SampleCatalogItem(
+        title = R.string.genai_writing_assistance_sample_title,
+        description = R.string.genai_writing_assistance_sample_description,
+        route = "GenAIWritingAssistanceScreen",
+        sampleEntryScreen = { GenAIWritingAssistanceScreen() },
+        tags = listOf(SampleTags.GEMINI_NANO, SampleTags.ML_KIT)
+    ),
+    SampleCatalogItem(
+        title = R.string.imagen_sample_title,
+        description = R.string.imagen_sample_description,
+        route = "ImagenImageGenerationScreen",
+        sampleEntryScreen = { ImagenScreen() },
+        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE),
+        needsFirebase = true
+    ),
+    SampleCatalogItem(
+        title = R.string.magic_selfie_sample_title,
+        description = R.string.magic_selfie_sample_description,
+        route = "MagicSelfieScreen",
+        sampleEntryScreen = { MagicSelfieScreen() },
+        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE, SampleTags.ML_KIT),
+        needsFirebase = true
+    ),
+    SampleCatalogItem(
+        title = R.string.gemini_video_summarization_sample_title,
+        description = R.string.gemini_video_summarization_sample_description,
+        route = "VideoSummarizationScreen",
+        sampleEntryScreen = { VideoSummarizationScreen() },
+        tags = listOf(SampleTags.GEMINI_2_0_FLASH, SampleTags.FIREBASE, SampleTags.MEDIA3),
+        needsFirebase = true
+    ),
 
-        // To create a new sample entry, add a new SampleCatalogItem here.
-    )
+    // To create a new sample entry, add a new SampleCatalogItem here.
+)
 
-}
 
 data class SampleCatalogItem(
-    val title: String,
-    val description: String,
+    @StringRes val title: Int,
+    @StringRes val description: Int,
     val route: String,
     val sampleEntryScreen: @Composable () -> Unit,
     val tags: List<SampleTags> = emptyList(),

ai-catalog/app/src/main/java/com/android/ai/catalog/ui/theme/Theme.kt

@@ -37,22 +37,11 @@ private val LightColorScheme = lightColorScheme(
     primary = Purple40,
     secondary = PurpleGrey40,
     tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
 )
 
 @Composable
 fun AISampleCatalogTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {

ai-catalog/app/src/main/java/com/android/ai/catalog/ui/theme/Type.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 
-// Set of Material typography styles to start with
 val Typography = Typography(
     bodyLarge = TextStyle(
         fontFamily = FontFamily.Default,
@@ -32,20 +31,4 @@ val Typography = Typography(
         lineHeight = 24.sp,
         letterSpacing = 0.5.sp
     )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
 )

ai-catalog/app/src/main/res/values/strings.xml

@@ -15,7 +15,7 @@
     <string name="imagen_sample_title">Image generation with Imagen</string>
     <string name="imagen_sample_description">Generate images with Imagen, Google image generation model</string>
     <string name="magic_selfie_sample_title">Magic Selfie with Imagen and ML Kit</string>
-    <string name="magic_selfie_sample_description">Change the background of you selfies with Imagen and the ML Kit Segmentation API</string>
+    <string name="magic_selfie_sample_description">Change the background of your selfies with Imagen and the ML Kit Segmentation API</string>
     <string name="gemini_video_summarization_sample_title">Video Summarization with Gemini and Firebase</string>
     <string name="gemini_video_summarization_sample_description">"Generate a summary of a video (from a cloud URL or Youtube) with Gemini API powered by Firebase"</string>
     <string name="firebase_required">Firebase Required</string>

ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/GeminiChatbotScreen.kt

@@ -69,8 +69,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 fun GeminiChatbotScreen (
     viewModel: GeminiChatbotViewModel = hiltViewModel()
 ) {
-
-    val context = LocalContext.current
     val topAppBarState = rememberTopAppBarState()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(topAppBarState)
     val messages by viewModel.messageList.collectAsState()
@@ -90,7 +88,7 @@ fun GeminiChatbotScreen (
                     Text(text = stringResource(id = R.string.geminichatbot_title_bar))
                 },
                 actions = {
-                    SeeCodeButton(context)
+                    SeeCodeButton()
                 }
             )
         }
@@ -189,8 +187,10 @@ fun MessageBubble(
 }
 
 @Composable
-fun SeeCodeButton(context: Context) {
+fun SeeCodeButton() {
+    val context = LocalContext.current
     val githubLink = "https://github.com/android/ai-samples/tree/main/ai-catalog/samples/gemini-chatbot"
+
     Button(
         onClick = {
             val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubLink))

ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/viewmodel/VideoSummarizationViewModel.kt

@@ -51,7 +51,7 @@ class VideoSummarizationViewModel @Inject constructor() : ViewModel() {
             _outputText.value = OutputTextState.Loading
 
             try {
-                val generativeModel = Firebase.ai(backend = GenerativeBackend.googleAI()).generativeModel("gemini-2.0-flash")
+                val generativeModel = Firebase.ai(backend = GenerativeBackend.vertexAI()).generativeModel("gemini-2.0-flash")
 
                 val requestContent = content {
                     fileData(videoSource.toString(), "video/mp4")