internal changes

PiperOrigin-RevId: 865031389

Author: Google AI Edge Gallery

Android/src/app/src/main/java/com/google/ai/edge/gallery/CutoutsSerializer.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * 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
+ *
+ *     http://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.google.ai.edge.gallery
+
+import androidx.datastore.core.CorruptionException
+import androidx.datastore.core.Serializer
+import com.google.ai.edge.gallery.proto.CutoutCollection
+import com.google.protobuf.InvalidProtocolBufferException
+import java.io.InputStream
+import java.io.OutputStream
+
+object CutoutsSerializer : Serializer<CutoutCollection> {
+  override val defaultValue: CutoutCollection = CutoutCollection.getDefaultInstance()
+
+  override suspend fun readFrom(input: InputStream): CutoutCollection {
+    try {
+      return CutoutCollection.parseFrom(input)
+    } catch (exception: InvalidProtocolBufferException) {
+      throw CorruptionException("Cannot read proto.", exception)
+    }
+  }
+
+  override suspend fun writeTo(t: CutoutCollection, output: OutputStream) = t.writeTo(output)
+}

Android/src/app/src/main/java/com/google/ai/edge/gallery/common/Utils.kt

@@ -25,11 +25,13 @@ import android.util.Log
 import androidx.exifinterface.media.ExifInterface
 import com.google.ai.edge.gallery.data.SAMPLE_RATE
 import com.google.gson.Gson
+import java.io.File
 import java.io.FileInputStream
 import java.net.HttpURLConnection
 import java.net.URL
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
+import java.nio.channels.FileChannel
 import kotlin.math.abs
 import kotlin.math.floor
 import kotlin.math.max
@@ -298,3 +300,18 @@ private fun calculateInSampleSize(
 
   return inSampleSize
 }
+
+fun readFileToByteBuffer(file: File): ByteBuffer? {
+  return try {
+    val fileInputStream = FileInputStream(file)
+    val fileChannel: FileChannel = fileInputStream.channel
+    val byteBuffer = ByteBuffer.allocateDirect(fileChannel.size().toInt())
+    fileChannel.read(byteBuffer)
+    byteBuffer.rewind()
+    fileInputStream.close()
+    byteBuffer
+  } catch (e: Exception) {
+    e.printStackTrace()
+    null
+  }
+}

Android/src/app/src/main/java/com/google/ai/edge/gallery/customtasks/common/CustomTaskData.kt

