Redesign

ai-catalog/app/build.gradle.kts

@@ -80,6 +80,7 @@ dependencies {
     implementation(libs.firebase.ai)
     ksp(libs.hilt.compiler)
 
+    implementation(project(":ui-component"))
     implementation(project(":samples:gemini-multimodal"))
     implementation(project(":samples:gemini-chatbot"))
     implementation(project(":samples:genai-summarization"))

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

@@ -9,7 +9,6 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AISampleCatalog"
         tools:targetApi="31"

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

@@ -22,7 +22,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
 import com.android.ai.catalog.ui.CatalogApp
-import com.android.ai.catalog.ui.theme.AISampleCatalogTheme
+import com.android.ai.theme.AISampleCatalogTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint

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

@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.ai.catalog.ui.domain
+package com.android.ai.catalog.domain
 
+import android.Manifest
+import androidx.annotation.DrawableRes
+import androidx.annotation.RequiresPermission
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
@@ -23,16 +26,17 @@ import com.android.ai.samples.geminichatbot.GeminiChatbotScreen
 import com.android.ai.samples.geminiimagechat.GeminiImageChatScreen
 import com.android.ai.samples.geminilivetodo.ui.TodoScreen
 import com.android.ai.samples.geminimultimodal.ui.GeminiMultimodalScreen
-import com.android.ai.samples.geminivideometadatacreation.VideoMetadataCreationScreen
-import com.android.ai.samples.geminivideosummary.VideoSummarizationScreen
+import com.android.ai.samples.geminivideometadatacreation.ui.VideoMetadataCreationScreen
+import com.android.ai.samples.geminivideosummary.ui.VideoSummarizationScreen
 import com.android.ai.samples.genai_image_description.GenAIImageDescriptionScreen
 import com.android.ai.samples.genai_summarization.GenAISummarizationScreen
 import com.android.ai.samples.genai_writing_assistance.GenAIWritingAssistanceScreen
 import com.android.ai.samples.imagen.ui.ImagenScreen
 import com.android.ai.samples.imagenediting.ui.ImagenEditingScreen
 import com.android.ai.samples.magicselfie.ui.MagicSelfieScreen
+import com.android.ai.theme.extendedColorScheme
 
-@androidx.annotation.RequiresPermission(android.Manifest.permission.RECORD_AUDIO)
+@RequiresPermission(Manifest.permission.RECORD_AUDIO)
 val sampleCatalog = listOf(
     SampleCatalogItem(
         title = R.string.gemini_image_chat,
@@ -49,6 +53,8 @@ val sampleCatalog = listOf(
         sampleEntryScreen = { GeminiMultimodalScreen() },
         tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE),
         needsFirebase = true,
+        isFeatured = true,
+        keyArt = R.drawable.img_keyart_multimodal,
     ),
     SampleCatalogItem(
         title = R.string.gemini_chatbot_sample_title,
@@ -57,27 +63,31 @@ val sampleCatalog = listOf(
         sampleEntryScreen = { GeminiChatbotScreen() },
         tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE),
         needsFirebase = true,
+        keyArt = R.drawable.img_keyart_chatbot,
     ),
     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),
+        keyArt = R.drawable.img_keyart_summary,
     ),
     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),
+        keyArt = R.drawable.img_keyart_img_desc,
     ),
     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),
+        keyArt = R.drawable.img_keyart_text,
     ),
     SampleCatalogItem(
         title = R.string.imagen_sample_title,
@@ -86,14 +96,16 @@ val sampleCatalog = listOf(
         sampleEntryScreen = { ImagenScreen() },
         tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE),
         needsFirebase = true,
+        keyArt = R.drawable.img_keyart_imagen,
     ),
     SampleCatalogItem(
         title = R.string.imagen_editing_sample_title,
         description = R.string.imagen_editing_sample_description,
         route = "ImagenMaskEditing",
         sampleEntryScreen = { ImagenEditingScreen() },
-        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE, SampleTags.MEDIA3),
+        tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE),
         needsFirebase = true,
+        keyArt = R.drawable.img_keyart_imagen,
     ),
     SampleCatalogItem(
         title = R.string.magic_selfie_sample_title,
@@ -102,6 +114,7 @@ val sampleCatalog = listOf(
         sampleEntryScreen = { MagicSelfieScreen() },
         tags = listOf(SampleTags.IMAGEN, SampleTags.FIREBASE, SampleTags.ML_KIT),
         needsFirebase = true,
+        keyArt = R.drawable.img_keyart_magic_selfie,
     ),
     SampleCatalogItem(
         title = R.string.gemini_video_summarization_sample_title,
@@ -118,6 +131,16 @@ val sampleCatalog = listOf(
         sampleEntryScreen = { VideoMetadataCreationScreen() },
         tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE, SampleTags.MEDIA3),
         needsFirebase = true,
+        keyArt = R.drawable.img_keyart_video_summary,
+    ),
+    SampleCatalogItem(
+        title = R.string.gemini_video_metadata_creation_sample_title,
+        description = R.string.gemini_video_metadata_creation_sample_description,
+        route = "VideoMetadataCreationScreen",
+        sampleEntryScreen = { VideoMetadataCreationScreen() },
+        tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE, SampleTags.MEDIA3),
+        needsFirebase = true,
+        keyArt = R.drawable.img_keyart_video_summary,
     ),
     SampleCatalogItem(
         title = R.string.gemini_live_todo_title,
@@ -126,6 +149,7 @@ val sampleCatalog = listOf(
         sampleEntryScreen = { TodoScreen() },
         tags = listOf(SampleTags.GEMINI_FLASH, SampleTags.FIREBASE),
         needsFirebase = true,
+        keyArt = R.drawable.img_keyart_todo,
     ),
 
     // To create a new sample entry, add a new SampleCatalogItem here.
@@ -138,17 +162,18 @@ data class SampleCatalogItem(
     val sampleEntryScreen: @Composable () -> Unit,
     val tags: List<SampleTags> = emptyList(),
     val needsFirebase: Boolean = false,
+    val isFeatured: Boolean = false,
+    @DrawableRes val keyArt: Int? = null,
 )
 
 enum class SampleTags(
     val label: String,
     val backgroundColor: Color,
-    val textColor: Color,
 ) {
-    FIREBASE("Firebase", Color(0xFFFF9100), Color.White),
-    GEMINI_FLASH("Gemini Flash", Color(0xFF4285F4), Color.White),
-    GEMINI_NANO("Gemini Nano", Color(0xFF7abafe), Color.White),
-    IMAGEN("Imagen", Color(0xFF7CB342), Color.White),
-    MEDIA3("Media3", Color(0xFF7CB584), Color.White),
-    ML_KIT("ML Kit", Color.White, Color(0xFF4285F4)),
+    FIREBASE("Firebase", extendedColorScheme.firebase),
+    GEMINI_FLASH("Gemini Flash", extendedColorScheme.geminiProFlash),
+    GEMINI_NANO("Gemini Nano", extendedColorScheme.geminiNano),
+    IMAGEN("Imagen", extendedColorScheme.imagen),
+    MEDIA3("Media3", extendedColorScheme.media3),
+    ML_KIT("ML Kit", extendedColorScheme.mLKit),
 }