@@ -38,6 +38,7 @@ data class CustomTaskData(
   val bottomPadding: Dp = 0.dp,
   val setAppBarControlsDisabled: (Boolean) -> Unit = {},
   val setTopBarVisible: (Boolean) -> Unit = {},
+  val setCustomNavigateUpCallback: ((() -> Unit)?) -> Unit = {},
 )
 
 data class CustomTaskDataForBuiltinTask(

Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DataStoreRepository.kt

@@ -18,6 +18,8 @@ package com.google.ai.edge.gallery.data
 
 import androidx.datastore.core.DataStore
 import com.google.ai.edge.gallery.proto.AccessTokenData
+import com.google.ai.edge.gallery.proto.Cutout
+import com.google.ai.edge.gallery.proto.CutoutCollection
 import com.google.ai.edge.gallery.proto.ImportedModel
 import com.google.ai.edge.gallery.proto.Settings
 import com.google.ai.edge.gallery.proto.Theme
@@ -52,12 +54,21 @@ interface DataStoreRepository {
   fun getHasRunTinyGarden(): Boolean
 
   fun setHasRunTinyGarden(hasRun: Boolean)
+
+  fun addCutout(cutout: Cutout)
+
+  fun getAllCutouts(): List<Cutout>
+
+  fun setCutout(newCutout: Cutout)
+
+  fun setCutouts(cutouts: List<Cutout>)
 }
 
 /** Repository for managing data using Proto DataStore. */
 class DefaultDataStoreRepository(
   private val dataStore: DataStore<Settings>,
   private val userDataDataStore: DataStore<UserData>,
+  private val cutoutDataStore: DataStore<CutoutCollection>,
 ) : DataStoreRepository {
   override fun saveTextInputHistory(history: List<String>) {
     runBlocking {
@@ -167,4 +178,40 @@ class DefaultDataStoreRepository(
       dataStore.updateData { settings -> settings.toBuilder().setHasRunTinyGarden(hasRun).build() }
     }
   }
+
+  override fun addCutout(cutout: Cutout) {
+    runBlocking {
+      cutoutDataStore.updateData { cutouts -> cutouts.toBuilder().addCutout(cutout).build() }
+    }
+  }
+
+  override fun getAllCutouts(): List<Cutout> {
+    return runBlocking { cutoutDataStore.data.first().cutoutList }
+  }
+
+  override fun setCutout(newCutout: Cutout) {
+    runBlocking {
+      cutoutDataStore.updateData { cutouts ->
+        var index = -1
+        for (i in 0..<cutouts.cutoutCount) {
+          val cutout = cutouts.cutoutList.get(i)
+          if (cutout.id == newCutout.id) {
+            index = i
+            break
+          }
+        }
+        if (index >= 0) {
+          cutouts.toBuilder().setCutout(index, newCutout).build()
+        } else {
+          cutouts
+        }
+      }
+    }
+  }
+
+  override fun setCutouts(cutouts: List<Cutout>) {
+    runBlocking {
+      cutoutDataStore.updateData { CutoutCollection.newBuilder().addAllCutout(cutouts).build() }
+    }
+  }
 }

Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Tasks.kt

@@ -100,6 +100,9 @@ data class Task(
   /** Whether the task is experimental. */
   val experimental: Boolean = false,
 
+  /** Whether to use theme color instead of the task tint color. */
+  val useThemeColor: Boolean = false,
+
   // The following fields are only used for built-in tasks. Can ignore if you are creating your own
   // custom tasks.
   //
@@ -124,6 +127,7 @@ object BuiltInTaskId {
   const val LLM_ASK_AUDIO = "llm_ask_audio"
   const val LLM_MOBILE_ACTIONS = "llm_mobile_actions"
   const val LLM_TINY_GARDEN = "llm_tiny_garden"
+  const val MP_SCRAPBOOK = "mp_scrapbook"
 }
 
 private val allLegacyTaskIds: Set<String> =

Android/src/app/src/main/java/com/google/ai/edge/gallery/di/AppModule.kt

@@ -22,13 +22,15 @@ import androidx.datastore.core.DataStoreFactory
 import androidx.datastore.core.Serializer
 import androidx.datastore.dataStoreFile
 import com.google.ai.edge.gallery.AppLifecycleProvider
+import com.google.ai.edge.gallery.CutoutsSerializer
 import com.google.ai.edge.gallery.GalleryLifecycleProvider
 import com.google.ai.edge.gallery.SettingsSerializer
 import com.google.ai.edge.gallery.UserDataSerializer
 import com.google.ai.edge.gallery.data.DataStoreRepository
 import com.google.ai.edge.gallery.data.DefaultDataStoreRepository
 import com.google.ai.edge.gallery.data.DefaultDownloadRepository
 import com.google.ai.edge.gallery.data.DownloadRepository
+import com.google.ai.edge.gallery.proto.CutoutCollection
 import com.google.ai.edge.gallery.proto.Settings
 import com.google.ai.edge.gallery.proto.UserData
 import dagger.Module
@@ -49,6 +51,13 @@ internal object AppModule {
     return SettingsSerializer
   }
 
+  // Provides the CutoutSerializer
+  @Provides
+  @Singleton
+  fun provideCutoutSerializer(): Serializer<CutoutCollection> {
+    return CutoutsSerializer
+  }
+
   // Provides the UserDataSerializer
   @Provides
   @Singleton
@@ -69,6 +78,19 @@ internal object AppModule {
     )
   }
 
+  // Provides DataStore<CutoutCollection>
+  @Provides
+  @Singleton
+  fun provideCutoutsDataStore(
+    @ApplicationContext context: Context,
+    cutoutsSerializer: Serializer<CutoutCollection>,
+  ): DataStore<CutoutCollection> {
+    return DataStoreFactory.create(
+      serializer = cutoutsSerializer,
+      produceFile = { context.dataStoreFile("cutouts.pb") },
+    )
+  }
+
   // Provides DataStore<UserData>
   @Provides
   @Singleton
@@ -95,8 +117,9 @@ internal object AppModule {
   fun provideDataStoreRepository(
     dataStore: DataStore<Settings>,
     userDataDataStore: DataStore<UserData>,
+    cutoutsDataStore: DataStore<CutoutCollection>,
   ): DataStoreRepository {
-    return DefaultDataStoreRepository(dataStore, userDataDataStore)
+    return DefaultDataStoreRepository(dataStore, userDataDataStore, cutoutsDataStore)
   }
 
   // Provides DownloadRepository

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ColorUtils.kt

@@ -24,24 +24,25 @@ import com.google.ai.edge.gallery.ui.theme.customColors
 
 @Composable
 fun getTaskBgColor(task: Task): Color {
-  val colorIndex: Int = task.index % MaterialTheme.customColors.taskBgColors.size
+  val colorIndex: Int = (task.index.coerceAtLeast(0)) % MaterialTheme.customColors.taskBgColors.size
   return MaterialTheme.customColors.taskBgColors[colorIndex]
 }
 
 @Composable
 fun getTaskBgGradientColors(task: Task): List<Color> {
-  val colorIndex: Int = task.index % MaterialTheme.customColors.taskBgColors.size
+  val colorIndex: Int = (task.index.coerceAtLeast(0)) % MaterialTheme.customColors.taskBgColors.size
   return MaterialTheme.customColors.taskBgGradientColors[colorIndex]
 }
 
 @Composable
 fun getTaskIconColor(task: Task): Color {
-  val colorIndex: Int = task.index % MaterialTheme.customColors.taskIconColors.size
+  val colorIndex: Int =
+    (task.index.coerceAtLeast(0)) % MaterialTheme.customColors.taskIconColors.size
   return MaterialTheme.customColors.taskIconColors[colorIndex]
 }
 
 @Composable
 fun getTaskIconColor(index: Int): Color {
-  val colorIndex: Int = index % MaterialTheme.customColors.taskIconColors.size
+  val colorIndex: Int = (index.coerceAtLeast(0)) % MaterialTheme.customColors.taskIconColors.size
   return MaterialTheme.customColors.taskIconColors[colorIndex]
 }

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/EmptyState.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * 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
+ *
+ *     http://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.google.ai.edge.gallery.ui.common
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+data class EmptyStateButtonConfig(
+  @StringRes val buttonLabelResId: Int,
+  val buttonIcon: ImageVector? = null,
+  val onButtonClick: () -> Unit = {},
+  val extraContent: @Composable () -> Unit = {},
+)
+
+/**
+ * A composable function to display an empty state with an icon, title, description, and an optional
+ * button.
+ */
+@Composable
+fun EmptyState(
+  icon: ImageVector,
+  @StringRes titleResId: Int,
+  @StringRes descriptionResId: Int,
+  buttonConfig: EmptyStateButtonConfig? = null,
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    verticalArrangement = Arrangement.spacedBy(16.dp),
+    modifier = Modifier.padding(horizontal = 48.dp),
+  ) {
+    Icon(
+      icon,
+      contentDescription = null,
+      modifier = Modifier.size(56.dp),
+      tint = MaterialTheme.colorScheme.onSurfaceVariant,
+    )
+    Text(
+      stringResource(titleResId),
+      style = MaterialTheme.typography.headlineMedium,
+      color = MaterialTheme.colorScheme.onSurface,
+      textAlign = TextAlign.Center,
+    )
+    Text(
+      stringResource(descriptionResId),
+      style = MaterialTheme.typography.bodyLarge,
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      textAlign = TextAlign.Center,
+    )
+    if (buttonConfig != null) {
+      Box {
+        Button(
+          contentPadding = SMALL_BUTTON_CONTENT_PADDING,
+          onClick = buttonConfig.onButtonClick,
+        ) {
+          if (buttonConfig.buttonIcon != null) {
+            Icon(
+              buttonConfig.buttonIcon,
+              contentDescription = null,
+              modifier = Modifier.padding(end = 8.dp).size(20.dp),
+            )
+          }
+          Text(stringResource(buttonConfig.buttonLabelResId))
+        }
+        buttonConfig.extraContent()
+      }
+    }
+  }
+}

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt

@@ -73,6 +73,7 @@ fun ModelPageAppBar(
   onResetSessionClicked: (Model) -> Unit = {},
   canShowResetSessionButton: Boolean = false,
   hideModelSelector: Boolean = false,
+  useThemeColor: Boolean = false,
   onConfigChanged: (oldConfigValues: Map<String, Any>, newConfigValues: Map<String, Any>) -> Unit =
     { _, _ ->
     },
@@ -96,19 +97,18 @@ fun ModelPageAppBar(
         // Task type.
         Row(
           verticalAlignment = Alignment.CenterVertically,
-          horizontalArrangement = Arrangement.spacedBy(6.dp),
+          horizontalArrangement = Arrangement.spacedBy(10.dp),
         ) {
+          val tintColor =
+            if (useThemeColor) MaterialTheme.colorScheme.onSurface
+            else getTaskIconColor(task = task)
           Icon(
             task.icon ?: ImageVector.vectorResource(task.iconVectorResourceId!!),
-            tint = getTaskIconColor(task = task),
-            modifier = Modifier.size(16.dp),
+            tint = tintColor,
+            modifier = Modifier.size(24.dp),
             contentDescription = null,
           )
-          Text(
-            task.label,
-            style = MaterialTheme.typography.titleMedium,
-            color = getTaskIconColor(task = task),
-          )
+          Text(task.label, style = MaterialTheme.typography.titleMedium, color = tintColor)
         }
 
         // Model chips pager.