From 6aa6c751bddf52d6ba44834546f2e47e51f4b7ba Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Sat, 17 May 2025 15:07:15 -0700
Subject: [PATCH 001/336] Create model_allowlist.json
---
model_allowlist.json | 49 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 model_allowlist.json
diff --git a/model_allowlist.json b/model_allowlist.json
new file mode 100644
index 000000000..8d4ffcea6
--- /dev/null
+++ b/model_allowlist.json
@@ -0,0 +1,49 @@
+{
+ "models": [
+ {
+ "name": "Gemma3-1B-IT q4",
+ "modelId": "litert-community/Gemma3-1B-IT",
+ "modelFile": "Gemma3-1B-IT_multi-prefill-seq_q4_ekv2048.task",
+ "description": "A variant of [google/Gemma-3-1B-IT](https://huggingface.co/google/Gemma-3-1B-IT) with 4-bit quantization ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference)",
+ "sizeInBytes": 554661246,
+ "version": "20250514",
+ "defaultConfig": {
+ "topK": 64,
+ "topP": 0.95,
+ "temperature": 1.0,
+ "accelerators": "cpu,gpu"
+ },
+ "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_usecases"]
+ },
+ {
+ "name": "Hammer2.1-1.5b q8",
+ "modelId": "litert-community/Hammer2.1-1.5b",
+ "modelFile": "Hammer2.1-1.5b_multi-prefill-seq_q8_ekv1280.task",
+ "description": "A variant of [MadeAgents/Hammer2.1-1.5b](https://huggingface.co/MadeAgents/Hammer2.1-1.5b) with 8-bit quantization ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference)",
+ "sizeInBytes": 1617946305,
+ "version": "20250514",
+ "defaultConfig": {
+ "topK": 40,
+ "topP": 0.95,
+ "temperature": 1.0,
+ "accelerators": "cpu,gpu"
+ },
+ "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_usecases"]
+ },
+ {
+ "name": "Qwen2.5-1.5B-Instruct q8",
+ "modelId": "litert-community/Qwen2.5-1.5B-Instruct",
+ "modelFile": "Qwen2.5-1.5B-Instruct_multi-prefill-seq_q8_ekv1280.task",
+ "description": "A variant of [Qwen/Qwen2.5-1.5B-Instruct](https://huggingface.co/Qwen/Qwen2.5-1.5B-Instruct) with 8-bit quantization ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference)",
+ "sizeInBytes": 1625493432,
+ "version": "20250514",
+ "defaultConfig": {
+ "topK": 40,
+ "topP": 0.95,
+ "temperature": 1.0,
+ "accelerators": "cpu"
+ },
+ "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_usecases"]
+ }
+ ]
+}
From 0c49efc054ac282d38baee3625dfd99af7928c22 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Sat, 17 May 2025 15:10:06 -0700
Subject: [PATCH 002/336] Update README.md
---
README.md | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 5fadf33b6..4dca702cb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-# AI Edge Gallery
-
-The AI Edge Gallery aims to provide developers and consumers with an easy-to-use
-Android and iOS application to explore, download, and interactively experience
-various Google AI Edge on-device machine learning (ODML) capabilities
-directly on their devices.
+# Google AI Edge Gallery
+Google AI Edge Gallery is a mobile application designed to showcase the capabilities of Google AI Edge models, APIs, and tools. It serves as an interactive playground for developers and potentially tech enthusiasts to explore, experience, and evaluate various on-device ML models (primarily LiteRT-based) directly on their Android and iOS (coming soon) devices.
From 37a58d1a41c774295d97a0d61edc7906414e1db3 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Sat, 17 May 2025 15:11:52 -0700
Subject: [PATCH 003/336] Various bug fixes.
---
Android/src/app/build.gradle.kts | 4 +-
Android/src/app/src/main/AndroidManifest.xml | 4 +-
.../com/google/aiedge/gallery/GalleryApp.kt | 23 -
.../gallery/data/DataStoreRepository.kt | 15 +-
.../aiedge/gallery/data/ModelAllowlist.kt | 2 +-
.../com/google/aiedge/gallery/data/Tasks.kt | 24 +-
.../aiedge/gallery/ui/ViewModelProvider.kt | 6 +-
.../gallery/ui/common/DownloadAndTryButton.kt | 28 +-
.../gallery/ui/common/ModelPageAppBar.kt | 12 +-
.../ui/common/ModelPickerChipsPager.kt | 9 +-
.../google/aiedge/gallery/ui/common/Utils.kt | 42 +-
.../gallery/ui/common/chat/ChatPanel.kt | 657 +++++++++++-------
.../aiedge/gallery/ui/common/chat/ChatView.kt | 11 +-
.../gallery/ui/common/chat/ChatViewModel.kt | 9 +
.../gallery/ui/common/chat/ConfigDialog.kt | 31 +-
.../ui/common/chat/MessageBodyImage.kt | 5 +-
.../gallery/ui/common/chat/MessageBodyInfo.kt | 8 +-
.../ui/common/chat/MessageInputText.kt | 9 +-
.../gallery/ui/common/modelitem/ModelItem.kt | 348 ++++------
.../common/modelitem/ModelItemActionButton.kt | 3 +-
.../ui/common/modelitem/ModelNameAndStatus.kt | 224 +++---
.../aiedge/gallery/ui/home/HomeScreen.kt | 253 ++++---
.../gallery/ui/home/ModelImportDialog.kt | 83 +--
.../gallery/ui/home/NewReleaseNotification.kt | 121 ++++
.../aiedge/gallery/ui/home/SettingsDialog.kt | 279 +++++++-
.../gallery/ui/llmchat/LlmChatScreen.kt | 15 +-
.../gallery/ui/llmchat/LlmChatViewModel.kt | 109 +--
.../ui/llmsingleturn/LlmSingleTurnScreen.kt | 3 +
.../llmsingleturn/LlmSingleTurnViewModel.kt | 19 +-
.../ui/llmsingleturn/PromptTemplatesPanel.kt | 2 +-
.../gallery/ui/llmsingleturn/ResponsePanel.kt | 6 +-
.../gallery/ui/modelmanager/ModelList.kt | 4 +-
.../ui/modelmanager/ModelManagerViewModel.kt | 89 +--
.../gallery/ui/navigation/GalleryNavGraph.kt | 20 +-
.../ui/preview/PreviewDataStoreRepository.kt | 3 +
35 files changed, 1501 insertions(+), 979 deletions(-)
create mode 100644 Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index d21b0092e..091b60c65 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -27,10 +27,10 @@ android {
defaultConfig {
applicationId = "com.google.aiedge.gallery"
- minSdk = 24
+ minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "20250428"
+ versionName = "0.9.0"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth"
diff --git a/Android/src/app/src/main/AndroidManifest.xml b/Android/src/app/src/main/AndroidManifest.xml
index 4d3c83203..1f7f37e89 100644
--- a/Android/src/app/src/main/AndroidManifest.xml
+++ b/Android/src/app/src/main/AndroidManifest.xml
@@ -41,7 +41,9 @@
android:name=".MainActivity"
android:exported="true"
android:theme="@style/Theme.Gallery.SplashScreen"
- android:windowSoftInputMode="adjustResize">
+ android:screenOrientation="portrait"
+ android:windowSoftInputMode="adjustResize"
+ tools:ignore="DiscouragedApi,LockedOrientationActivity">
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
index 4cd0fa8a7..9fb9caa42 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
@@ -68,7 +68,6 @@ fun GalleryTopAppBar(
leftAction: AppBarAction? = null,
rightAction: AppBarAction? = null,
scrollBehavior: TopAppBarScrollBehavior? = null,
- loadingHfModels: Boolean = false,
subtitle: String = "",
) {
CenterAlignedTopAppBar(
@@ -151,28 +150,6 @@ fun GalleryTopAppBar(
}
}
- // Click an icon to open "download manager".
- AppBarActionType.DOWNLOAD_MANAGER -> {
- if (loadingHfModels) {
- CircularProgressIndicator(
- trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
- strokeWidth = 3.dp,
- modifier = Modifier
- .padding(end = 12.dp)
- .size(20.dp)
- )
- }
-// else {
-// IconButton(onClick = rightAction.actionFn) {
-// Icon(
-// imageVector = Deployed_code,
-// contentDescription = "",
-// tint = MaterialTheme.colorScheme.primary
-// )
-// }
-// }
- }
-
AppBarActionType.MODEL_SELECTOR -> {
Text("ms")
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt
index d1cc28db9..304658034 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt
@@ -37,7 +37,7 @@ import javax.crypto.SecretKey
data class AccessTokenData(
val accessToken: String,
val refreshToken: String,
- val expiresAtSeconds: Long
+ val expiresAtMs: Long
)
interface DataStoreRepository {
@@ -46,6 +46,7 @@ interface DataStoreRepository {
fun saveThemeOverride(theme: String)
fun readThemeOverride(): String
fun saveAccessTokenData(accessToken: String, refreshToken: String, expiresAt: Long)
+ fun clearAccessTokenData()
fun readAccessTokenData(): AccessTokenData?
fun saveImportedModels(importedModels: List)
fun readImportedModels(): List
@@ -135,6 +136,18 @@ class DefaultDataStoreRepository(
}
}
+ override fun clearAccessTokenData() {
+ return runBlocking {
+ dataStore.edit { preferences ->
+ preferences.remove(PreferencesKeys.ENCRYPTED_ACCESS_TOKEN)
+ preferences.remove(PreferencesKeys.ACCESS_TOKEN_IV)
+ preferences.remove(PreferencesKeys.ENCRYPTED_REFRESH_TOKEN)
+ preferences.remove(PreferencesKeys.REFRESH_TOKEN_IV)
+ preferences.remove(PreferencesKeys.ACCESS_TOKEN_EXPIRES_AT)
+ }
+ }
+ }
+
override fun readAccessTokenData(): AccessTokenData? {
return runBlocking {
val preferences = dataStore.data.first()
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt
index 5d301e9cb..02b97c1f4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt
@@ -43,7 +43,7 @@ data class AllowedModel(
// Config.
val isLlmModel =
- taskTypes.contains(TASK_LLM_CHAT.type.id) || taskTypes.contains(TASK_LLM_USECASES.type.id)
+ taskTypes.contains(TASK_LLM_CHAT.type.id) || taskTypes.contains(TASK_LLM_PROMPT_LAB.type.id)
var configs: List = listOf()
if (isLlmModel) {
var defaultTopK: Int = DEFAULT_TOPK
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt
index 62180467a..64ce7a530 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt
@@ -32,9 +32,9 @@ enum class TaskType(val label: String, val id: String) {
TEXT_CLASSIFICATION(label = "Text Classification", id = "text_classification"),
IMAGE_CLASSIFICATION(label = "Image Classification", id = "image_classification"),
IMAGE_GENERATION(label = "Image Generation", id = "image_generation"),
- LLM_CHAT(label = "LLM Chat", id = "llm_chat"),
- LLM_USECASES(label = "LLM Use Cases", id = "llm_usecases"),
- LLM_IMAGE_TO_TEXT(label = "LLM Image to Text", id = "llm_image_to_text"),
+ LLM_CHAT(label = "AI Chat", id = "llm_chat"),
+ LLM_PROMPT_LAB(label = "Prompt Lab", id = "llm_prompt_lab"),
+ LLM_ASK_IMAGE(label = "Ask Image", id = "llm_ask_image"),
TEST_TASK_1(label = "Test task 1", id = "test_task_1"),
TEST_TASK_2(label = "Test task 2", id = "test_task_2")
@@ -93,7 +93,6 @@ val TASK_IMAGE_CLASSIFICATION = Task(
val TASK_LLM_CHAT = Task(
type = TaskType.LLM_CHAT,
icon = Icons.Outlined.Forum,
-// models = MODELS_LLM,
models = mutableListOf(),
description = "Chat with on-device large language models",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android",
@@ -101,10 +100,9 @@ val TASK_LLM_CHAT = Task(
textInputPlaceHolderRes = R.string.text_input_placeholder_llm_chat
)
-val TASK_LLM_USECASES = Task(
- type = TaskType.LLM_USECASES,
+val TASK_LLM_PROMPT_LAB = Task(
+ type = TaskType.LLM_PROMPT_LAB,
icon = Icons.Outlined.Widgets,
-// models = MODELS_LLM,
models = mutableListOf(),
description = "Single turn use cases with on-device large language model",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android",
@@ -112,10 +110,9 @@ val TASK_LLM_USECASES = Task(
textInputPlaceHolderRes = R.string.text_input_placeholder_llm_chat
)
-val TASK_LLM_IMAGE_TO_TEXT = Task(
- type = TaskType.LLM_IMAGE_TO_TEXT,
+val TASK_LLM_ASK_IMAGE = Task(
+ type = TaskType.LLM_ASK_IMAGE,
icon = Icons.Outlined.Mms,
-// models = MODELS_LLM,
models = mutableListOf(),
description = "Ask questions about images with on-device large language models",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android",
@@ -135,12 +132,9 @@ val TASK_IMAGE_GENERATION = Task(
/** All tasks. */
val TASKS: List = listOf(
-// TASK_TEXT_CLASSIFICATION,
-// TASK_IMAGE_CLASSIFICATION,
-// TASK_IMAGE_GENERATION,
- TASK_LLM_USECASES,
+ TASK_LLM_ASK_IMAGE,
+ TASK_LLM_PROMPT_LAB,
TASK_LLM_CHAT,
- TASK_LLM_IMAGE_TO_TEXT
)
fun getModelByName(name: String): Model? {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt
index bc3d4ab60..cf224719f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt
@@ -25,7 +25,7 @@ import com.google.aiedge.gallery.GalleryApplication
import com.google.aiedge.gallery.ui.imageclassification.ImageClassificationViewModel
import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationViewModel
import com.google.aiedge.gallery.ui.llmchat.LlmChatViewModel
-import com.google.aiedge.gallery.ui.llmchat.LlmImageToTextViewModel
+import com.google.aiedge.gallery.ui.llmchat.LlmAskImageViewModel
import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnViewModel
import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.aiedge.gallery.ui.textclassification.TextClassificationViewModel
@@ -63,9 +63,9 @@ object ViewModelProvider {
LlmSingleTurnViewModel()
}
- // Initializer for LlmImageToTextViewModel.
+ // Initializer for LlmAskImageViewModel.
initializer {
- LlmImageToTextViewModel()
+ LlmAskImageViewModel()
}
// Initializer for ImageGenerationViewModel.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt
index ba156ca11..b2871db40 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt
@@ -26,6 +26,8 @@ import androidx.browser.customtabs.CustomTabsIntent
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.foundation.text.TextAutoSize
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowForward
import androidx.compose.material.icons.rounded.Error
@@ -48,6 +50,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
import com.google.aiedge.gallery.data.Model
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
@@ -291,11 +294,32 @@ fun DownloadAndTryButton(
modifier = Modifier.padding(end = 4.dp)
)
+ val textColor = MaterialTheme.colorScheme.onPrimary
if (checkingToken) {
- Text("Checking access...")
+ BasicText(
+ text = "Checking access...",
+ maxLines = 1,
+ color = { textColor },
+ style = MaterialTheme.typography.bodyMedium,
+ autoSize = TextAutoSize.StepBased(
+ minFontSize = 8.sp,
+ maxFontSize = 14.sp,
+ stepSize = 1.sp
+ )
+ )
} else {
if (needToDownloadFirst) {
- Text("Download & Try it", maxLines = 1)
+ BasicText(
+ text = "Download & Try",
+ maxLines = 1,
+ color = { textColor },
+ style = MaterialTheme.typography.bodyMedium,
+ autoSize = TextAutoSize.StepBased(
+ minFontSize = 8.sp,
+ maxFontSize = 14.sp,
+ stepSize = 1.sp
+ )
+ )
} else {
Text("Try it", maxLines = 1)
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt
index c9b17e356..8986bf112 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt
@@ -63,6 +63,8 @@ fun ModelPageAppBar(
modelManagerViewModel: ModelManagerViewModel,
onBackClicked: () -> Unit,
onModelSelected: (Model) -> Unit,
+ inProgress: Boolean,
+ modelPreparing: Boolean,
modifier: Modifier = Modifier,
isResettingSession: Boolean = false,
onResetSessionClicked: (Model) -> Unit = {},
@@ -129,15 +131,16 @@ fun ModelPageAppBar(
val isModelInitializing =
modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING
if (showConfigButton) {
+ val enableConfigButton = !isModelInitializing && !inProgress
IconButton(
onClick = {
showConfigDialog = true
},
- enabled = !isModelInitializing,
+ enabled = enableConfigButton,
modifier = Modifier
.scale(0.75f)
.offset(x = configButtonOffset)
- .alpha(if (isModelInitializing) 0.5f else 1f)
+ .alpha(if (!enableConfigButton) 0.5f else 1f)
) {
Icon(
imageVector = Icons.Rounded.Tune,
@@ -154,14 +157,15 @@ fun ModelPageAppBar(
modifier = Modifier.size(16.dp)
)
} else {
+ val enableResetButton = !isModelInitializing && !modelPreparing
IconButton(
onClick = {
onResetSessionClicked(model)
},
- enabled = !isModelInitializing,
+ enabled = enableResetButton,
modifier = Modifier
.scale(0.75f)
- .alpha(if (isModelInitializing) 0.5f else 1f)
+ .alpha(if (!enableResetButton) 0.5f else 1f)
) {
Icon(
imageVector = Icons.Rounded.MapsUgc,
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt
index b4636f521..160d4545a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt
@@ -83,8 +83,11 @@ fun ModelPickerChipsPager(
val scope = rememberCoroutineScope()
val density = LocalDensity.current
val windowInfo = LocalWindowInfo.current
- val screenWidthDp =
- remember { with(density) { windowInfo.containerSize.width.toDp() } }
+ val screenWidthDp = remember {
+ with(density) {
+ windowInfo.containerSize.width.toDp()
+ }
+ }
val pagerState = rememberPagerState(initialPage = task.models.indexOf(initialModel),
pageCount = { task.models.size })
@@ -147,7 +150,7 @@ fun ModelPickerChipsPager(
}
Text(
model.name,
- style = MaterialTheme.typography.labelSmall,
+ style = MaterialTheme.typography.labelMedium,
modifier = Modifier
.padding(start = 4.dp)
.widthIn(0.dp, screenWidthDp - 250.dp),
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
index da4d98d19..665a07374 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
@@ -21,6 +21,7 @@ import android.content.Context
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
+import android.util.Log
import androidx.activity.compose.ManagedActivityResultLauncher
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@@ -39,7 +40,11 @@ import com.google.aiedge.gallery.ui.common.chat.Histogram
import com.google.aiedge.gallery.ui.common.chat.Stat
import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.aiedge.gallery.ui.theme.customColors
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
import kotlin.math.abs
import kotlin.math.ln
import kotlin.math.max
@@ -487,4 +492,39 @@ fun processLlmResponse(response: String): String {
newContent = newContent.replace("\\n", "\n")
return newContent
-}
\ No newline at end of file
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+inline fun getJsonResponse(url: String): T? {
+ try {
+ val connection = URL(url).openConnection() as HttpURLConnection
+ connection.requestMethod = "GET"
+ connection.connect()
+
+ val responseCode = connection.responseCode
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ val inputStream = connection.inputStream
+ val response = inputStream.bufferedReader().use { it.readText() }
+
+ // Parse JSON using kotlinx.serialization
+ val json = Json {
+ // Handle potential extra fields
+ ignoreUnknownKeys = true
+ allowComments = true
+ allowTrailingComma = true
+ }
+ val jsonObj = json.decodeFromString(response)
+ return jsonObj
+ } else {
+ Log.e("AGUtils", "HTTP error: $responseCode")
+ }
+ } catch (e: Exception) {
+ Log.e(
+ "AGUtils",
+ "Error when getting json response: ${e.message}"
+ )
+ e.printStackTrace()
+ }
+
+ return null
+}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
index ea1c650d8..5ce0f4b61 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
@@ -16,9 +16,14 @@
package com.google.aiedge.gallery.ui.common.chat
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.animation.SharedTransitionLayout
+import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.gestures.detectTransformGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -28,6 +33,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@@ -39,12 +45,15 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Timer
+import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.ContentCopy
import androidx.compose.material.icons.rounded.Refresh
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.SnackbarHost
@@ -55,6 +64,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -65,12 +75,16 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
import androidx.compose.ui.input.nestedscroll.NestedScrollSource
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
@@ -80,6 +94,7 @@ import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import com.google.aiedge.gallery.R
@@ -102,7 +117,7 @@ enum class ChatInputType {
/**
* Composable function for the main chat panel, displaying messages and handling user input.
*/
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
@Composable
fun ChatPanel(
modelManagerViewModel: ModelManagerViewModel,
@@ -127,6 +142,7 @@ fun ChatPanel(
val snackbarHostState = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
val haptic = LocalHapticFeedback.current
+ var selectedImageMessage by remember { mutableStateOf(null) }
var curMessage by remember { mutableStateOf("") } // Correct state
val focusManager = LocalFocusManager.current
@@ -200,291 +216,378 @@ fun ChatPanel(
}
}
- val modelInitializationStatus =
- modelManagerUiState.modelInitializationStatus[selectedModel.name]
+ val modelInitializationStatus = modelManagerUiState.modelInitializationStatus[selectedModel.name]
LaunchedEffect(modelInitializationStatus) {
showErrorDialog = modelInitializationStatus?.status == ModelInitializationStatusType.ERROR
}
- Column(
- modifier = modifier.imePadding()
- ) {
- Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.weight(1f)) {
- LazyColumn(
- modifier = Modifier
- .fillMaxSize()
- .nestedScroll(nestedScrollConnection),
- state = listState, verticalArrangement = Arrangement.Top,
+ SharedTransitionLayout(modifier = Modifier.fillMaxSize()) {
+ AnimatedContent(targetState = selectedImageMessage) { targetSelectedImageMessage ->
+ Column(
+ modifier = modifier.imePadding()
) {
- items(messages) { message ->
- val imageHistoryCurIndex = remember { mutableIntStateOf(0) }
- var hAlign: Alignment.Horizontal = Alignment.End
- var backgroundColor: Color = MaterialTheme.customColors.userBubbleBgColor
- var hardCornerAtLeftOrRight = false
- var extraPaddingStart = 48.dp
- var extraPaddingEnd = 0.dp
- if (message.side == ChatSide.AGENT) {
- hAlign = Alignment.Start
- backgroundColor = MaterialTheme.customColors.agentBubbleBgColor
- hardCornerAtLeftOrRight = true
- extraPaddingStart = 0.dp
- extraPaddingEnd = 48.dp
- } else if (message.side == ChatSide.SYSTEM) {
- extraPaddingStart = 24.dp
- extraPaddingEnd = 24.dp
- if (message.type == ChatMessageType.PROMPT_TEMPLATES) {
- extraPaddingStart = 12.dp
- extraPaddingEnd = 12.dp
- }
- }
- if (message.type == ChatMessageType.IMAGE) {
- backgroundColor = Color.Transparent
- }
- val bubbleBorderRadius = dimensionResource(R.dimen.chat_bubble_corner_radius)
-
- Column(
+ Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.weight(1f)) {
+ LazyColumn(
modifier = Modifier
- .fillMaxWidth()
- .padding(
- start = 12.dp + extraPaddingStart,
- end = 12.dp + extraPaddingEnd,
- top = 6.dp,
- bottom = 6.dp,
- ),
- horizontalAlignment = hAlign,
+ .fillMaxSize()
+ .nestedScroll(nestedScrollConnection),
+ state = listState, verticalArrangement = Arrangement.Top,
) {
- // Sender row.
- MessageSender(
- message = message,
- agentNameRes = task.agentNameRes,
- imageHistoryCurIndex = imageHistoryCurIndex.intValue
- )
+ items(messages) { message ->
+ val imageHistoryCurIndex = remember { mutableIntStateOf(0) }
+ var hAlign: Alignment.Horizontal = Alignment.End
+ var backgroundColor: Color = MaterialTheme.customColors.userBubbleBgColor
+ var hardCornerAtLeftOrRight = false
+ var extraPaddingStart = 48.dp
+ var extraPaddingEnd = 0.dp
+ if (message.side == ChatSide.AGENT) {
+ hAlign = Alignment.Start
+ backgroundColor = MaterialTheme.customColors.agentBubbleBgColor
+ hardCornerAtLeftOrRight = true
+ extraPaddingStart = 0.dp
+ extraPaddingEnd = 48.dp
+ } else if (message.side == ChatSide.SYSTEM) {
+ extraPaddingStart = 24.dp
+ extraPaddingEnd = 24.dp
+ if (message.type == ChatMessageType.PROMPT_TEMPLATES) {
+ extraPaddingStart = 12.dp
+ extraPaddingEnd = 12.dp
+ }
+ }
+ if (message.type == ChatMessageType.IMAGE) {
+ backgroundColor = Color.Transparent
+ }
+ val bubbleBorderRadius = dimensionResource(R.dimen.chat_bubble_corner_radius)
+
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(
+ start = 12.dp + extraPaddingStart,
+ end = 12.dp + extraPaddingEnd,
+ top = 6.dp,
+ bottom = 6.dp,
+ ),
+ horizontalAlignment = hAlign,
+ ) {
+ // Sender row.
+ MessageSender(
+ message = message,
+ agentNameRes = task.agentNameRes,
+ imageHistoryCurIndex = imageHistoryCurIndex.intValue
+ )
- // Message body.
- when (message) {
- // Loading.
- is ChatMessageLoading -> MessageBodyLoading()
+ // Message body.
+ when (message) {
+ // Loading.
+ is ChatMessageLoading -> MessageBodyLoading()
- // Info.
- is ChatMessageInfo -> MessageBodyInfo(message = message)
+ // Info.
+ is ChatMessageInfo -> MessageBodyInfo(message = message)
- // Warning
- is ChatMessageWarning -> MessageBodyWarning(message = message)
+ // Warning
+ is ChatMessageWarning -> MessageBodyWarning(message = message)
- // Config values change.
- is ChatMessageConfigValuesChange -> MessageBodyConfigUpdate(message = message)
+ // Config values change.
+ is ChatMessageConfigValuesChange -> MessageBodyConfigUpdate(message = message)
- // Prompt templates.
- is ChatMessagePromptTemplates -> MessageBodyPromptTemplates(message = message,
- task = task,
- onPromptClicked = { template ->
- onSendMessage(
- selectedModel,
- listOf(ChatMessageText(content = template.prompt, side = ChatSide.USER))
- )
- })
-
- // Non-system messages.
- else -> {
- // The bubble shape around the message body.
- var messageBubbleModifier = Modifier
- .clip(
- MessageBubbleShape(
- radius = bubbleBorderRadius,
- hardCornerAtLeftOrRight = hardCornerAtLeftOrRight
- )
- )
- .background(backgroundColor)
- if (message is ChatMessageText) {
- messageBubbleModifier = messageBubbleModifier
- .pointerInput(Unit) {
- detectTapGestures(
- onLongPress = {
- haptic.performHapticFeedback(HapticFeedbackType.LongPress)
- longPressedMessage.value = message
- showMessageLongPressedSheet = true
- },
+ // Prompt templates.
+ is ChatMessagePromptTemplates -> MessageBodyPromptTemplates(message = message,
+ task = task,
+ onPromptClicked = { template ->
+ onSendMessage(
+ selectedModel,
+ listOf(ChatMessageText(content = template.prompt, side = ChatSide.USER))
+ )
+ })
+
+ // Non-system messages.
+ else -> {
+ // The bubble shape around the message body.
+ var messageBubbleModifier = Modifier
+ .clip(
+ MessageBubbleShape(
+ radius = bubbleBorderRadius,
+ hardCornerAtLeftOrRight = hardCornerAtLeftOrRight
+ )
)
+ .background(backgroundColor)
+ if (message is ChatMessageText) {
+ messageBubbleModifier = messageBubbleModifier.pointerInput(Unit) {
+ detectTapGestures(
+ onLongPress = {
+ haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+ longPressedMessage.value = message
+ showMessageLongPressedSheet = true
+ },
+ )
+ }
}
- }
- Box(
- modifier = messageBubbleModifier,
- ) {
- when (message) {
- // Text
- is ChatMessageText -> MessageBodyText(message = message)
-
- // Image
- is ChatMessageImage -> MessageBodyImage(message = message)
-
- // Image with history (for image gen)
- is ChatMessageImageWithHistory -> MessageBodyImageWithHistory(
- message = message, imageHistoryCurIndex = imageHistoryCurIndex
- )
-
- // Classification result
- is ChatMessageClassification -> MessageBodyClassification(
- message = message,
- modifier = Modifier.width(message.maxBarWidth ?: CLASSIFICATION_BAR_MAX_WIDTH)
- )
-
- // Benchmark result.
- is ChatMessageBenchmarkResult -> MessageBodyBenchmark(message = message)
-
- // Benchmark LLM result.
- is ChatMessageBenchmarkLlmResult -> MessageBodyBenchmarkLlm(
- message = message,
- modifier = Modifier.wrapContentWidth()
- )
-
- else -> {}
- }
- }
- if (message.side == ChatSide.AGENT) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- ) {
- LatencyText(message = message)
- // A button to show stats for the LLM message.
- if (task.type == TaskType.LLM_CHAT && message is ChatMessageText
- // This means we only want to show the action button when the message is done
- // generating, at which point the latency will be set.
- && message.latencyMs >= 0
+ Box(
+ modifier = messageBubbleModifier,
) {
- val showingStats =
- viewModel.isShowingStats(model = selectedModel, message = message)
- MessageActionButton(
- label = if (showingStats) "Hide stats" else "Show stats",
- icon = Icons.Outlined.Timer,
- onClick = {
- // Toggle showing stats.
- viewModel.toggleShowingStats(selectedModel, message)
-
- // Add the stats message after the LLM message.
- if (viewModel.isShowingStats(model = selectedModel, message = message)) {
- val llmBenchmarkResult = message.llmBenchmarkResult
- if (llmBenchmarkResult != null) {
- viewModel.insertMessageAfter(
- model = selectedModel,
- anchorMessage = message,
- messageToAdd = llmBenchmarkResult,
- )
- }
- }
- // Remove the stats message.
- else {
- val curMessageIndex =
- viewModel.getMessageIndex(model = selectedModel, message = message)
- viewModel.removeMessageAt(
- model = selectedModel,
- index = curMessageIndex + 1
+ when (message) {
+ // Text
+ is ChatMessageText -> MessageBodyText(message = message)
+
+ // Image
+ is ChatMessageImage -> {
+ if (targetSelectedImageMessage != message) {
+ MessageBodyImage(
+ message = message,
+ modifier = Modifier
+ .clickable {
+ selectedImageMessage = message
+ }
+ .sharedElement(
+ sharedContentState = rememberSharedContentState(key = "selected_image"),
+ animatedVisibilityScope = this@AnimatedContent
+ ),
)
}
- },
- enabled = !uiState.inProgress
- )
- }
- }
- } else if (message.side == ChatSide.USER) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(4.dp)
- ) {
- // Run again button.
- if (selectedModel.showRunAgainButton) {
- MessageActionButton(
- label = stringResource(R.string.run_again),
- icon = Icons.Rounded.Refresh,
- onClick = {
- onRunAgainClicked(selectedModel, message)
- },
- enabled = !uiState.inProgress
- )
+ }
+
+ // Image with history (for image gen)
+ is ChatMessageImageWithHistory -> MessageBodyImageWithHistory(
+ message = message, imageHistoryCurIndex = imageHistoryCurIndex
+ )
+
+ // Classification result
+ is ChatMessageClassification -> MessageBodyClassification(
+ message = message, modifier = Modifier.width(
+ message.maxBarWidth ?: CLASSIFICATION_BAR_MAX_WIDTH
+ )
+ )
+
+ // Benchmark result.
+ is ChatMessageBenchmarkResult -> MessageBodyBenchmark(message = message)
+
+ // Benchmark LLM result.
+ is ChatMessageBenchmarkLlmResult -> MessageBodyBenchmarkLlm(
+ message = message, modifier = Modifier.wrapContentWidth()
+ )
+
+ else -> {}
+ }
}
-
- // Benchmark button
- if (selectedModel.showBenchmarkButton) {
- MessageActionButton(
- label = stringResource(R.string.benchmark),
- icon = Icons.Outlined.Timer,
- onClick = {
- showBenchmarkConfigsDialog = true
- benchmarkMessage.value = message
- },
- enabled = !uiState.inProgress
- )
+ if (message.side == ChatSide.AGENT) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ ) {
+ LatencyText(message = message)
+ // A button to show stats for the LLM message.
+ if ((task.type == TaskType.LLM_CHAT || task.type == TaskType.LLM_ASK_IMAGE) && message is ChatMessageText
+ // This means we only want to show the action button when the message is done
+ // generating, at which point the latency will be set.
+ && message.latencyMs >= 0
+ ) {
+ val showingStats =
+ viewModel.isShowingStats(model = selectedModel, message = message)
+ MessageActionButton(
+ label = if (showingStats) "Hide stats" else "Show stats",
+ icon = Icons.Outlined.Timer,
+ onClick = {
+ // Toggle showing stats.
+ viewModel.toggleShowingStats(selectedModel, message)
+
+ // Add the stats message after the LLM message.
+ if (viewModel.isShowingStats(
+ model = selectedModel, message = message
+ )
+ ) {
+ val llmBenchmarkResult = message.llmBenchmarkResult
+ if (llmBenchmarkResult != null) {
+ viewModel.insertMessageAfter(
+ model = selectedModel,
+ anchorMessage = message,
+ messageToAdd = llmBenchmarkResult,
+ )
+ }
+ }
+ // Remove the stats message.
+ else {
+ val curMessageIndex =
+ viewModel.getMessageIndex(
+ model = selectedModel,
+ message = message
+ )
+ viewModel.removeMessageAt(
+ model = selectedModel, index = curMessageIndex + 1
+ )
+ }
+ },
+ enabled = !uiState.inProgress
+ )
+ }
+ }
+ } else if (message.side == ChatSide.USER) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ // Run again button.
+ if (selectedModel.showRunAgainButton) {
+ MessageActionButton(
+ label = stringResource(R.string.run_again),
+ icon = Icons.Rounded.Refresh,
+ onClick = {
+ onRunAgainClicked(selectedModel, message)
+ },
+ enabled = !uiState.inProgress
+ )
+ }
+
+ // Benchmark button
+ if (selectedModel.showBenchmarkButton) {
+ MessageActionButton(
+ label = stringResource(R.string.benchmark),
+ icon = Icons.Outlined.Timer,
+ onClick = {
+ showBenchmarkConfigsDialog = true
+ benchmarkMessage.value = message
+ },
+ enabled = !uiState.inProgress
+ )
+ }
+ }
}
}
}
}
}
}
- }
- }
- SnackbarHost(hostState = snackbarHostState, modifier = Modifier.padding(vertical = 4.dp))
- }
+ SnackbarHost(hostState = snackbarHostState, modifier = Modifier.padding(vertical = 4.dp))
+ // Show an info message for ask image task to get users started.
+ if (task.type == TaskType.LLM_ASK_IMAGE && messages.isEmpty()) {
+ Column(
+ modifier = Modifier
+ .padding(horizontal = 16.dp)
+ .fillMaxSize(),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Center
+ ) {
+ MessageBodyInfo(
+ ChatMessageInfo(content = "To get started, click + below to add an image and type a prompt to ask a question about it."),
+ smallFontSize = false
+ )
+ }
+ }
+ }
- // Chat input
- when (chatInputType) {
- ChatInputType.TEXT -> {
+ // Chat input
+ when (chatInputType) {
+ ChatInputType.TEXT -> {
// val isLlmTask = task.type == TaskType.LLM_CHAT
// val notLlmStartScreen = !(messages.size == 1 && messages[0] is ChatMessagePromptTemplates)
- val hasImageMessage = messages.any { it is ChatMessageImage }
- MessageInputText(
- modelManagerViewModel = modelManagerViewModel,
- curMessage = curMessage,
- inProgress = uiState.inProgress,
- isResettingSession = uiState.isResettingSession,
- hasImageMessage = hasImageMessage,
- modelInitializing = modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING,
- textFieldPlaceHolderRes = task.textInputPlaceHolderRes,
- onValueChanged = { curMessage = it },
- onSendMessage = {
- onSendMessage(selectedModel, it)
- curMessage = ""
- },
- onOpenPromptTemplatesClicked = {
- onSendMessage(
- selectedModel, listOf(
- ChatMessagePromptTemplates(
- templates = selectedModel.llmPromptTemplates, showMakeYourOwn = false
+ val hasImageMessage = messages.any { it is ChatMessageImage }
+ MessageInputText(
+ modelManagerViewModel = modelManagerViewModel,
+ curMessage = curMessage,
+ inProgress = uiState.inProgress,
+ isResettingSession = uiState.isResettingSession,
+ modelPreparing = uiState.preparing,
+ hasImageMessage = hasImageMessage,
+ modelInitializing = modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING,
+ textFieldPlaceHolderRes = task.textInputPlaceHolderRes,
+ onValueChanged = { curMessage = it },
+ onSendMessage = {
+ onSendMessage(selectedModel, it)
+ curMessage = ""
+ },
+ onOpenPromptTemplatesClicked = {
+ onSendMessage(
+ selectedModel, listOf(
+ ChatMessagePromptTemplates(
+ templates = selectedModel.llmPromptTemplates, showMakeYourOwn = false
+ )
+ )
)
- )
- )
- },
- onStopButtonClicked = onStopButtonClicked,
+ },
+ onStopButtonClicked = onStopButtonClicked,
// showPromptTemplatesInMenu = isLlmTask && notLlmStartScreen,
- showPromptTemplatesInMenu = false,
- showImagePickerInMenu = selectedModel.llmSupportImage == true,
- showStopButtonWhenInProgress = showStopButtonInInputWhenInProgress,
- )
- }
+ showPromptTemplatesInMenu = false,
+ showImagePickerInMenu = selectedModel.llmSupportImage,
+ showStopButtonWhenInProgress = showStopButtonInInputWhenInProgress,
+ )
+ }
- ChatInputType.IMAGE -> MessageInputImage(
- disableButtons = uiState.inProgress,
- streamingMessage = streamingMessage,
- onImageSelected = { bitmap ->
- onSendMessage(
- selectedModel, listOf(
- ChatMessageImage(
- bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
+ ChatInputType.IMAGE -> MessageInputImage(
+ disableButtons = uiState.inProgress,
+ streamingMessage = streamingMessage,
+ onImageSelected = { bitmap ->
+ onSendMessage(
+ selectedModel, listOf(
+ ChatMessageImage(
+ bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
+ )
+ )
)
- )
+ },
+ onStreamImage = { bitmap ->
+ onStreamImageMessage(
+ selectedModel, ChatMessageImage(
+ bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
+ )
+ )
+ },
+ onStreamEnd = onStreamEnd,
)
- },
- onStreamImage = { bitmap ->
- onStreamImageMessage(
- selectedModel, ChatMessageImage(
- bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
+ }
+ }
+
+ // A full-screen image viewer.
+ if (targetSelectedImageMessage != null) {
+ ZoomableBox(
+ modifier = Modifier
+ .fillMaxSize()
+ .background(Color.Black.copy(alpha = 0.9f))
+ .sharedElement(
+ rememberSharedContentState(key = "bounds"),
+ animatedVisibilityScope = this,
)
+ .skipToLookaheadSize(),
+ ) {
+ // Image.
+ Image(
+ bitmap = targetSelectedImageMessage.imageBitMap,
+ contentDescription = "",
+ modifier = modifier
+ .fillMaxSize()
+ .graphicsLayer(
+ scaleX = scale,
+ scaleY = scale,
+ translationX = offsetX,
+ translationY = offsetY
+ )
+ .sharedElement(
+ sharedContentState = rememberSharedContentState(key = "selected_image"),
+ animatedVisibilityScope = this@AnimatedContent
+ ),
+ contentScale = ContentScale.Fit,
)
- },
- onStreamEnd = onStreamEnd,
- )
+
+ // Close button.
+ IconButton(
+ onClick = {
+ selectedImageMessage = null
+ },
+ colors = IconButtonDefaults.iconButtonColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ ),
+ modifier = Modifier.offset(x = (-8).dp, y = 8.dp)
+ ) {
+ Icon(
+ Icons.Rounded.Close,
+ contentDescription = "",
+ tint = MaterialTheme.colorScheme.primary
+ )
+ }
+ }
+ }
}
}
@@ -498,9 +601,7 @@ fun ChatPanel(
) {
Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
Column(
- modifier = Modifier
- .padding(20.dp),
- verticalArrangement = Arrangement.spacedBy(16.dp)
+ modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
) {
// Title
Text(
@@ -568,13 +669,10 @@ fun ChatPanel(
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp),
- modifier = Modifier
- .padding(vertical = 8.dp, horizontal = 16.dp)
+ modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
) {
Icon(
- Icons.Rounded.ContentCopy,
- contentDescription = "",
- modifier = Modifier.size(18.dp)
+ Icons.Rounded.ContentCopy, contentDescription = "", modifier = Modifier.size(18.dp)
)
Text("Copy text")
}
@@ -586,6 +684,51 @@ fun ChatPanel(
}
}
+@Composable
+fun ZoomableBox(
+ modifier: Modifier = Modifier,
+ minScale: Float = 1f,
+ maxScale: Float = 5f,
+ content: @Composable ZoomableBoxScope.() -> Unit
+) {
+ var scale by remember { mutableFloatStateOf(1f) }
+ var offsetX by remember { mutableFloatStateOf(0f) }
+ var offsetY by remember { mutableFloatStateOf(0f) }
+ var size by remember { mutableStateOf(IntSize.Zero) }
+ Box(
+ modifier = modifier
+ .clip(RectangleShape)
+ .onSizeChanged { size = it }
+ .pointerInput(Unit) {
+ detectTransformGestures { _, pan, zoom, _ ->
+ scale = maxOf(minScale, minOf(scale * zoom, maxScale))
+ val maxX = (size.width * (scale - 1)) / 2
+ val minX = -maxX
+ offsetX = maxOf(minX, minOf(maxX, offsetX + pan.x))
+ val maxY = (size.height * (scale - 1)) / 2
+ val minY = -maxY
+ offsetY = maxOf(minY, minOf(maxY, offsetY + pan.y))
+ }
+ },
+ contentAlignment = Alignment.TopEnd
+ ) {
+ val scope = ZoomableBoxScopeImpl(scale, offsetX, offsetY)
+ scope.content()
+ }
+}
+
+interface ZoomableBoxScope {
+ val scale: Float
+ val offsetX: Float
+ val offsetY: Float
+}
+
+private data class ZoomableBoxScopeImpl(
+ override val scale: Float,
+ override val offsetX: Float,
+ override val offsetY: Float
+) : ZoomableBoxScope
+
@Preview(showBackground = true)
@Composable
fun ChatPanelPreview() {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt
index 91bb5f7fe..c5805729a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt
@@ -19,6 +19,7 @@ package com.google.aiedge.gallery.ui.common.chat
import android.util.Log
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
@@ -27,6 +28,7 @@ import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
@@ -36,10 +38,13 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
import com.google.aiedge.gallery.data.Model
import com.google.aiedge.gallery.data.ModelDownloadStatusType
import com.google.aiedge.gallery.data.Task
@@ -81,7 +86,7 @@ fun ChatView(
chatInputType: ChatInputType = ChatInputType.TEXT,
showStopButtonInInputWhenInProgress: Boolean = false,
) {
- val uiStat by viewModel.uiState.collectAsState()
+ val uiState by viewModel.uiState.collectAsState()
val modelManagerUiState by modelManagerViewModel.uiState.collectAsState()
val selectedModel = modelManagerUiState.selectedModel
@@ -158,7 +163,9 @@ fun ChatView(
model = selectedModel,
modelManagerViewModel = modelManagerViewModel,
showResetSessionButton = true,
- isResettingSession = uiStat.isResettingSession,
+ isResettingSession = uiState.isResettingSession,
+ inProgress = uiState.inProgress,
+ modelPreparing = uiState.preparing,
onResetSessionClicked = onResetSessionClicked,
onConfigChanged = { old, new ->
viewModel.addConfigChangedMessage(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt
index c9a2cffc4..b186305f5 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt
@@ -38,6 +38,11 @@ data class ChatUiState(
*/
val isResettingSession: Boolean = false,
+ /**
+ * Indicates whether the model is preparing (before outputting any result and after initializing).
+ */
+ val preparing: Boolean = false,
+
/**
* A map of model names to lists of chat messages.
*/
@@ -204,6 +209,10 @@ open class ChatViewModel(val task: Task) : ViewModel() {
_uiState.update { _uiState.value.copy(isResettingSession = isResettingSession) }
}
+ fun setPreparing(preparing: Boolean) {
+ _uiState.update { _uiState.value.copy(preparing = preparing) }
+ }
+
fun addConfigChangedMessage(
oldConfigValues: Map, newConfigValues: Map, model: Model
) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt
index ed592f7b7..9450383e4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt
@@ -18,6 +18,8 @@ package com.google.aiedge.gallery.ui.common.chat
import android.util.Log
import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -28,9 +30,11 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.MaterialTheme
@@ -53,6 +57,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@@ -89,9 +96,20 @@ fun ConfigDialog(
putAll(initialValues)
}
}
+ val interactionSource = remember { MutableInteractionSource() }
Dialog(onDismissRequest = onDismissed) {
- Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
+ val focusManager = LocalFocusManager.current
+ Card(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable(
+ interactionSource = interactionSource, indication = null // Disable the ripple effect
+ ) {
+ focusManager.clearFocus()
+ },
+ shape = RoundedCornerShape(16.dp)
+ ) {
Column(
modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
) {
@@ -114,7 +132,14 @@ fun ConfigDialog(
}
// List of config rows.
- ConfigEditorsPanel(configs = configs, values = values)
+ Column(
+ modifier = Modifier
+ .verticalScroll(rememberScrollState())
+ .weight(1f, fill = false),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ ConfigEditorsPanel(configs = configs, values = values)
+ }
// Button row.
Row(
@@ -264,6 +289,8 @@ fun NumberSliderRow(config: NumberSliderConfig, values: SnapshotStateMap
Box(
modifier = Modifier.border(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt
index b5a380f81..e69f24c6e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt
@@ -25,17 +25,18 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.unit.dp
@Composable
-fun MessageBodyImage(message: ChatMessageImage) {
+fun MessageBodyImage(message: ChatMessageImage, modifier: Modifier = Modifier) {
val bitmapWidth = message.bitmap.width
val bitmapHeight = message.bitmap.height
val imageWidth =
if (bitmapWidth >= bitmapHeight) 200 else (200f / bitmapHeight * bitmapWidth).toInt()
val imageHeight =
if (bitmapHeight >= bitmapWidth) 200 else (200f / bitmapWidth * bitmapHeight).toInt()
+
Image(
bitmap = message.imageBitMap,
contentDescription = "",
- modifier = Modifier
+ modifier = modifier
.height(imageHeight.dp)
.width(imageWidth.dp),
contentScale = ContentScale.Fit,
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt
index 03c8e3efc..844dce6ae 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt
@@ -38,7 +38,7 @@ import com.google.aiedge.gallery.ui.theme.customColors
* Supports markdown.
*/
@Composable
-fun MessageBodyInfo(message: ChatMessageInfo) {
+fun MessageBodyInfo(message: ChatMessageInfo, smallFontSize: Boolean = true) {
Row(
modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center
) {
@@ -47,7 +47,11 @@ fun MessageBodyInfo(message: ChatMessageInfo) {
.clip(RoundedCornerShape(16.dp))
.background(MaterialTheme.customColors.agentBubbleBgColor)
) {
- MarkdownText(text = message.content, modifier = Modifier.padding(12.dp), smallFontSize = true)
+ MarkdownText(
+ text = message.content,
+ modifier = Modifier.padding(12.dp),
+ smallFontSize = smallFontSize
+ )
}
}
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt
index a24c34f9e..7359457b7 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt
@@ -103,6 +103,7 @@ fun MessageInputText(
@StringRes textFieldPlaceHolderRes: Int,
onValueChanged: (String) -> Unit,
onSendMessage: (List) -> Unit,
+ modelPreparing: Boolean = false,
onOpenPromptTemplatesClicked: () -> Unit = {},
onStopButtonClicked: () -> Unit = {},
showPromptTemplatesInMenu: Boolean = false,
@@ -173,7 +174,7 @@ fun MessageInputText(
.height(80.dp)
.shadow(2.dp, shape = RoundedCornerShape(8.dp))
.clip(RoundedCornerShape(8.dp))
- .border(1.dp, MaterialTheme.colorScheme.outlineVariant, RoundedCornerShape(8.dp)),
+ .border(1.dp, MaterialTheme.colorScheme.outline, RoundedCornerShape(8.dp)),
)
Box(modifier = Modifier
.offset(x = 10.dp, y = (-10).dp)
@@ -219,7 +220,7 @@ fun MessageInputText(
expanded = showAddContentMenu,
onDismissRequest = { showAddContentMenu = false }) {
if (showImagePickerInMenu) {
- // Take a photo.
+ // Take a picture.
DropdownMenuItem(
text = {
Row(
@@ -227,7 +228,7 @@ fun MessageInputText(
horizontalArrangement = Arrangement.spacedBy(6.dp)
) {
Icon(Icons.Rounded.PhotoCamera, contentDescription = "")
- Text("Take a photo")
+ Text("Take a picture")
}
},
enabled = pickedImages.isEmpty() && !hasImageMessage,
@@ -321,7 +322,7 @@ fun MessageInputText(
Spacer(modifier = Modifier.width(8.dp))
if (inProgress && showStopButtonWhenInProgress) {
- if (!modelInitializing) {
+ if (!modelInitializing && !modelPreparing) {
IconButton(
onClick = onStopButtonClicked,
colors = IconButtonDefaults.iconButtonColors(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt
index c7eb4b3cb..3738be2bf 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt
@@ -20,8 +20,9 @@ import android.content.Intent
import android.net.Uri
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.animation.SharedTransitionLayout
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -30,17 +31,13 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ChevronRight
-import androidx.compose.material.icons.rounded.Settings
import androidx.compose.material.icons.rounded.UnfoldLess
import androidx.compose.material.icons.rounded.UnfoldMore
import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.material3.ripple
@@ -48,16 +45,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
-import androidx.compose.runtime.movableContentOf
-import androidx.compose.runtime.movableContentWithReceiverOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.LookaheadScope
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
@@ -91,6 +84,7 @@ private val DEFAULT_VERTICAL_PADDING = 16.dp
* model description and buttons for learning more (opening a URL) and downloading/trying
* the model.
*/
+@OptIn(ExperimentalSharedTransitionApi::class)
@Composable
fun ModelItem(
model: Model,
@@ -117,208 +111,148 @@ fun ModelItem(
var isExpanded by remember { mutableStateOf(false) }
- // Animate alpha for model description and button rows when switching between layouts.
- val alphaAnimation by animateFloatAsState(
- targetValue = if (isExpanded) 1f else 0f,
- animationSpec = tween(durationMillis = LAYOUT_ANIMATION_DURATION - 50)
- )
-
- LookaheadScope {
- // Task icon.
- val taskIcon = remember {
- movableContentOf {
- TaskIcon(
- task = task, modifier = Modifier.animateLayout()
- )
- }
- }
-
- // Model name and status.
- val modelNameAndStatus = remember {
- movableContentOf {
- ModelNameAndStatus(
- model = model,
- task = task,
- downloadStatus = downloadStatus,
- isExpanded = isExpanded,
- modifier = Modifier.animateLayout()
- )
+ var boxModifier = modifier
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(size = 42.dp))
+ .background(
+ getTaskBgColor(task)
+ )
+ boxModifier = if (canExpand) {
+ boxModifier.clickable(onClick = {
+ if (!model.imported) {
+ isExpanded = !isExpanded
+ } else {
+ onModelClicked(model)
}
- }
+ }, interactionSource = remember { MutableInteractionSource() }, indication = ripple(
+ bounded = true,
+ radius = 1000.dp,
+ )
+ )
+ } else {
+ boxModifier
+ }
- val actionButton = remember {
- movableContentOf {
- ModelItemActionButton(
- context = context,
- model = model,
- task = task,
- modelManagerViewModel = modelManagerViewModel,
- downloadStatus = downloadStatus,
- onDownloadClicked = { model ->
- checkNotificationPermissionAndStartDownload(
- context = context,
- launcher = launcher,
- modelManagerViewModel = modelManagerViewModel,
- task = task,
- model = model
+ Box(
+ modifier = boxModifier,
+ contentAlignment = Alignment.Center,
+ ) {
+ SharedTransitionLayout {
+ AnimatedContent(
+ isExpanded, label = "item_layout_transition",
+ ) { targetState ->
+ val taskIcon = @Composable {
+ TaskIcon(
+ task = task, modifier = Modifier.sharedElement(
+ sharedContentState = rememberSharedContentState(key = "task_icon"),
+ animatedVisibilityScope = this@AnimatedContent,
)
- },
- showDeleteButton = showDeleteButton,
- showDownloadButton = false,
- )
- }
- }
-
- // Expand/collapse icon, or the config icon.
- val expandButton = remember {
- movableContentOf {
- if (showConfigButtonIfExisted) {
- if (downloadStatus?.status === ModelDownloadStatusType.SUCCEEDED) {
- if (model.configs.isNotEmpty()) {
- IconButton(onClick = onConfigClicked) {
- Icon(
- Icons.Rounded.Settings,
- contentDescription = "",
- tint = getTaskIconColor(task)
- )
- }
- }
- }
- } else {
- Icon(
- // For imported model, show ">" directly indicating users can just tap the model item to
- // go into it without needing to expand it first.
- if (model.imported) Icons.Rounded.ChevronRight else if (isExpanded) Icons.Rounded.UnfoldLess else Icons.Rounded.UnfoldMore,
- contentDescription = "",
- tint = getTaskIconColor(task),
)
}
- }
- }
- // Model description shown in expanded layout.
- val modelDescription = remember {
- movableContentOf { m: Modifier ->
- if (model.info.isNotEmpty()) {
- MarkdownText(
- model.info,
- modifier = Modifier
- .heightIn(min = 0.dp, max = if (isExpanded) 1000.dp else 0.dp)
- .animateLayout()
- .then(m)
+ val modelNameAndStatus = @Composable {
+ ModelNameAndStatus(
+ model = model,
+ task = task,
+ downloadStatus = downloadStatus,
+ isExpanded = isExpanded,
+ animatedVisibilityScope = this@AnimatedContent,
+ sharedTransitionScope = this@SharedTransitionLayout
)
}
- }
- }
- // Button rows shown in expanded layout.
- val buttonRows = remember {
- movableContentOf { m: Modifier ->
- Row(
- modifier = Modifier
- .heightIn(min = 0.dp, max = if (isExpanded) 1000.dp else 0.dp)
- .animateLayout()
- .then(m),
- horizontalArrangement = Arrangement.spacedBy(12.dp),
- ) {
- // The "learn more" button. Click to show related urls in a bottom sheet.
- if (model.learnMoreUrl.isNotEmpty()) {
- OutlinedButton(
- onClick = {
- if (isExpanded) {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse(model.learnMoreUrl))
- context.startActivity(intent)
- }
- },
- ) {
- Text("Learn More", maxLines = 1)
- }
- }
-
- // Button to start the download and start the chat session with the model.
- val needToDownloadFirst =
- downloadStatus?.status == ModelDownloadStatusType.NOT_DOWNLOADED || downloadStatus?.status == ModelDownloadStatusType.FAILED
- DownloadAndTryButton(
- task = task,
+ val actionButton = @Composable {
+ ModelItemActionButton(
+ context = context,
model = model,
- enabled = isExpanded,
- needToDownloadFirst = needToDownloadFirst,
+ task = task,
modelManagerViewModel = modelManagerViewModel,
- onClicked = { onModelClicked(model) }
+ downloadStatus = downloadStatus,
+ onDownloadClicked = { model ->
+ checkNotificationPermissionAndStartDownload(
+ context = context,
+ launcher = launcher,
+ modelManagerViewModel = modelManagerViewModel,
+ task = task,
+ model = model
+ )
+ },
+ showDeleteButton = showDeleteButton,
+ showDownloadButton = false,
+ modifier = Modifier.sharedElement(
+ sharedContentState = rememberSharedContentState(key = "action_button"),
+ animatedVisibilityScope = this@AnimatedContent,
+ )
)
}
- }
- }
- val container = remember {
- movableContentWithReceiverOf Unit> { content ->
- Box(
- modifier = Modifier.animateLayout(),
- contentAlignment = Alignment.TopEnd,
- ) {
- content()
+ val expandButton = @Composable {
+ Icon(
+ // For imported model, show ">" directly indicating users can just tap the model item to
+ // go into it without needing to expand it first.
+ if (model.imported) Icons.Rounded.ChevronRight else if (isExpanded) Icons.Rounded.UnfoldLess else Icons.Rounded.UnfoldMore,
+ contentDescription = "",
+ tint = getTaskIconColor(task),
+ modifier = Modifier.sharedElement(
+ sharedContentState = rememberSharedContentState(key = "expand_button"),
+ animatedVisibilityScope = this@AnimatedContent,
+ )
+ )
}
- }
- }
- var boxModifier = modifier
- .fillMaxWidth()
- .clip(RoundedCornerShape(size = 42.dp))
- .background(
- getTaskBgColor(task)
- )
- boxModifier = if (canExpand) {
- boxModifier.clickable(
- onClick = {
- if (!model.imported) {
- isExpanded = !isExpanded
- } else {
- onModelClicked(model)
+ val description = @Composable {
+ if (model.info.isNotEmpty()) {
+ MarkdownText(
+ model.info, modifier = Modifier
+ .sharedElement(
+ sharedContentState = rememberSharedContentState(key = "description"),
+ animatedVisibilityScope = this@AnimatedContent,
+ )
+ .skipToLookaheadSize()
+ )
}
- },
- interactionSource = remember { MutableInteractionSource() },
- indication = ripple(
- bounded = true,
- radius = 500.dp,
- )
- )
- } else {
- boxModifier
- }
- Box(
- modifier = boxModifier,
- contentAlignment = Alignment.Center
- ) {
- if (isExpanded) {
- container {
- // The main part (icon, model name, status, etc)
- Column(
- verticalArrangement = Arrangement.spacedBy(14.dp),
- horizontalAlignment = Alignment.CenterHorizontally,
- modifier = Modifier
- .fillMaxWidth()
- .padding(vertical = verticalSpacing, horizontal = 18.dp)
+ }
+
+ val buttonsRow = @Composable {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier
+ .sharedElement(
+ sharedContentState = rememberSharedContentState(key = "buttons_row"),
+ animatedVisibilityScope = this@AnimatedContent,
+ )
+ .skipToLookaheadSize()
) {
- Box(contentAlignment = Alignment.Center) {
- taskIcon()
- Row(
- modifier = Modifier.fillMaxWidth(),
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.End
+ // The "learn more" button. Click to show related urls in a bottom sheet.
+ if (model.learnMoreUrl.isNotEmpty()) {
+ OutlinedButton(
+ onClick = {
+ if (isExpanded) {
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(model.learnMoreUrl))
+ context.startActivity(intent)
+ }
+ },
) {
- actionButton()
- expandButton()
+ Text("Learn More", maxLines = 1)
}
}
- modelNameAndStatus()
- modelDescription(Modifier.alpha(alphaAnimation))
- buttonRows(Modifier.alpha(alphaAnimation)) // Apply alpha here
+
+ // Button to start the download and start the chat session with the model.
+ val needToDownloadFirst =
+ downloadStatus?.status == ModelDownloadStatusType.NOT_DOWNLOADED || downloadStatus?.status == ModelDownloadStatusType.FAILED
+ DownloadAndTryButton(task = task,
+ model = model,
+ enabled = isExpanded,
+ needToDownloadFirst = needToDownloadFirst,
+ modelManagerViewModel = modelManagerViewModel,
+ onClicked = { onModelClicked(model) })
}
}
- } else {
- container {
- Column(horizontalAlignment = Alignment.CenterHorizontally) {
- // The main part (icon, model name, status, etc)
+
+ // Collapsed state.
+ if (!targetState) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
@@ -327,22 +261,46 @@ fun ModelItem(
.padding(start = 18.dp, end = 18.dp)
.padding(vertical = verticalSpacing)
) {
+ // Icon at the left.
taskIcon()
+ // Model name and status at the center.
Row(modifier = Modifier.weight(1f)) {
modelNameAndStatus()
}
+ // Action button and expand/collapse button at the right.
Row(verticalAlignment = Alignment.CenterVertically) {
actionButton()
expandButton()
}
}
- Column(
- modifier = Modifier.offset(y = 30.dp),
- horizontalAlignment = Alignment.CenterHorizontally
- ) {
- modelDescription(Modifier.alpha(alphaAnimation))
- buttonRows(Modifier.alpha(alphaAnimation))
+ }
+ } else {
+ Column(
+ verticalArrangement = Arrangement.spacedBy(14.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(vertical = verticalSpacing, horizontal = 18.dp)
+ ) {
+ Box(contentAlignment = Alignment.Center) {
+ // Icon at the top-center.
+ taskIcon()
+ // Action button and expand/collapse button at the right.
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.End
+ ) {
+ actionButton()
+ expandButton()
+ }
}
+ // Name and status below the icon.
+ modelNameAndStatus()
+ // Description.
+ description()
+ // Buttons
+ buttonsRow()
}
}
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt
index 0fa31bd36..d852d8a3d 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt
@@ -108,7 +108,8 @@ fun ModelItemActionButton(
// Button to cancel the download when it is in progress.
ModelDownloadStatusType.IN_PROGRESS, ModelDownloadStatusType.UNZIPPING -> IconButton(onClick = {
modelManagerViewModel.cancelDownloadModel(
- model
+ task = task,
+ model = model
)
}) {
Icon(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
index da435f95d..53115bd8e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
@@ -16,6 +16,9 @@
package com.google.aiedge.gallery.ui.common.modelitem
+import androidx.compose.animation.AnimatedVisibilityScope
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.animation.SharedTransitionScope
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column
@@ -30,6 +33,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.focusModifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -54,134 +58,164 @@ import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
* - "Unzipping..." status for unzipping processes.
* - Model size for successful downloads.
*/
+@OptIn(ExperimentalSharedTransitionApi::class)
@Composable
fun ModelNameAndStatus(
model: Model,
task: Task,
downloadStatus: ModelDownloadStatus?,
isExpanded: Boolean,
+ sharedTransitionScope: SharedTransitionScope,
+ animatedVisibilityScope: AnimatedVisibilityScope,
modifier: Modifier = Modifier
) {
val inProgress = downloadStatus?.status == ModelDownloadStatusType.IN_PROGRESS
val isPartiallyDownloaded = downloadStatus?.status == ModelDownloadStatusType.PARTIALLY_DOWNLOADED
var curDownloadProgress = 0f
- Column(
- horizontalAlignment = if (isExpanded) Alignment.CenterHorizontally else Alignment.Start
- ) {
- // Model name.
- Row(
- verticalAlignment = Alignment.CenterVertically,
+ with(sharedTransitionScope) {
+ Column(
+ horizontalAlignment = if (isExpanded) Alignment.CenterHorizontally else Alignment.Start
) {
- Text(
- model.name,
- maxLines = 1,
- overflow = TextOverflow.MiddleEllipsis,
- style = MaterialTheme.typography.titleMedium,
- modifier = modifier,
- )
- }
-
- Row(verticalAlignment = Alignment.CenterVertically) {
- // Status icon.
- if (!inProgress && !isPartiallyDownloaded) {
- StatusIcon(
- downloadStatus = downloadStatus,
- modifier = modifier.padding(end = 4.dp)
+ // Model name.
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Text(
+ model.name,
+ maxLines = 1,
+ overflow = TextOverflow.MiddleEllipsis,
+ style = MaterialTheme.typography.titleMedium,
+ modifier = Modifier.sharedElement(
+ rememberSharedContentState(key = "model_name"),
+ animatedVisibilityScope = animatedVisibilityScope
+ )
)
}
- // Failure message.
- if (downloadStatus != null && downloadStatus.status == ModelDownloadStatusType.FAILED) {
- Row(verticalAlignment = Alignment.CenterVertically) {
- Text(
- downloadStatus.errorMessage,
- color = MaterialTheme.colorScheme.error,
- style = labelSmallNarrow,
- overflow = TextOverflow.Ellipsis,
- modifier = modifier,
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ // Status icon.
+ if (!inProgress && !isPartiallyDownloaded) {
+ StatusIcon(
+ downloadStatus = downloadStatus,
+ modifier = modifier
+ .padding(end = 4.dp)
+ .sharedElement(
+ rememberSharedContentState(key = "download_status_icon"),
+ animatedVisibilityScope = animatedVisibilityScope
+ )
)
}
- }
- // Status label
- else {
- var sizeLabel = model.totalBytes.humanReadableSize()
- var fontSize = 11.sp
+ // Failure message.
+ if (downloadStatus != null && downloadStatus.status == ModelDownloadStatusType.FAILED) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text(
+ downloadStatus.errorMessage,
+ color = MaterialTheme.colorScheme.error,
+ style = labelSmallNarrow,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.sharedElement(
+ rememberSharedContentState(key = "failure_messsage"),
+ animatedVisibilityScope = animatedVisibilityScope
+ )
+ )
+ }
+ }
- // Populate the status label.
- if (downloadStatus != null) {
- // For in-progress model, show {receivedSize} / {totalSize} - {rate} - {remainingTime}
- if (inProgress || isPartiallyDownloaded) {
- var totalSize = downloadStatus.totalBytes
- if (totalSize == 0L) {
- totalSize = model.totalBytes
- }
- sizeLabel =
- "${downloadStatus.receivedBytes.humanReadableSize(extraDecimalForGbAndAbove = true)} of ${totalSize.humanReadableSize()}"
- if (downloadStatus.bytesPerSecond > 0) {
+ // Status label
+ else {
+ var sizeLabel = model.totalBytes.humanReadableSize()
+ var fontSize = 11.sp
+
+ // Populate the status label.
+ if (downloadStatus != null) {
+ // For in-progress model, show {receivedSize} / {totalSize} - {rate} - {remainingTime}
+ if (inProgress || isPartiallyDownloaded) {
+ var totalSize = downloadStatus.totalBytes
+ if (totalSize == 0L) {
+ totalSize = model.totalBytes
+ }
sizeLabel =
- "$sizeLabel · ${downloadStatus.bytesPerSecond.humanReadableSize()} / s"
- if (downloadStatus.remainingMs >= 0) {
+ "${downloadStatus.receivedBytes.humanReadableSize(extraDecimalForGbAndAbove = true)} of ${totalSize.humanReadableSize()}"
+ if (downloadStatus.bytesPerSecond > 0) {
sizeLabel =
- "$sizeLabel\n${downloadStatus.remainingMs.formatToHourMinSecond()} left"
+ "$sizeLabel · ${downloadStatus.bytesPerSecond.humanReadableSize()} / s"
+ if (downloadStatus.remainingMs >= 0) {
+ sizeLabel =
+ "$sizeLabel\n${downloadStatus.remainingMs.formatToHourMinSecond()} left"
+ }
}
+ if (isPartiallyDownloaded) {
+ sizeLabel = "$sizeLabel (resuming...)"
+ }
+ curDownloadProgress =
+ downloadStatus.receivedBytes.toFloat() / downloadStatus.totalBytes.toFloat()
+ if (curDownloadProgress.isNaN()) {
+ curDownloadProgress = 0f
+ }
+ fontSize = 9.sp
}
- if (isPartiallyDownloaded) {
- sizeLabel = "$sizeLabel (resuming...)"
- }
- curDownloadProgress =
- downloadStatus.receivedBytes.toFloat() / downloadStatus.totalBytes.toFloat()
- if (curDownloadProgress.isNaN()) {
- curDownloadProgress = 0f
+ // Status for unzipping.
+ else if (downloadStatus.status == ModelDownloadStatusType.UNZIPPING) {
+ sizeLabel = "Unzipping..."
}
- fontSize = 9.sp
}
- // Status for unzipping.
- else if (downloadStatus.status == ModelDownloadStatusType.UNZIPPING) {
- sizeLabel = "Unzipping..."
+
+ Column(
+ horizontalAlignment = if (isExpanded) Alignment.CenterHorizontally else Alignment.Start,
+ ) {
+ for ((index, line) in sizeLabel.split("\n").withIndex()) {
+ Text(
+ line,
+ color = MaterialTheme.colorScheme.secondary,
+ maxLines = 1,
+ style = labelSmallNarrow.copy(fontSize = fontSize, lineHeight = 10.sp),
+ textAlign = if (isExpanded) TextAlign.Center else TextAlign.Start,
+ overflow = TextOverflow.Visible,
+ modifier = Modifier
+ .offset(y = if (index == 0) 0.dp else (-1).dp)
+ .sharedElement(
+ rememberSharedContentState(key = "status_label_${index}"),
+ animatedVisibilityScope = animatedVisibilityScope
+ )
+ )
+ }
}
}
+ }
- Column(
- horizontalAlignment = if (isExpanded) Alignment.CenterHorizontally else Alignment.Start,
- ) {
- for ((index, line) in sizeLabel.split("\n").withIndex()) {
- Text(
- line,
- color = MaterialTheme.colorScheme.secondary,
- maxLines = 1,
- style = labelSmallNarrow.copy(fontSize = fontSize, lineHeight = 10.sp),
- textAlign = if (isExpanded) TextAlign.Center else TextAlign.Start,
- overflow = TextOverflow.Visible,
- modifier = modifier.offset(y = if (index == 0) 0.dp else (-1).dp)
+ // Download progress bar.
+ if (inProgress || isPartiallyDownloaded) {
+ val animatedProgress = remember { Animatable(0f) }
+ LinearProgressIndicator(
+ progress = { animatedProgress.value },
+ color = getTaskIconColor(task = task),
+ trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+ modifier = Modifier
+ .padding(top = 2.dp)
+ .sharedElement(
+ rememberSharedContentState(key = "download_progress_bar"),
+ animatedVisibilityScope = animatedVisibilityScope
)
- }
+ )
+ LaunchedEffect(curDownloadProgress) {
+ animatedProgress.animateTo(curDownloadProgress, animationSpec = tween(150))
}
}
- }
-
- // Download progress bar.
- if (inProgress || isPartiallyDownloaded) {
- val animatedProgress = remember { Animatable(0f) }
- LinearProgressIndicator(
- progress = { animatedProgress.value },
- color = getTaskIconColor(task = task),
- trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
- modifier = modifier.padding(top = 2.dp)
- )
- LaunchedEffect(curDownloadProgress) {
- animatedProgress.animateTo(curDownloadProgress, animationSpec = tween(150))
+ // Unzipping progress.
+ else if (downloadStatus?.status == ModelDownloadStatusType.UNZIPPING) {
+ LinearProgressIndicator(
+ color = getTaskIconColor(task = task),
+ trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+ modifier = Modifier
+ .padding(top = 2.dp)
+ .sharedElement(
+ rememberSharedContentState(key = "unzip_progress_bar"),
+ animatedVisibilityScope = animatedVisibilityScope
+ )
+ )
}
}
- // Unzipping progress.
- else if (downloadStatus?.status == ModelDownloadStatusType.UNZIPPING) {
- LinearProgressIndicator(
- color = getTaskIconColor(task = task),
- trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
- modifier = Modifier
- .padding(top = 2.dp),
- )
- }
}
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
index 046111823..f3c369dce 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
@@ -16,8 +16,11 @@
package com.google.aiedge.gallery.ui.home
+import android.app.Activity
+import android.content.Context
import android.content.Intent
import android.net.Uri
+import android.provider.OpenableColumns
import android.util.Log
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.ActivityResultLauncher
@@ -49,6 +52,7 @@ import androidx.compose.material.icons.automirrored.outlined.NoteAdd
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.rounded.Error
import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator
@@ -80,12 +84,18 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.layout
-import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalWindowInfo
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withLink
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@@ -93,7 +103,6 @@ import com.google.aiedge.gallery.GalleryTopAppBar
import com.google.aiedge.gallery.R
import com.google.aiedge.gallery.data.AppBarAction
import com.google.aiedge.gallery.data.AppBarActionType
-import com.google.aiedge.gallery.data.ConfigKey
import com.google.aiedge.gallery.data.ImportedModelInfo
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.ui.common.TaskIcon
@@ -101,7 +110,6 @@ import com.google.aiedge.gallery.ui.common.getTaskBgColor
import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.ThemeSettings
import com.google.aiedge.gallery.ui.theme.customColors
import com.google.aiedge.gallery.ui.theme.titleMediumNarrow
import kotlinx.coroutines.delay
@@ -109,6 +117,12 @@ import kotlinx.coroutines.launch
private const val TAG = "AGHomeScreen"
private const val TASK_COUNT_ANIMATION_DURATION = 250
+private const val MAX_TASK_CARD_PADDING = 24
+private const val MIN_TASK_CARD_PADDING = 18
+private const val MAX_TASK_CARD_RADIUS = 43.5
+private const val MIN_TASK_CARD_RADIUS = 30
+private const val MAX_TASK_CARD_ICON_SIZE = 56
+private const val MIN_TASK_CARD_ICON_SIZE = 50
/** Navigation destination data */
object HomeScreenDestination {
@@ -127,6 +141,7 @@ fun HomeScreen(
val uiState by modelManagerViewModel.uiState.collectAsState()
var showSettingsDialog by remember { mutableStateOf(false) }
var showImportModelSheet by remember { mutableStateOf(false) }
+ var showUnsupportedFileTypeDialog by remember { mutableStateOf(false) }
val sheetState = rememberModalBottomSheetState()
var showImportDialog by remember { mutableStateOf(false) }
var showImportingDialog by remember { mutableStateOf(false) }
@@ -135,17 +150,21 @@ fun HomeScreen(
val coroutineScope = rememberCoroutineScope()
val snackbarHostState = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
-
- val nonEmptyTasks = uiState.tasks.filter { it.models.size > 0 }
- val loadingHfModels = uiState.loadingHfModels
+ val context = LocalContext.current
val filePickerLauncher: ActivityResultLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.StartActivityForResult()
) { result ->
if (result.resultCode == android.app.Activity.RESULT_OK) {
result.data?.data?.let { uri ->
- selectedLocalModelFileUri.value = uri
- showImportDialog = true
+ val fileName = getFileName(context = context, uri = uri)
+ Log.d(TAG, "Selected file: $fileName")
+ if (fileName != null && !fileName.endsWith(".task")) {
+ showUnsupportedFileTypeDialog = true
+ } else {
+ selectedLocalModelFileUri.value = uri
+ showImportDialog = true
+ }
} ?: run {
Log.d(TAG, "No file selected or URI is null.")
}
@@ -154,36 +173,29 @@ fun HomeScreen(
}
}
- Scaffold(
- modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
- topBar = {
- GalleryTopAppBar(
- title = stringResource(HomeScreenDestination.titleRes),
- rightAction = AppBarAction(
- actionType = AppBarActionType.APP_SETTING, actionFn = {
- showSettingsDialog = true
- }
- ),
- loadingHfModels = loadingHfModels,
- scrollBehavior = scrollBehavior,
- )
- },
- floatingActionButton = {
- // A floating action button to show "import model" bottom sheet.
- SmallFloatingActionButton(
- onClick = {
- showImportModelSheet = true
- },
- containerColor = MaterialTheme.colorScheme.secondaryContainer,
- contentColor = MaterialTheme.colorScheme.secondary,
- ) {
- Icon(Icons.Filled.Add, "")
- }
+ Scaffold(modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
+ GalleryTopAppBar(
+ title = stringResource(HomeScreenDestination.titleRes),
+ rightAction = AppBarAction(actionType = AppBarActionType.APP_SETTING, actionFn = {
+ showSettingsDialog = true
+ }),
+ scrollBehavior = scrollBehavior,
+ )
+ }, floatingActionButton = {
+ // A floating action button to show "import model" bottom sheet.
+ SmallFloatingActionButton(
+ onClick = {
+ showImportModelSheet = true
+ },
+ containerColor = MaterialTheme.colorScheme.secondaryContainer,
+ contentColor = MaterialTheme.colorScheme.secondary,
+ ) {
+ Icon(Icons.Filled.Add, "")
}
- ) { innerPadding ->
+ }) { innerPadding ->
Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.fillMaxSize()) {
TaskList(
- tasks = nonEmptyTasks,
+ tasks = uiState.tasks,
navigateToTaskScreen = navigateToTaskScreen,
loadingModelAllowlist = uiState.loadingModelAllowlist,
modifier = Modifier.fillMaxSize(),
@@ -198,16 +210,8 @@ fun HomeScreen(
if (showSettingsDialog) {
SettingsDialog(
curThemeOverride = modelManagerViewModel.readThemeOverride(),
+ modelManagerViewModel = modelManagerViewModel,
onDismissed = { showSettingsDialog = false },
- onOk = { curConfigValues ->
- // Update theme settings.
- // This will update app's theme.
- val themeOverride = curConfigValues[ConfigKey.THEME.label] as String
- ThemeSettings.themeOverride.value = themeOverride
-
- // Save to data store.
- modelManagerViewModel.saveThemeOverride(themeOverride)
- },
)
}
@@ -232,10 +236,6 @@ fun HomeScreen(
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = "*/*"
- putExtra(
- Intent.EXTRA_MIME_TYPES,
- arrayOf("application/x-binary", "application/octet-stream")
- )
// Single select.
putExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
}
@@ -259,13 +259,11 @@ fun HomeScreen(
// Import dialog
if (showImportDialog) {
selectedLocalModelFileUri.value?.let { uri ->
- ModelImportDialog(uri = uri,
- onDismiss = { showImportDialog = false },
- onDone = { info ->
- selectedImportedModelInfo.value = info
- showImportDialog = false
- showImportingDialog = true
- })
+ ModelImportDialog(uri = uri, onDismiss = { showImportDialog = false }, onDone = { info ->
+ selectedImportedModelInfo.value = info
+ showImportDialog = false
+ showImportingDialog = true
+ })
}
}
@@ -273,8 +271,7 @@ fun HomeScreen(
if (showImportingDialog) {
selectedLocalModelFileUri.value?.let { uri ->
selectedImportedModelInfo.value?.let { info ->
- ModelImportingDialog(
- uri = uri,
+ ModelImportingDialog(uri = uri,
info = info,
onDismiss = { showImportingDialog = false },
onDone = {
@@ -292,6 +289,22 @@ fun HomeScreen(
}
}
+ // Alert dialog for unsupported file type.
+ if (showUnsupportedFileTypeDialog) {
+ AlertDialog(
+ onDismissRequest = { showUnsupportedFileTypeDialog = false },
+ title = { Text("Unsupported file type") },
+ text = {
+ Text("Only \".task\" file type is supported.")
+ },
+ confirmButton = {
+ Button(onClick = { showUnsupportedFileTypeDialog = false }) {
+ Text(stringResource(R.string.ok))
+ }
+ },
+ )
+ }
+
if (uiState.loadingModelAllowlistError.isNotEmpty()) {
AlertDialog(
icon = {
@@ -307,11 +320,9 @@ fun HomeScreen(
modelManagerViewModel.loadModelAllowlist()
},
confirmButton = {
- TextButton(
- onClick = {
- modelManagerViewModel.loadModelAllowlist()
- }
- ) {
+ TextButton(onClick = {
+ modelManagerViewModel.loadModelAllowlist()
+ }) {
Text("Retry")
}
},
@@ -327,6 +338,38 @@ private fun TaskList(
modifier: Modifier = Modifier,
contentPadding: PaddingValues = PaddingValues(0.dp),
) {
+ val density = LocalDensity.current
+ val windowInfo = LocalWindowInfo.current
+ val screenWidthDp = remember {
+ with(density) {
+ windowInfo.containerSize.width.toDp()
+ }
+ }
+ val screenHeightDp = remember {
+ with(density) {
+ windowInfo.containerSize.height.toDp()
+ }
+ }
+ val sizeFraction = remember { ((screenWidthDp - 360.dp) / (410.dp - 360.dp)).coerceIn(0f, 1f) }
+ val linkColor = MaterialTheme.customColors.linkColor
+
+ val introText = buildAnnotatedString {
+ append("Welcome to AI Edge Gallery! Explore a world of \namazing on-device models from ")
+ withLink(
+ link = LinkAnnotation.Url(
+ url = "https://huggingface.co/litert-community", // Replace with the actual URL
+ styles = TextLinkStyles(
+ style = SpanStyle(
+ color = linkColor,
+ textDecoration = TextDecoration.Underline,
+ )
+ )
+ )
+ ) {
+ append("LiteRT community")
+ }
+ }
+
Box(modifier = modifier.fillMaxSize()) {
LazyVerticalGrid(
columns = GridCells.Fixed(count = 2),
@@ -335,10 +378,15 @@ private fun TaskList(
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
) {
+ // New rel
+ item(key = "newReleaseNotification", span = { GridItemSpan(2) }) {
+ NewReleaseNotification()
+ }
+
// Headline.
item(key = "headline", span = { GridItemSpan(2) }) {
Text(
- "Welcome to AI Edge Gallery! Explore a world of \namazing on-device models from LiteRT community",
+ introText,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
modifier = Modifier.padding(bottom = 20.dp)
@@ -364,14 +412,21 @@ private fun TaskList(
}
}
} else {
- // Cards.
+ // LLM Cards.
+ item(key = "llmCardsHeader", span = { GridItemSpan(2) }) {
+ Text(
+ "Example LLM Use Cases",
+ style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.SemiBold),
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.padding(bottom = 4.dp)
+ )
+ }
+
items(tasks) { task ->
TaskCard(
- task = task,
- onClick = {
+ sizeFraction = sizeFraction, task = task, onClick = {
navigateToTaskScreen(task)
- },
- modifier = Modifier
+ }, modifier = Modifier
.fillMaxWidth()
.aspectRatio(1f)
)
@@ -388,7 +443,7 @@ private fun TaskList(
Box(
modifier = Modifier
.fillMaxWidth()
- .height(LocalConfiguration.current.screenHeightDp.dp * 0.25f)
+ .height(screenHeightDp * 0.25f)
.background(
Brush.verticalGradient(
colors = MaterialTheme.customColors.homeBottomGradient,
@@ -400,7 +455,15 @@ private fun TaskList(
}
@Composable
-private fun TaskCard(task: Task, onClick: () -> Unit, modifier: Modifier = Modifier) {
+private fun TaskCard(
+ task: Task, onClick: () -> Unit, sizeFraction: Float, modifier: Modifier = Modifier
+) {
+ val padding =
+ (MAX_TASK_CARD_PADDING - MIN_TASK_CARD_PADDING) * sizeFraction + MIN_TASK_CARD_PADDING
+ val radius = (MAX_TASK_CARD_RADIUS - MIN_TASK_CARD_RADIUS) * sizeFraction + MIN_TASK_CARD_RADIUS
+ val iconSize =
+ (MAX_TASK_CARD_ICON_SIZE - MIN_TASK_CARD_ICON_SIZE) * sizeFraction + MIN_TASK_CARD_ICON_SIZE
+
// Observes the model count and updates the model count label with a fade-in/fade-out animation
// whenever the count changes.
val modelCount by remember {
@@ -445,7 +508,7 @@ private fun TaskCard(task: Task, onClick: () -> Unit, modifier: Modifier = Modif
Card(
modifier = modifier
- .clip(RoundedCornerShape(43.5.dp))
+ .clip(RoundedCornerShape(radius.dp))
.clickable(
onClick = onClick,
),
@@ -456,39 +519,24 @@ private fun TaskCard(task: Task, onClick: () -> Unit, modifier: Modifier = Modif
Column(
modifier = Modifier
.fillMaxSize()
- .padding(24.dp),
+ .padding(padding.dp),
) {
// Icon.
- TaskIcon(task = task)
+ TaskIcon(task = task, width = iconSize.dp)
- Spacer(modifier = Modifier.weight(1f))
+ Spacer(modifier = Modifier.weight(2f))
// Title.
- val pair = task.type.label.splitByFirstSpace()
Text(
- pair.first,
+ task.type.label,
color = MaterialTheme.colorScheme.primary,
style = titleMediumNarrow.copy(
fontSize = 20.sp,
fontWeight = FontWeight.Bold,
),
)
- if (pair.second.isNotEmpty()) {
- Text(
- pair.second,
- color = MaterialTheme.colorScheme.primary,
- style = titleMediumNarrow.copy(
- fontSize = 18.sp,
- fontWeight = FontWeight.Bold,
- ),
- modifier = Modifier.layout { measurable, constraints ->
- val placeable = measurable.measure(constraints)
- layout(placeable.width, placeable.height) {
- placeable.placeRelative(0, -4.dp.roundToPx())
- }
- }
- )
- }
+
+ Spacer(modifier = Modifier.weight(1f))
// Model count.
Text(
@@ -503,12 +551,21 @@ private fun TaskCard(task: Task, onClick: () -> Unit, modifier: Modifier = Modif
}
}
-private fun String.splitByFirstSpace(): Pair {
- val spaceIndex = this.indexOf(' ')
- if (spaceIndex == -1) {
- return Pair(this, "")
+// Helper function to get the file name from a URI
+fun getFileName(context: Context, uri: Uri): String? {
+ if (uri.scheme == "content") {
+ context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
+ if (cursor.moveToFirst()) {
+ val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+ if (nameIndex != -1) {
+ return cursor.getString(nameIndex)
+ }
+ }
+ }
+ } else if (uri.scheme == "file") {
+ return uri.lastPathSegment
}
- return Pair(this.substring(0, spaceIndex), this.substring(spaceIndex + 1))
+ return null
}
@Preview
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt
index c5e973347..7708d19f6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt
@@ -22,12 +22,16 @@ import android.provider.OpenableColumns
import android.util.Log
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.tween
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Error
import androidx.compose.material3.Button
@@ -51,6 +55,7 @@ import androidx.compose.runtime.snapshots.SnapshotStateMap
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
@@ -82,41 +87,34 @@ import java.nio.charset.StandardCharsets
private const val TAG = "AGModelImportDialog"
private val IMPORT_CONFIGS_LLM: List = listOf(
- LabelConfig(key = ConfigKey.NAME),
- LabelConfig(key = ConfigKey.MODEL_TYPE),
- NumberSliderConfig(
+ LabelConfig(key = ConfigKey.NAME), LabelConfig(key = ConfigKey.MODEL_TYPE), NumberSliderConfig(
key = ConfigKey.DEFAULT_MAX_TOKENS,
sliderMin = 100f,
sliderMax = 1024f,
defaultValue = DEFAULT_MAX_TOKEN.toFloat(),
valueType = ValueType.INT
- ),
- NumberSliderConfig(
+ ), NumberSliderConfig(
key = ConfigKey.DEFAULT_TOPK,
sliderMin = 5f,
sliderMax = 40f,
defaultValue = DEFAULT_TOPK.toFloat(),
valueType = ValueType.INT
- ),
- NumberSliderConfig(
+ ), NumberSliderConfig(
key = ConfigKey.DEFAULT_TOPP,
sliderMin = 0.0f,
sliderMax = 1.0f,
defaultValue = DEFAULT_TOPP,
valueType = ValueType.FLOAT
- ),
- NumberSliderConfig(
+ ), NumberSliderConfig(
key = ConfigKey.DEFAULT_TEMPERATURE,
sliderMin = 0.0f,
sliderMax = 2.0f,
defaultValue = DEFAULT_TEMPERATURE,
valueType = ValueType.FLOAT
- ),
- BooleanSwitchConfig(
+ ), BooleanSwitchConfig(
key = ConfigKey.SUPPORT_IMAGE,
defaultValue = false,
- ),
- SegmentedButtonConfig(
+ ), SegmentedButtonConfig(
key = ConfigKey.COMPATIBLE_ACCELERATORS,
defaultValue = Accelerator.CPU.label,
options = listOf(Accelerator.CPU.label, Accelerator.GPU.label),
@@ -126,9 +124,7 @@ private val IMPORT_CONFIGS_LLM: List = listOf(
@Composable
fun ModelImportDialog(
- uri: Uri,
- onDismiss: () -> Unit,
- onDone: (ImportedModelInfo) -> Unit
+ uri: Uri, onDismiss: () -> Unit, onDone: (ImportedModelInfo) -> Unit
) {
val context = LocalContext.current
val info = remember { getFileSizeAndDisplayNameFromUri(context = context, uri = uri) }
@@ -150,15 +146,23 @@ fun ModelImportDialog(
putAll(initialValues)
}
}
+ val interactionSource = remember { MutableInteractionSource() }
Dialog(
onDismissRequest = onDismiss,
) {
- Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
+ val focusManager = LocalFocusManager.current
+ Card(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable(
+ interactionSource = interactionSource, indication = null // Disable the ripple effect
+ ) {
+ focusManager.clearFocus()
+ }, shape = RoundedCornerShape(16.dp)
+ ) {
Column(
- modifier = Modifier
- .padding(20.dp),
- verticalArrangement = Arrangement.spacedBy(16.dp)
+ modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
) {
// Title.
Text(
@@ -167,11 +171,18 @@ fun ModelImportDialog(
modifier = Modifier.padding(bottom = 8.dp)
)
- // Default configs for users to set.
- ConfigEditorsPanel(
- configs = IMPORT_CONFIGS_LLM,
- values = values,
- )
+ Column(
+ modifier = Modifier
+ .verticalScroll(rememberScrollState())
+ .weight(1f, fill = false),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ // Default configs for users to set.
+ ConfigEditorsPanel(
+ configs = IMPORT_CONFIGS_LLM,
+ values = values,
+ )
+ }
// Button row.
Row(
@@ -210,10 +221,7 @@ fun ModelImportDialog(
@Composable
fun ModelImportingDialog(
- uri: Uri,
- info: ImportedModelInfo,
- onDismiss: () -> Unit,
- onDone: (ImportedModelInfo) -> Unit
+ uri: Uri, info: ImportedModelInfo, onDismiss: () -> Unit, onDone: (ImportedModelInfo) -> Unit
) {
var error by remember { mutableStateOf("") }
val context = LocalContext.current
@@ -222,8 +230,7 @@ fun ModelImportingDialog(
LaunchedEffect(Unit) {
// Import.
- importModel(
- context = context,
+ importModel(context = context,
coroutineScope = coroutineScope,
fileName = info.fileName,
fileSize = info.fileSize,
@@ -236,8 +243,7 @@ fun ModelImportingDialog(
},
onError = {
error = it
- }
- )
+ })
}
Dialog(
@@ -246,9 +252,7 @@ fun ModelImportingDialog(
) {
Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
Column(
- modifier = Modifier
- .padding(20.dp),
- verticalArrangement = Arrangement.spacedBy(16.dp)
+ modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
) {
// Title.
Text(
@@ -280,13 +284,10 @@ fun ModelImportingDialog(
// Has error.
else {
Row(
- verticalAlignment = Alignment.Top,
- horizontalArrangement = Arrangement.spacedBy(6.dp)
+ verticalAlignment = Alignment.Top, horizontalArrangement = Arrangement.spacedBy(6.dp)
) {
Icon(
- Icons.Rounded.Error,
- contentDescription = "",
- tint = MaterialTheme.colorScheme.error
+ Icons.Rounded.Error, contentDescription = "", tint = MaterialTheme.colorScheme.error
)
Text(
error,
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
new file mode 100644
index 000000000..231a92bd4
--- /dev/null
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
@@ -0,0 +1,121 @@
+package com.google.aiedge.gallery.ui.home
+
+import android.util.Log
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.OpenInNew
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import com.google.aiedge.gallery.BuildConfig
+import com.google.aiedge.gallery.ui.common.getJsonResponse
+import com.google.aiedge.gallery.ui.modelmanager.ClickableLink
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+import kotlin.math.max
+
+private const val TAG = "AGNewReleaseNotification"
+private const val REPO = "google-ai-edge/gallery"
+
+@Serializable
+data class ReleaseInfo(
+ val html_url: String,
+ val tag_name: String,
+)
+
+@Composable
+fun NewReleaseNotification() {
+ var newReleaseVersion by remember { mutableStateOf("") }
+ var newReleaseUrl by remember { mutableStateOf("") }
+
+ LaunchedEffect(Unit) {
+ withContext(Dispatchers.IO) {
+ Log.d("AGNewReleaseNotification", "Checking for new release...")
+ val info = getJsonResponse("https://api.github.com/repos/$REPO/releases/latest")
+ if (info != null) {
+ val curRelease = BuildConfig.VERSION_NAME
+ val newRelease = info.tag_name
+ val isNewer = isNewerRelease(currentRelease = curRelease, newRelease = newRelease)
+ Log.d(TAG, "curRelease: $curRelease, newRelease: $newRelease, isNewer: $isNewer")
+ if (isNewer) {
+ newReleaseVersion = newRelease
+ newReleaseUrl = info.html_url
+ }
+ }
+ }
+ }
+
+ AnimatedVisibility(
+ visible = newReleaseVersion.isNotEmpty(),
+ enter = fadeIn() + expandVertically()
+ ) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.SpaceBetween,
+ modifier = Modifier
+ .padding(horizontal = 16.dp)
+ .padding(bottom = 12.dp)
+ .clip(
+ CircleShape
+ )
+ .background(MaterialTheme.colorScheme.tertiaryContainer)
+ .padding(4.dp)
+ ) {
+ Text(
+ "New release $newReleaseVersion available",
+ style = MaterialTheme.typography.bodyMedium,
+ modifier = Modifier.padding(start = 12.dp)
+ )
+ Row(
+ modifier = Modifier.padding(end = 12.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ ClickableLink(
+ url = newReleaseUrl,
+ linkText = "View",
+ icon = Icons.AutoMirrored.Rounded.OpenInNew,
+ )
+ }
+ }
+ }
+}
+
+fun isNewerRelease(currentRelease: String, newRelease: String): Boolean {
+ // Split the version strings into their individual components (e.g., "0.9.0" -> ["0", "9", "0"])
+ val currentComponents = currentRelease.split('.').map { it.toIntOrNull() ?: 0 }
+ val newComponents = newRelease.split('.').map { it.toIntOrNull() ?: 0 }
+
+ // Determine the maximum number of components to iterate through
+ val maxComponents = max(currentComponents.size, newComponents.size)
+
+ // Iterate through the components from left to right (major, minor, patch, etc.)
+ for (i in 0 until maxComponents) {
+ val currentComponent = currentComponents.getOrElse(i) { 0 }
+ val newComponent = newComponents.getOrElse(i) { 0 }
+
+ if (newComponent > currentComponent) {
+ return true
+ } else if (newComponent < currentComponent) {
+ return false
+ }
+ }
+
+ return false
+}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt
index f8b46079e..e5becbe3f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt
@@ -16,45 +16,266 @@
package com.google.aiedge.gallery.ui.home
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.CheckCircle
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MultiChoiceSegmentedButtonRow
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
import com.google.aiedge.gallery.BuildConfig
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.SegmentedButtonConfig
-import com.google.aiedge.gallery.ui.common.chat.ConfigDialog
+import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.aiedge.gallery.ui.theme.THEME_AUTO
import com.google.aiedge.gallery.ui.theme.THEME_DARK
import com.google.aiedge.gallery.ui.theme.THEME_LIGHT
+import com.google.aiedge.gallery.ui.theme.ThemeSettings
+import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+import kotlin.math.min
-private val CONFIGS: List = listOf(
- SegmentedButtonConfig(
- key = ConfigKey.THEME,
- defaultValue = THEME_AUTO,
- options = listOf(THEME_AUTO, THEME_LIGHT, THEME_DARK),
- )
-)
+private val THEME_OPTIONS = listOf(THEME_AUTO, THEME_LIGHT, THEME_DARK)
@Composable
fun SettingsDialog(
curThemeOverride: String,
+ modelManagerViewModel: ModelManagerViewModel,
onDismissed: () -> Unit,
- onOk: (Map) -> Unit,
) {
- val initialValues = mapOf(
- ConfigKey.THEME.label to curThemeOverride
- )
- ConfigDialog(
- title = "Settings",
- subtitle = "App version: ${BuildConfig.VERSION_NAME}",
- okBtnLabel = "OK",
- configs = CONFIGS,
- initialValues = initialValues,
- onDismissed = onDismissed,
- onOk = { curConfigValues ->
- onOk(curConfigValues)
-
- // Hide config dialog.
- onDismissed()
- },
- )
+ var selectedTheme by remember { mutableStateOf(curThemeOverride) }
+ var hfToken by remember { mutableStateOf(modelManagerViewModel.getTokenStatusAndData().data) }
+ val dateFormatter = remember {
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault())
+ .withLocale(Locale.getDefault())
+ }
+ var customHfToken by remember { mutableStateOf("") }
+ var isFocused by remember { mutableStateOf(false) }
+ val focusRequester = remember { FocusRequester() }
+ val interactionSource = remember { MutableInteractionSource() }
+
+ Dialog(onDismissRequest = onDismissed) {
+ val focusManager = LocalFocusManager.current
+ Card(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable(
+ interactionSource = interactionSource, indication = null // Disable the ripple effect
+ ) {
+ focusManager.clearFocus()
+ }, shape = RoundedCornerShape(16.dp)
+ ) {
+ Column(
+ modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ // Dialog title and subtitle.
+ Column {
+ Text(
+ "Settings",
+ style = MaterialTheme.typography.titleLarge,
+ modifier = Modifier.padding(bottom = 8.dp)
+ )
+ // Subtitle.
+ Text(
+ "App version: ${BuildConfig.VERSION_NAME}",
+ style = labelSmallNarrow,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.offset(y = (-6).dp)
+ )
+ }
+
+ Column(
+ modifier = Modifier
+ .verticalScroll(rememberScrollState())
+ .weight(1f, fill = false),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ // Theme switcher.
+ Column(
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ "Theme",
+ style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold)
+ )
+ MultiChoiceSegmentedButtonRow {
+ THEME_OPTIONS.forEachIndexed { index, label ->
+ SegmentedButton(shape = SegmentedButtonDefaults.itemShape(
+ index = index, count = THEME_OPTIONS.size
+ ), onCheckedChange = {
+ selectedTheme = label
+
+ // Update theme settings.
+ // This will update app's theme.
+ ThemeSettings.themeOverride.value = label
+
+ // Save to data store.
+ modelManagerViewModel.saveThemeOverride(label)
+ }, checked = label == selectedTheme, label = { Text(label) })
+ }
+ }
+ }
+
+ // HF Token management.
+ Column(
+ modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ Text(
+ "HuggingFace access token",
+ style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold)
+ )
+ // Show the start of the token.
+ val curHfToken = hfToken
+ if (curHfToken != null) {
+ Text(
+ curHfToken.accessToken.substring(0, min(16, curHfToken.accessToken.length)) + "...",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ Text(
+ "Expired at: ${dateFormatter.format(Instant.ofEpochMilli(curHfToken.expiresAtMs))}",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ } else {
+ Text(
+ "Not available",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ Text(
+ "The token will be automatically retrieved when a gated model is downloaded",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
+ OutlinedButton(
+ onClick = {
+ modelManagerViewModel.clearAccessToken()
+ hfToken = null
+ }, enabled = curHfToken != null
+ ) {
+ Text("Clear")
+ }
+ BasicTextField(
+ value = customHfToken,
+ singleLine = true,
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 4.dp)
+ .focusRequester(focusRequester)
+ .onFocusChanged {
+ isFocused = it.isFocused
+ },
+ onValueChange = {
+ customHfToken = it
+ },
+ textStyle = TextStyle(color = MaterialTheme.colorScheme.onSurface),
+ cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurface),
+ ) { innerTextField ->
+ Box(
+ modifier = Modifier
+ .border(
+ width = if (isFocused) 2.dp else 1.dp,
+ color = if (isFocused) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline,
+ shape = CircleShape,
+ )
+ .height(40.dp), contentAlignment = Alignment.CenterStart
+ ) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Box(
+ modifier = Modifier
+ .padding(start = 16.dp)
+ .weight(1f)
+ ) {
+ if (customHfToken.isEmpty()) {
+ Text(
+ "Enter token manually",
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ style = MaterialTheme.typography.bodySmall
+ )
+ }
+ innerTextField()
+ }
+ if (customHfToken.isNotEmpty()) {
+ IconButton(
+ modifier = Modifier.offset(x = 1.dp),
+ onClick = {
+ modelManagerViewModel.saveAccessToken(
+ accessToken = customHfToken,
+ refreshToken = "",
+ expiresAt = System.currentTimeMillis() + 1000L * 60 * 60 * 24 * 365 * 10,
+ )
+ hfToken = modelManagerViewModel.getTokenStatusAndData().data
+ }) {
+ Icon(Icons.Rounded.CheckCircle, contentDescription = "")
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ // Button row.
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 8.dp),
+ horizontalArrangement = Arrangement.End,
+ ) {
+ // Close button
+ Button(
+ onClick = {
+ onDismissed()
+ },
+ ) {
+ Text("Close")
+ }
+ }
+ }
+ }
+ }
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt
index 740e4a1ec..2080ad72f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt
@@ -34,9 +34,9 @@ object LlmChatDestination {
val route = "LlmChatRoute"
}
-object LlmImageToTextDestination {
+object LlmAskImageDestination {
@Serializable
- val route = "LlmImageToTextRoute"
+ val route = "LlmAskImageRoute"
}
@Composable
@@ -57,11 +57,11 @@ fun LlmChatScreen(
}
@Composable
-fun LlmImageToTextScreen(
+fun LlmAskImageScreen(
modelManagerViewModel: ModelManagerViewModel,
navigateUp: () -> Unit,
modifier: Modifier = Modifier,
- viewModel: LlmImageToTextViewModel = viewModel(
+ viewModel: LlmAskImageViewModel = viewModel(
factory = ViewModelProvider.Factory
),
) {
@@ -129,12 +129,7 @@ fun ChatViewWrapper(
})
}
},
- onBenchmarkClicked = { model, message, warmUpIterations, benchmarkIterations ->
- if (message is ChatMessageText) {
- viewModel.benchmark(
- model = model, message = message
- )
- }
+ onBenchmarkClicked = { _, _, _, _ ->
},
onResetSessionClicked = { model ->
viewModel.resetSession(model = model)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
index 3f4a2c600..91fabb335 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
@@ -22,7 +22,7 @@ import android.util.Log
import androidx.lifecycle.viewModelScope
import com.google.aiedge.gallery.data.Model
import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.TASK_LLM_IMAGE_TO_TEXT
+import com.google.aiedge.gallery.data.TASK_LLM_ASK_IMAGE
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.ui.common.chat.ChatMessageBenchmarkLlmResult
import com.google.aiedge.gallery.ui.common.chat.ChatMessageLoading
@@ -49,6 +49,7 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
fun generateResponse(model: Model, input: String, image: Bitmap? = null, onError: () -> Unit) {
viewModelScope.launch(Dispatchers.Default) {
setInProgress(true)
+ setPreparing(true)
// Loading.
addMessage(
@@ -88,6 +89,7 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
timeToFirstToken = (firstTokenTs - start) / 1000f
prefillSpeed = prefillTokens / timeToFirstToken
firstRun = false
+ setPreparing(false)
} else {
decodeTokens++
}
@@ -137,10 +139,12 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
},
cleanUpListener = {
setInProgress(false)
+ setPreparing(false)
})
} catch (e: Exception) {
Log.e(TAG, "Error occurred while running inference", e)
setInProgress(false)
+ setPreparing(false)
onError()
}
}
@@ -194,98 +198,6 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
}
}
- fun benchmark(model: Model, message: ChatMessageText) {
- viewModelScope.launch(Dispatchers.Default) {
- setInProgress(true)
-
- // Wait for model to be initialized.
- while (model.instance == null) {
- delay(100)
- }
- val instance = model.instance as LlmModelInstance
- val prefillTokens = instance.session.sizeInTokens(message.content)
-
- // Add the message to show benchmark results.
- val benchmarkLlmResult = ChatMessageBenchmarkLlmResult(
- orderedStats = STATS,
- statValues = mutableMapOf(),
- running = true,
- latencyMs = -1f,
- )
- addMessage(model = model, message = benchmarkLlmResult)
-
- // Run inference.
- val result = StringBuilder()
- var firstRun = true
- var timeToFirstToken = 0f
- var firstTokenTs = 0L
- var decodeTokens = 0
- var prefillSpeed = 0f
- var decodeSpeed: Float
- val start = System.currentTimeMillis()
- var lastUpdateTime = 0L
- LlmChatModelHelper.runInference(model = model,
- input = message.content,
- resultListener = { partialResult, done ->
- val curTs = System.currentTimeMillis()
-
- if (firstRun) {
- firstTokenTs = System.currentTimeMillis()
- timeToFirstToken = (firstTokenTs - start) / 1000f
- prefillSpeed = prefillTokens / timeToFirstToken
- firstRun = false
-
- // Update message to show prefill speed.
- replaceLastMessage(
- model = model,
- message = ChatMessageBenchmarkLlmResult(
- orderedStats = STATS,
- statValues = mutableMapOf(
- "prefill_speed" to prefillSpeed,
- "time_to_first_token" to timeToFirstToken,
- "latency" to (curTs - start).toFloat() / 1000f,
- ),
- running = false,
- latencyMs = -1f,
- ),
- type = ChatMessageType.BENCHMARK_LLM_RESULT,
- )
- } else {
- decodeTokens++
- }
- result.append(partialResult)
-
- if (curTs - lastUpdateTime > 500 || done) {
- decodeSpeed = decodeTokens / ((curTs - firstTokenTs) / 1000f)
- if (decodeSpeed.isNaN()) {
- decodeSpeed = 0f
- }
- replaceLastMessage(
- model = model, message = ChatMessageBenchmarkLlmResult(
- orderedStats = STATS,
- statValues = mutableMapOf(
- "prefill_speed" to prefillSpeed,
- "decode_speed" to decodeSpeed,
- "time_to_first_token" to timeToFirstToken,
- "latency" to (curTs - start).toFloat() / 1000f,
- ),
- running = !done,
- latencyMs = -1f,
- ), type = ChatMessageType.BENCHMARK_LLM_RESULT
- )
- lastUpdateTime = curTs
-
- if (done) {
- setInProgress(false)
- }
- }
- },
- cleanUpListener = {
- setInProgress(false)
- })
- }
- }
-
fun handleError(
context: Context,
model: Model,
@@ -320,15 +232,8 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
)
// Re-generate the response automatically.
- generateResponse(model = model, input = triggeredMessage.content, onError = {
- handleError(
- context = context,
- model = model,
- modelManagerViewModel = modelManagerViewModel,
- triggeredMessage = triggeredMessage
- )
- })
+ generateResponse(model = model, input = triggeredMessage.content, onError = {})
}
}
-class LlmImageToTextViewModel : LlmChatViewModel(curTask = TASK_LLM_IMAGE_TO_TEXT)
\ No newline at end of file
+class LlmAskImageViewModel : LlmChatViewModel(curTask = TASK_LLM_ASK_IMAGE)
\ No newline at end of file
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
index 1b96140a5..0748a8f4f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
@@ -73,6 +73,7 @@ fun LlmSingleTurnScreen(
) {
val task = viewModel.task
val modelManagerUiState by modelManagerViewModel.uiState.collectAsState()
+ val uiState by viewModel.uiState.collectAsState()
val selectedModel = modelManagerUiState.selectedModel
val scope = rememberCoroutineScope()
val context = LocalContext.current
@@ -114,6 +115,8 @@ fun LlmSingleTurnScreen(
task = task,
model = selectedModel,
modelManagerViewModel = modelManagerViewModel,
+ inProgress = uiState.inProgress,
+ modelPreparing = uiState.preparing,
onConfigChanged = { _, _ -> },
onBackClicked = { handleNavigateUp() },
onModelSelected = { newSelectedModel ->
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
index 21e1b3c2a..9f3b677a9 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
@@ -20,10 +20,9 @@ import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_LLM_USECASES
+import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.ui.common.chat.ChatMessageBenchmarkLlmResult
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageLoading
import com.google.aiedge.gallery.ui.common.chat.Stat
import com.google.aiedge.gallery.ui.common.processLlmResponse
import com.google.aiedge.gallery.ui.llmchat.LlmChatModelHelper
@@ -44,9 +43,9 @@ data class LlmSingleTurnUiState(
val inProgress: Boolean = false,
/**
- * Indicates whether the model is currently being initialized.
+ * Indicates whether the model is preparing (before outputting any result and after initializing).
*/
- val initializing: Boolean = false,
+ val preparing: Boolean = false,
// model -> response>
val responsesByModel: Map>,
@@ -65,14 +64,14 @@ private val STATS = listOf(
Stat(id = "latency", label = "Latency", unit = "sec")
)
-open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_USECASES) : ViewModel() {
+open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_PROMPT_LAB) : ViewModel() {
private val _uiState = MutableStateFlow(createUiState(task = task))
val uiState = _uiState.asStateFlow()
fun generateResponse(model: Model, input: String) {
viewModelScope.launch(Dispatchers.Default) {
setInProgress(true)
- setInitializing(true)
+ setPreparing(true)
// Wait for instance to be initialized.
while (model.instance == null) {
@@ -98,7 +97,7 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_USECASES) : ViewMode
val curTs = System.currentTimeMillis()
if (firstRun) {
- setInitializing(false)
+ setPreparing(false)
firstTokenTs = System.currentTimeMillis()
timeToFirstToken = (firstTokenTs - start) / 1000f
prefillSpeed = prefillTokens / timeToFirstToken
@@ -148,7 +147,7 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_USECASES) : ViewMode
},
singleTurn = true,
cleanUpListener = {
- setInitializing(false)
+ setPreparing(false)
setInProgress(false)
})
}
@@ -167,8 +166,8 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_USECASES) : ViewMode
_uiState.update { _uiState.value.copy(inProgress = inProgress) }
}
- fun setInitializing(initializing: Boolean) {
- _uiState.update { _uiState.value.copy(initializing = initializing) }
+ fun setPreparing(preparing: Boolean) {
+ _uiState.update { _uiState.value.copy(preparing = preparing) }
}
fun updateResponse(model: Model, promptTemplateType: PromptTemplateType, response: String) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
index 2ca98d739..ce55efd23 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
@@ -339,7 +339,7 @@ fun PromptTemplatesPanel(
val modelInitializing =
modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING
- if (inProgress && !modelInitializing) {
+ if (inProgress && !modelInitializing && !uiState.preparing) {
IconButton(
onClick = {
onStopButtonClicked(model)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt
index 8d90ff455..d458f42de 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt
@@ -57,7 +57,7 @@ import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.dp
import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_LLM_USECASES
+import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
import com.google.aiedge.gallery.ui.common.chat.MarkdownText
import com.google.aiedge.gallery.ui.common.chat.MessageBodyBenchmarkLlm
import com.google.aiedge.gallery.ui.common.chat.MessageBodyLoading
@@ -76,11 +76,11 @@ fun ResponsePanel(
modelManagerViewModel: ModelManagerViewModel,
modifier: Modifier = Modifier,
) {
- val task = TASK_LLM_USECASES
+ val task = TASK_LLM_PROMPT_LAB
val uiState by viewModel.uiState.collectAsState()
val modelManagerUiState by modelManagerViewModel.uiState.collectAsState()
val inProgress = uiState.inProgress
- val initializing = uiState.initializing
+ val initializing = uiState.preparing
val selectedPromptTemplateType = uiState.selectedPromptTemplateType
val responseScrollState = rememberScrollState()
var selectedOptionIndex by remember { mutableIntStateOf(0) }
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
index 29e25d814..1e5e00db0 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
@@ -70,7 +70,7 @@ fun ModelList(
) {
// This is just to update "models" list when task.updateTrigger is updated so that the UI can
// be properly updated.
- val models by remember {
+ val models by remember(task) {
derivedStateOf {
val trigger = task.updateTrigger.value
if (trigger >= 0) {
@@ -80,7 +80,7 @@ fun ModelList(
}
}
}
- val importedModels by remember {
+ val importedModels by remember(task) {
derivedStateOf {
val trigger = task.updateTrigger.value
if (trigger >= 0) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
index d977e097a..ef8b63626 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
@@ -37,15 +37,16 @@ import com.google.aiedge.gallery.data.ModelAllowlist
import com.google.aiedge.gallery.data.ModelDownloadStatus
import com.google.aiedge.gallery.data.ModelDownloadStatusType
import com.google.aiedge.gallery.data.TASKS
+import com.google.aiedge.gallery.data.TASK_LLM_ASK_IMAGE
import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.TASK_LLM_IMAGE_TO_TEXT
-import com.google.aiedge.gallery.data.TASK_LLM_USECASES
+import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.data.TaskType
import com.google.aiedge.gallery.data.ValueType
import com.google.aiedge.gallery.data.getModelByName
import com.google.aiedge.gallery.ui.common.AuthConfig
import com.google.aiedge.gallery.ui.common.convertValueToTargetType
+import com.google.aiedge.gallery.ui.common.getJsonResponse
import com.google.aiedge.gallery.ui.common.processTasks
import com.google.aiedge.gallery.ui.imageclassification.ImageClassificationModelHelper
import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationModelHelper
@@ -59,8 +60,6 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
import net.openid.appauth.AuthorizationException
import net.openid.appauth.AuthorizationRequest
import net.openid.appauth.AuthorizationResponse
@@ -73,7 +72,7 @@ import java.net.URL
private const val TAG = "AGModelManagerViewModel"
private const val TEXT_INPUT_HISTORY_MAX_SIZE = 50
private const val MODEL_ALLOWLIST_URL =
- "https://raw.githubusercontent.com/jinjingforever/kokoro-codelab-jingjin/refs/heads/main/model_allowlist.json"
+ "https://raw.githubusercontent.com/google-ai-edge/gallery/refs/heads/main/model_allowlist.json"
data class ModelInitializationStatus(
val status: ModelInitializationStatusType, var error: String = ""
@@ -116,11 +115,6 @@ data class ModelManagerUiState(
*/
val modelInitializationStatus: Map,
- /**
- * Whether Hugging Face models from the given community are currently being loaded.
- */
- val loadingHfModels: Boolean = false,
-
/**
* Whether the app is loading and processing the model allowlist.
*/
@@ -196,8 +190,9 @@ open class ModelManagerViewModel(
)
}
- fun cancelDownloadModel(model: Model) {
+ fun cancelDownloadModel(task: Task, model: Model) {
downloadRepository.cancelDownloadModel(model)
+ deleteModel(task = task, model = model)
}
fun deleteModel(task: Task, model: Model) {
@@ -311,13 +306,13 @@ open class ModelManagerViewModel(
onDone = onDone,
)
- TaskType.LLM_USECASES -> LlmChatModelHelper.initialize(
+ TaskType.LLM_PROMPT_LAB -> LlmChatModelHelper.initialize(
context = context,
model = model,
onDone = onDone,
)
- TaskType.LLM_IMAGE_TO_TEXT -> LlmChatModelHelper.initialize(
+ TaskType.LLM_ASK_IMAGE -> LlmChatModelHelper.initialize(
context = context,
model = model,
onDone = onDone,
@@ -341,8 +336,8 @@ open class ModelManagerViewModel(
TaskType.TEXT_CLASSIFICATION -> TextClassificationModelHelper.cleanUp(model = model)
TaskType.IMAGE_CLASSIFICATION -> ImageClassificationModelHelper.cleanUp(model = model)
TaskType.LLM_CHAT -> LlmChatModelHelper.cleanUp(model = model)
- TaskType.LLM_USECASES -> LlmChatModelHelper.cleanUp(model = model)
- TaskType.LLM_IMAGE_TO_TEXT -> LlmChatModelHelper.cleanUp(model = model)
+ TaskType.LLM_PROMPT_LAB -> LlmChatModelHelper.cleanUp(model = model)
+ TaskType.LLM_ASK_IMAGE -> LlmChatModelHelper.cleanUp(model = model)
TaskType.IMAGE_GENERATION -> ImageGenerationModelHelper.cleanUp(model = model)
TaskType.TEST_TASK_1 -> {}
TaskType.TEST_TASK_2 -> {}
@@ -446,14 +441,14 @@ open class ModelManagerViewModel(
// Create model.
val model = createModelFromImportedModelInfo(info = info)
- for (task in listOf(TASK_LLM_CHAT, TASK_LLM_USECASES, TASK_LLM_IMAGE_TO_TEXT)) {
+ for (task in listOf(TASK_LLM_ASK_IMAGE, TASK_LLM_PROMPT_LAB, TASK_LLM_CHAT)) {
// Remove duplicated imported model if existed.
val modelIndex = task.models.indexOfFirst { info.fileName == it.name && it.imported }
if (modelIndex >= 0) {
Log.d(TAG, "duplicated imported model found in task. Removing it first")
task.models.removeAt(modelIndex)
}
- if (task == TASK_LLM_IMAGE_TO_TEXT && model.llmSupportImage || task != TASK_LLM_IMAGE_TO_TEXT) {
+ if (task == TASK_LLM_ASK_IMAGE && model.llmSupportImage || task != TASK_LLM_ASK_IMAGE) {
task.models.add(model)
}
task.updateTrigger.value = System.currentTimeMillis()
@@ -502,7 +497,7 @@ open class ModelManagerViewModel(
// Check expiration (with 5-minute buffer).
val curTs = System.currentTimeMillis()
- val expirationTs = tokenData.expiresAtSeconds - 5 * 60
+ val expirationTs = tokenData.expiresAtMs - 5 * 60
Log.d(
TAG,
"Checking whether token has expired or not. Current ts: $curTs, expires at: $expirationTs"
@@ -562,7 +557,7 @@ open class ModelManagerViewModel(
} else {
// Token exchange successful. Store the tokens securely
Log.d(TAG, "Token exchange successful. Storing tokens...")
- dataStoreRepository.saveAccessTokenData(
+ saveAccessToken(
accessToken = tokenResponse.accessToken!!,
refreshToken = tokenResponse.refreshToken!!,
expiresAt = tokenResponse.accessTokenExpirationTime!!
@@ -606,6 +601,18 @@ open class ModelManagerViewModel(
}
}
+ fun saveAccessToken(accessToken: String, refreshToken: String, expiresAt: Long) {
+ dataStoreRepository.saveAccessTokenData(
+ accessToken = accessToken,
+ refreshToken = refreshToken,
+ expiresAt = expiresAt,
+ )
+ }
+
+ fun clearAccessToken() {
+ dataStoreRepository.clearAccessTokenData()
+ }
+
private fun processPendingDownloads() {
Log.d(TAG, "In-progress worker infos: $inProgressWorkInfos")
@@ -673,11 +680,11 @@ open class ModelManagerViewModel(
if (allowedModel.taskTypes.contains(TASK_LLM_CHAT.type.id)) {
TASK_LLM_CHAT.models.add(model)
}
- if (allowedModel.taskTypes.contains(TASK_LLM_USECASES.type.id)) {
- TASK_LLM_USECASES.models.add(model)
+ if (allowedModel.taskTypes.contains(TASK_LLM_PROMPT_LAB.type.id)) {
+ TASK_LLM_PROMPT_LAB.models.add(model)
}
- if (allowedModel.taskTypes.contains(TASK_LLM_IMAGE_TO_TEXT.type.id)) {
- TASK_LLM_IMAGE_TO_TEXT.models.add(model)
+ if (allowedModel.taskTypes.contains(TASK_LLM_ASK_IMAGE.type.id)) {
+ TASK_LLM_ASK_IMAGE.models.add(model)
}
}
@@ -732,9 +739,9 @@ open class ModelManagerViewModel(
// Add to task.
TASK_LLM_CHAT.models.add(model)
- TASK_LLM_USECASES.models.add(model)
+ TASK_LLM_PROMPT_LAB.models.add(model)
if (model.llmSupportImage) {
- TASK_LLM_IMAGE_TO_TEXT.models.add(model)
+ TASK_LLM_ASK_IMAGE.models.add(model)
}
// Update status.
@@ -827,38 +834,6 @@ open class ModelManagerViewModel(
)
}
- @OptIn(ExperimentalSerializationApi::class)
- private inline fun getJsonResponse(url: String): T? {
- try {
- val connection = URL(url).openConnection() as HttpURLConnection
- connection.requestMethod = "GET"
- connection.connect()
-
- val responseCode = connection.responseCode
- if (responseCode == HttpURLConnection.HTTP_OK) {
- val inputStream = connection.inputStream
- val response = inputStream.bufferedReader().use { it.readText() }
-
- // Parse JSON using kotlinx.serialization
- val json = Json {
- // Handle potential extra fields
- ignoreUnknownKeys = true
- allowComments = true
- allowTrailingComma = true
- }
- val jsonObj = json.decodeFromString(response)
- return jsonObj
- } else {
- Log.e(TAG, "HTTP error: $responseCode")
- }
- } catch (e: Exception) {
- Log.e(TAG, "Error when getting json response: ${e.message}")
- e.printStackTrace()
- }
-
- return null
- }
-
private fun isFileInExternalFilesDir(fileName: String): Boolean {
if (externalFilesDir != null) {
val file = File(externalFilesDir, fileName)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt
index 61efd1a02..2486aba7f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt
@@ -46,8 +46,8 @@ import com.google.aiedge.gallery.data.Model
import com.google.aiedge.gallery.data.TASK_IMAGE_CLASSIFICATION
import com.google.aiedge.gallery.data.TASK_IMAGE_GENERATION
import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.TASK_LLM_IMAGE_TO_TEXT
-import com.google.aiedge.gallery.data.TASK_LLM_USECASES
+import com.google.aiedge.gallery.data.TASK_LLM_ASK_IMAGE
+import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
import com.google.aiedge.gallery.data.TASK_TEXT_CLASSIFICATION
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.data.TaskType
@@ -60,8 +60,8 @@ import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationDestination
import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationScreen
import com.google.aiedge.gallery.ui.llmchat.LlmChatDestination
import com.google.aiedge.gallery.ui.llmchat.LlmChatScreen
-import com.google.aiedge.gallery.ui.llmchat.LlmImageToTextDestination
-import com.google.aiedge.gallery.ui.llmchat.LlmImageToTextScreen
+import com.google.aiedge.gallery.ui.llmchat.LlmAskImageDestination
+import com.google.aiedge.gallery.ui.llmchat.LlmAskImageScreen
import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnDestination
import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnScreen
import com.google.aiedge.gallery.ui.modelmanager.ModelManager
@@ -233,7 +233,7 @@ fun GalleryNavHost(
enterTransition = { slideEnter() },
exitTransition = { slideExit() },
) {
- getModelFromNavigationParam(it, TASK_LLM_USECASES)?.let { defaultModel ->
+ getModelFromNavigationParam(it, TASK_LLM_PROMPT_LAB)?.let { defaultModel ->
modelManagerViewModel.selectModel(defaultModel)
LlmSingleTurnScreen(
@@ -245,15 +245,15 @@ fun GalleryNavHost(
// LLM image to text.
composable(
- route = "${LlmImageToTextDestination.route}/{modelName}",
+ route = "${LlmAskImageDestination.route}/{modelName}",
arguments = listOf(navArgument("modelName") { type = NavType.StringType }),
enterTransition = { slideEnter() },
exitTransition = { slideExit() },
) {
- getModelFromNavigationParam(it, TASK_LLM_IMAGE_TO_TEXT)?.let { defaultModel ->
+ getModelFromNavigationParam(it, TASK_LLM_ASK_IMAGE)?.let { defaultModel ->
modelManagerViewModel.selectModel(defaultModel)
- LlmImageToTextScreen(
+ LlmAskImageScreen(
modelManagerViewModel = modelManagerViewModel,
navigateUp = { navController.navigateUp() },
)
@@ -287,8 +287,8 @@ fun navigateToTaskScreen(
TaskType.TEXT_CLASSIFICATION -> navController.navigate("${TextClassificationDestination.route}/${modelName}")
TaskType.IMAGE_CLASSIFICATION -> navController.navigate("${ImageClassificationDestination.route}/${modelName}")
TaskType.LLM_CHAT -> navController.navigate("${LlmChatDestination.route}/${modelName}")
- TaskType.LLM_IMAGE_TO_TEXT -> navController.navigate("${LlmImageToTextDestination.route}/${modelName}")
- TaskType.LLM_USECASES -> navController.navigate("${LlmSingleTurnDestination.route}/${modelName}")
+ TaskType.LLM_ASK_IMAGE -> navController.navigate("${LlmAskImageDestination.route}/${modelName}")
+ TaskType.LLM_PROMPT_LAB -> navController.navigate("${LlmSingleTurnDestination.route}/${modelName}")
TaskType.IMAGE_GENERATION -> navController.navigate("${ImageGenerationDestination.route}/${modelName}")
TaskType.TEST_TASK_1 -> {}
TaskType.TEST_TASK_2 -> {}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt
index 606132ae0..b756c8e84 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt
@@ -42,6 +42,9 @@ class PreviewDataStoreRepository : DataStoreRepository {
return null
}
+ override fun clearAccessTokenData() {
+ }
+
override fun saveImportedModels(importedModels: List) {
}
From 3495b7cf6ef6f78edd05a9423f03ab70e77a596b Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Sat, 17 May 2025 15:30:41 -0700
Subject: [PATCH 004/336] Update model_allowlist.json
---
model_allowlist.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/model_allowlist.json b/model_allowlist.json
index 8d4ffcea6..9d27bd4f6 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -13,7 +13,7 @@
"temperature": 1.0,
"accelerators": "cpu,gpu"
},
- "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_usecases"]
+ "taskTypes": ["llm_chat", "llm_prompt_lab"]
},
{
"name": "Hammer2.1-1.5b q8",
@@ -28,7 +28,7 @@
"temperature": 1.0,
"accelerators": "cpu,gpu"
},
- "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_usecases"]
+ "taskTypes": ["llm_chat", "llm_prompt_lab"]
},
{
"name": "Qwen2.5-1.5B-Instruct q8",
@@ -43,7 +43,7 @@
"temperature": 1.0,
"accelerators": "cpu"
},
- "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_usecases"]
+ "taskTypes": ["llm_chat", "llm_prompt_lab"]
}
]
}
From e7dda4b4ad154916a81b21ded18ff451360cd2c8 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Sun, 18 May 2025 17:26:31 -0700
Subject: [PATCH 005/336] Save the loaded model allowlist to a local file so
that it can be read when the allowlist cannot be loaded from internet.
Also improve the image clipping transitioning from full image back to the image thumbnail in chat ui.
---
.../google/aiedge/gallery/ui/common/Utils.kt | 19 +++----
.../gallery/ui/common/chat/ChatPanel.kt | 11 ++--
.../gallery/ui/home/NewReleaseNotification.kt | 4 +-
.../ui/modelmanager/ModelManagerViewModel.kt | 54 +++++++++++++++++--
4 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
index 665a07374..50a2d274f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
@@ -66,6 +66,10 @@ interface LatencyProvider {
private const val START_THINKING = "***Thinking...***"
private const val DONE_THINKING = "***Done thinking***"
+data class JsonObjAndTextContent(
+ val jsonObj: T, val textContent: String,
+)
+
/** Format the bytes into a human-readable format. */
fun Long.humanReadableSize(si: Boolean = true, extraDecimalForGbAndAbove: Boolean = false): String {
val bytes = this
@@ -473,16 +477,14 @@ fun processTasks() {
fun processLlmResponse(response: String): String {
// Add "thinking" and "done thinking" around the thinking content.
- var newContent = response
- .replace("", "$START_THINKING\n")
- .replace("", "\n$DONE_THINKING")
+ var newContent =
+ response.replace("", "$START_THINKING\n").replace("", "\n$DONE_THINKING")
// Remove empty thinking content.
val endThinkingIndex = newContent.indexOf(DONE_THINKING)
if (endThinkingIndex >= 0) {
val thinkingContent =
- newContent.substring(0, endThinkingIndex + DONE_THINKING.length)
- .replace(START_THINKING, "")
+ newContent.substring(0, endThinkingIndex + DONE_THINKING.length).replace(START_THINKING, "")
.replace(DONE_THINKING, "")
if (thinkingContent.isBlank()) {
newContent = newContent.substring(endThinkingIndex + DONE_THINKING.length)
@@ -495,7 +497,7 @@ fun processLlmResponse(response: String): String {
}
@OptIn(ExperimentalSerializationApi::class)
-inline fun getJsonResponse(url: String): T? {
+inline fun getJsonResponse(url: String): JsonObjAndTextContent? {
try {
val connection = URL(url).openConnection() as HttpURLConnection
connection.requestMethod = "GET"
@@ -514,14 +516,13 @@ inline fun getJsonResponse(url: String): T? {
allowTrailingComma = true
}
val jsonObj = json.decodeFromString(response)
- return jsonObj
+ return JsonObjAndTextContent(jsonObj = jsonObj, textContent = response)
} else {
Log.e("AGUtils", "HTTP error: $responseCode")
}
} catch (e: Exception) {
Log.e(
- "AGUtils",
- "Error when getting json response: ${e.message}"
+ "AGUtils", "Error when getting json response: ${e.message}"
)
e.printStackTrace()
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
index 5ce0f4b61..3ae0043ef 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
@@ -342,7 +342,12 @@ fun ChatPanel(
}
.sharedElement(
sharedContentState = rememberSharedContentState(key = "selected_image"),
- animatedVisibilityScope = this@AnimatedContent
+ animatedVisibilityScope = this@AnimatedContent,
+ clipInOverlayDuringTransition = OverlayClip(
+ MessageBubbleShape(
+ radius = bubbleBorderRadius
+ )
+ )
),
)
}
@@ -378,7 +383,7 @@ fun ChatPanel(
) {
LatencyText(message = message)
// A button to show stats for the LLM message.
- if ((task.type == TaskType.LLM_CHAT || task.type == TaskType.LLM_ASK_IMAGE) && message is ChatMessageText
+ if (task.type.id.startsWith("llm_") && message is ChatMessageText
// This means we only want to show the action button when the message is done
// generating, at which point the latency will be set.
&& message.latencyMs >= 0
@@ -565,7 +570,7 @@ fun ChatPanel(
)
.sharedElement(
sharedContentState = rememberSharedContentState(key = "selected_image"),
- animatedVisibilityScope = this@AnimatedContent
+ animatedVisibilityScope = this@AnimatedContent,
),
contentScale = ContentScale.Fit,
)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
index 231a92bd4..05978dc17 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
@@ -51,12 +51,12 @@ fun NewReleaseNotification() {
val info = getJsonResponse("https://api.github.com/repos/$REPO/releases/latest")
if (info != null) {
val curRelease = BuildConfig.VERSION_NAME
- val newRelease = info.tag_name
+ val newRelease = info.jsonObj.tag_name
val isNewer = isNewerRelease(currentRelease = curRelease, newRelease = newRelease)
Log.d(TAG, "curRelease: $curRelease, newRelease: $newRelease, isNewer: $isNewer")
if (isNewer) {
newReleaseVersion = newRelease
- newReleaseUrl = info.html_url
+ newReleaseUrl = info.jsonObj.html_url
}
}
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
index ef8b63626..50d5a572b 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
@@ -60,6 +60,8 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
import net.openid.appauth.AuthorizationException
import net.openid.appauth.AuthorizationRequest
import net.openid.appauth.AuthorizationResponse
@@ -73,6 +75,7 @@ private const val TAG = "AGModelManagerViewModel"
private const val TEXT_INPUT_HISTORY_MAX_SIZE = 50
private const val MODEL_ALLOWLIST_URL =
"https://raw.githubusercontent.com/google-ai-edge/gallery/refs/heads/main/model_allowlist.json"
+private const val MODEL_ALLOWLIST_FILENAME = "model_allowlist.json"
data class ModelInitializationStatus(
val status: ModelInitializationStatusType, var error: String = ""
@@ -146,6 +149,7 @@ data class PagerScrollState(
* and cleaning up models. It also manages the UI state for model management, including the
* list of tasks, models, download statuses, and initialization statuses.
*/
+@OptIn(ExperimentalSerializationApi::class)
open class ModelManagerViewModel(
private val downloadRepository: DownloadRepository,
private val dataStoreRepository: DataStoreRepository,
@@ -227,8 +231,7 @@ open class ModelManagerViewModel(
dataStoreRepository.saveImportedModels(importedModels = importedModels)
}
val newUiState = uiState.value.copy(
- modelDownloadStatus = curModelDownloadStatus,
- tasks = uiState.value.tasks.toList()
+ modelDownloadStatus = curModelDownloadStatus, tasks = uiState.value.tasks.toList()
)
_uiState.update { newUiState }
}
@@ -660,8 +663,17 @@ open class ModelManagerViewModel(
viewModelScope.launch(Dispatchers.IO) {
try {
// Load model allowlist json.
- val modelAllowlist: ModelAllowlist? =
- getJsonResponse(url = MODEL_ALLOWLIST_URL)
+ Log.d(TAG, "Loading model allowlist from internet...")
+ val data = getJsonResponse(url = MODEL_ALLOWLIST_URL)
+ var modelAllowlist: ModelAllowlist? = data?.jsonObj
+
+ if (modelAllowlist == null) {
+ Log.d(TAG, "Failed to load model allowlist from internet. Trying to load it from disk")
+ modelAllowlist = readModelAllowlistFromDisk()
+ } else {
+ Log.d(TAG, "Done: loading model allowlist from internet")
+ saveModelAllowlistToDisk(modelAllowlistContent = data?.textContent ?: "{}")
+ }
if (modelAllowlist == null) {
_uiState.update { uiState.value.copy(loadingModelAllowlistError = "Failed to load model list") }
@@ -707,6 +719,40 @@ open class ModelManagerViewModel(
}
}
+ private fun saveModelAllowlistToDisk(modelAllowlistContent: String) {
+ try {
+ Log.d(TAG, "Saving model allowlist to disk...")
+ val file = File(externalFilesDir, MODEL_ALLOWLIST_FILENAME)
+ file.writeText(modelAllowlistContent)
+ Log.d(TAG, "Done: saving model allowlist to disk.")
+ } catch (e: Exception) {
+ Log.e(TAG, "failed to write model allowlist to disk", e)
+ }
+ }
+
+ private fun readModelAllowlistFromDisk(): ModelAllowlist? {
+ try {
+ Log.d(TAG, "Reading model allowlist from disk...")
+ val file = File(externalFilesDir, MODEL_ALLOWLIST_FILENAME)
+ if (file.exists()) {
+ val content = file.readText()
+ Log.d(TAG, "Model allowlist content from local file: $content")
+ val json = Json {
+ // Handle potential extra fields
+ ignoreUnknownKeys = true
+ allowComments = true
+ allowTrailingComma = true
+ }
+ return json.decodeFromString(content)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "failed to read model allowlist from disk", e)
+ return null
+ }
+
+ return null
+ }
+
private fun isModelPartiallyDownloaded(model: Model): Boolean {
return inProgressWorkInfos.find { it.modelName == model.name } != null
}
From 0f5142e67e662c79f995961d1be26e793eaff787 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Sun, 18 May 2025 17:28:34 -0700
Subject: [PATCH 006/336] Bump version
---
Android/src/app/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 091b60c65..36da14758 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.0"
+ versionName = "0.9.1"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth"
From 9544b8ddcc8591b48bd191b7b10c4184d9a1c8ad Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 11:08:03 -0700
Subject: [PATCH 007/336] Re-enable image pickers when config is changed, and
other UI bug fixes.
---
Android/src/app/build.gradle.kts | 2 +-
.../com/google/aiedge/gallery/GalleryApp.kt | 17 +-
.../gallery/ui/common/chat/ChatPanel.kt | 699 +++++++++---------
.../aiedge/gallery/ui/home/HomeScreen.kt | 3 +-
.../gallery/ui/llmchat/LlmChatModelHelper.kt | 6 +-
.../google/aiedge/gallery/ui/theme/Theme.kt | 3 +-
.../src/app/src/main/res/values/strings.xml | 2 +-
7 files changed, 363 insertions(+), 369 deletions(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 36da14758..a751214f6 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.1"
+ versionName = "0.9.2"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
index 9fb9caa42..02c01383a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
@@ -23,6 +23,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.foundation.text.TextAutoSize
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.material.icons.rounded.Refresh
@@ -44,6 +46,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import com.google.aiedge.gallery.data.AppBarAction
@@ -70,6 +73,7 @@ fun GalleryTopAppBar(
scrollBehavior: TopAppBarScrollBehavior? = null,
subtitle: String = "",
) {
+ val titleColor = MaterialTheme.colorScheme.primary
CenterAlignedTopAppBar(
title = {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -85,9 +89,16 @@ fun GalleryTopAppBar(
tint = Color.Unspecified,
)
}
- Text(
- title,
- style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold)
+ BasicText(
+ text = title,
+ maxLines = 1,
+ color = { titleColor },
+ style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold),
+ autoSize = TextAutoSize.StepBased(
+ minFontSize = 14.sp,
+ maxFontSize = 22.sp,
+ stepSize = 1.sp
+ )
)
}
if (subtitle.isNotEmpty()) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
index 3ae0043ef..626ef09b8 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
@@ -16,9 +16,10 @@
package com.google.aiedge.gallery.ui.common.chat
-import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ExperimentalSharedTransitionApi
-import androidx.compose.animation.SharedTransitionLayout
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@@ -143,6 +144,18 @@ fun ChatPanel(
val scope = rememberCoroutineScope()
val haptic = LocalHapticFeedback.current
var selectedImageMessage by remember { mutableStateOf(null) }
+ val hasImageMessageToLastConfigChange = remember(messages) {
+ var foundImageMessage = false
+ for (message in messages.reversed()) {
+ if (message is ChatMessageConfigValuesChange) {
+ break
+ }
+ if (message is ChatMessageImage) {
+ foundImageMessage = true
+ }
+ }
+ foundImageMessage
+ }
var curMessage by remember { mutableStateOf("") } // Correct state
val focusManager = LocalFocusManager.current
@@ -222,376 +235,346 @@ fun ChatPanel(
showErrorDialog = modelInitializationStatus?.status == ModelInitializationStatusType.ERROR
}
- SharedTransitionLayout(modifier = Modifier.fillMaxSize()) {
- AnimatedContent(targetState = selectedImageMessage) { targetSelectedImageMessage ->
- Column(
- modifier = modifier.imePadding()
+ Column(
+ modifier = modifier.imePadding()
+ ) {
+ Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.weight(1f)) {
+ LazyColumn(
+ modifier = Modifier
+ .fillMaxSize()
+ .nestedScroll(nestedScrollConnection),
+ state = listState, verticalArrangement = Arrangement.Top,
) {
- Box(contentAlignment = Alignment.BottomCenter, modifier = Modifier.weight(1f)) {
- LazyColumn(
+ items(messages) { message ->
+ val imageHistoryCurIndex = remember { mutableIntStateOf(0) }
+ var hAlign: Alignment.Horizontal = Alignment.End
+ var backgroundColor: Color = MaterialTheme.customColors.userBubbleBgColor
+ var hardCornerAtLeftOrRight = false
+ var extraPaddingStart = 48.dp
+ var extraPaddingEnd = 0.dp
+ if (message.side == ChatSide.AGENT) {
+ hAlign = Alignment.Start
+ backgroundColor = MaterialTheme.customColors.agentBubbleBgColor
+ hardCornerAtLeftOrRight = true
+ extraPaddingStart = 0.dp
+ extraPaddingEnd = 48.dp
+ } else if (message.side == ChatSide.SYSTEM) {
+ extraPaddingStart = 24.dp
+ extraPaddingEnd = 24.dp
+ if (message.type == ChatMessageType.PROMPT_TEMPLATES) {
+ extraPaddingStart = 12.dp
+ extraPaddingEnd = 12.dp
+ }
+ }
+ if (message.type == ChatMessageType.IMAGE) {
+ backgroundColor = Color.Transparent
+ }
+ val bubbleBorderRadius = dimensionResource(R.dimen.chat_bubble_corner_radius)
+
+ Column(
modifier = Modifier
- .fillMaxSize()
- .nestedScroll(nestedScrollConnection),
- state = listState, verticalArrangement = Arrangement.Top,
+ .fillMaxWidth()
+ .padding(
+ start = 12.dp + extraPaddingStart,
+ end = 12.dp + extraPaddingEnd,
+ top = 6.dp,
+ bottom = 6.dp,
+ ),
+ horizontalAlignment = hAlign,
) {
- items(messages) { message ->
- val imageHistoryCurIndex = remember { mutableIntStateOf(0) }
- var hAlign: Alignment.Horizontal = Alignment.End
- var backgroundColor: Color = MaterialTheme.customColors.userBubbleBgColor
- var hardCornerAtLeftOrRight = false
- var extraPaddingStart = 48.dp
- var extraPaddingEnd = 0.dp
- if (message.side == ChatSide.AGENT) {
- hAlign = Alignment.Start
- backgroundColor = MaterialTheme.customColors.agentBubbleBgColor
- hardCornerAtLeftOrRight = true
- extraPaddingStart = 0.dp
- extraPaddingEnd = 48.dp
- } else if (message.side == ChatSide.SYSTEM) {
- extraPaddingStart = 24.dp
- extraPaddingEnd = 24.dp
- if (message.type == ChatMessageType.PROMPT_TEMPLATES) {
- extraPaddingStart = 12.dp
- extraPaddingEnd = 12.dp
- }
- }
- if (message.type == ChatMessageType.IMAGE) {
- backgroundColor = Color.Transparent
- }
- val bubbleBorderRadius = dimensionResource(R.dimen.chat_bubble_corner_radius)
-
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .padding(
- start = 12.dp + extraPaddingStart,
- end = 12.dp + extraPaddingEnd,
- top = 6.dp,
- bottom = 6.dp,
- ),
- horizontalAlignment = hAlign,
- ) {
- // Sender row.
- MessageSender(
- message = message,
- agentNameRes = task.agentNameRes,
- imageHistoryCurIndex = imageHistoryCurIndex.intValue
- )
+ // Sender row.
+ MessageSender(
+ message = message,
+ agentNameRes = task.agentNameRes,
+ imageHistoryCurIndex = imageHistoryCurIndex.intValue
+ )
- // Message body.
- when (message) {
- // Loading.
- is ChatMessageLoading -> MessageBodyLoading()
+ // Message body.
+ when (message) {
+ // Loading.
+ is ChatMessageLoading -> MessageBodyLoading()
- // Info.
- is ChatMessageInfo -> MessageBodyInfo(message = message)
+ // Info.
+ is ChatMessageInfo -> MessageBodyInfo(message = message)
- // Warning
- is ChatMessageWarning -> MessageBodyWarning(message = message)
+ // Warning
+ is ChatMessageWarning -> MessageBodyWarning(message = message)
- // Config values change.
- is ChatMessageConfigValuesChange -> MessageBodyConfigUpdate(message = message)
+ // Config values change.
+ is ChatMessageConfigValuesChange -> MessageBodyConfigUpdate(message = message)
- // Prompt templates.
- is ChatMessagePromptTemplates -> MessageBodyPromptTemplates(message = message,
- task = task,
- onPromptClicked = { template ->
- onSendMessage(
- selectedModel,
- listOf(ChatMessageText(content = template.prompt, side = ChatSide.USER))
- )
- })
-
- // Non-system messages.
- else -> {
- // The bubble shape around the message body.
- var messageBubbleModifier = Modifier
- .clip(
- MessageBubbleShape(
- radius = bubbleBorderRadius,
- hardCornerAtLeftOrRight = hardCornerAtLeftOrRight
- )
- )
- .background(backgroundColor)
- if (message is ChatMessageText) {
- messageBubbleModifier = messageBubbleModifier.pointerInput(Unit) {
- detectTapGestures(
- onLongPress = {
- haptic.performHapticFeedback(HapticFeedbackType.LongPress)
- longPressedMessage.value = message
- showMessageLongPressedSheet = true
- },
- )
- }
+ // Prompt templates.
+ is ChatMessagePromptTemplates -> MessageBodyPromptTemplates(
+ message = message,
+ task = task,
+ onPromptClicked = { template ->
+ onSendMessage(
+ selectedModel,
+ listOf(ChatMessageText(content = template.prompt, side = ChatSide.USER))
+ )
+ })
+
+ // Non-system messages.
+ else -> {
+ // The bubble shape around the message body.
+ var messageBubbleModifier = Modifier
+ .clip(
+ MessageBubbleShape(
+ radius = bubbleBorderRadius, hardCornerAtLeftOrRight = hardCornerAtLeftOrRight
+ )
+ )
+ .background(backgroundColor)
+ if (message is ChatMessageText) {
+ messageBubbleModifier = messageBubbleModifier.pointerInput(Unit) {
+ detectTapGestures(
+ onLongPress = {
+ haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+ longPressedMessage.value = message
+ showMessageLongPressedSheet = true
+ },
+ )
+ }
+ }
+ Box(
+ modifier = messageBubbleModifier,
+ ) {
+ when (message) {
+ // Text
+ is ChatMessageText -> MessageBodyText(message = message)
+
+ // Image
+ is ChatMessageImage -> {
+ MessageBodyImage(message = message, modifier = Modifier.clickable {
+ selectedImageMessage = message
+ })
}
- Box(
- modifier = messageBubbleModifier,
+
+ // Image with history (for image gen)
+ is ChatMessageImageWithHistory -> MessageBodyImageWithHistory(
+ message = message, imageHistoryCurIndex = imageHistoryCurIndex
+ )
+
+ // Classification result
+ is ChatMessageClassification -> MessageBodyClassification(
+ message = message, modifier = Modifier.width(
+ message.maxBarWidth ?: CLASSIFICATION_BAR_MAX_WIDTH
+ )
+ )
+
+ // Benchmark result.
+ is ChatMessageBenchmarkResult -> MessageBodyBenchmark(message = message)
+
+ // Benchmark LLM result.
+ is ChatMessageBenchmarkLlmResult -> MessageBodyBenchmarkLlm(
+ message = message, modifier = Modifier.wrapContentWidth()
+ )
+
+ else -> {}
+ }
+ }
+
+ if (message.side == ChatSide.AGENT) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ ) {
+ LatencyText(message = message)
+ // A button to show stats for the LLM message.
+ if (task.type.id.startsWith("llm_") && message is ChatMessageText
+ // This means we only want to show the action button when the message is done
+ // generating, at which point the latency will be set.
+ && message.latencyMs >= 0
) {
- when (message) {
- // Text
- is ChatMessageText -> MessageBodyText(message = message)
-
- // Image
- is ChatMessageImage -> {
- if (targetSelectedImageMessage != message) {
- MessageBodyImage(
- message = message,
- modifier = Modifier
- .clickable {
- selectedImageMessage = message
- }
- .sharedElement(
- sharedContentState = rememberSharedContentState(key = "selected_image"),
- animatedVisibilityScope = this@AnimatedContent,
- clipInOverlayDuringTransition = OverlayClip(
- MessageBubbleShape(
- radius = bubbleBorderRadius
- )
- )
- ),
+ val showingStats =
+ viewModel.isShowingStats(model = selectedModel, message = message)
+ MessageActionButton(
+ label = if (showingStats) "Hide stats" else "Show stats",
+ icon = Icons.Outlined.Timer,
+ onClick = {
+ // Toggle showing stats.
+ viewModel.toggleShowingStats(selectedModel, message)
+
+ // Add the stats message after the LLM message.
+ if (viewModel.isShowingStats(
+ model = selectedModel, message = message
+ )
+ ) {
+ val llmBenchmarkResult = message.llmBenchmarkResult
+ if (llmBenchmarkResult != null) {
+ viewModel.insertMessageAfter(
+ model = selectedModel,
+ anchorMessage = message,
+ messageToAdd = llmBenchmarkResult,
+ )
+ }
+ }
+ // Remove the stats message.
+ else {
+ val curMessageIndex = viewModel.getMessageIndex(
+ model = selectedModel, message = message
+ )
+ viewModel.removeMessageAt(
+ model = selectedModel, index = curMessageIndex + 1
)
}
- }
-
- // Image with history (for image gen)
- is ChatMessageImageWithHistory -> MessageBodyImageWithHistory(
- message = message, imageHistoryCurIndex = imageHistoryCurIndex
- )
-
- // Classification result
- is ChatMessageClassification -> MessageBodyClassification(
- message = message, modifier = Modifier.width(
- message.maxBarWidth ?: CLASSIFICATION_BAR_MAX_WIDTH
- )
- )
-
- // Benchmark result.
- is ChatMessageBenchmarkResult -> MessageBodyBenchmark(message = message)
-
- // Benchmark LLM result.
- is ChatMessageBenchmarkLlmResult -> MessageBodyBenchmarkLlm(
- message = message, modifier = Modifier.wrapContentWidth()
- )
-
- else -> {}
- }
+ },
+ enabled = !uiState.inProgress
+ )
}
- if (message.side == ChatSide.AGENT) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(8.dp),
- ) {
- LatencyText(message = message)
- // A button to show stats for the LLM message.
- if (task.type.id.startsWith("llm_") && message is ChatMessageText
- // This means we only want to show the action button when the message is done
- // generating, at which point the latency will be set.
- && message.latencyMs >= 0
- ) {
- val showingStats =
- viewModel.isShowingStats(model = selectedModel, message = message)
- MessageActionButton(
- label = if (showingStats) "Hide stats" else "Show stats",
- icon = Icons.Outlined.Timer,
- onClick = {
- // Toggle showing stats.
- viewModel.toggleShowingStats(selectedModel, message)
-
- // Add the stats message after the LLM message.
- if (viewModel.isShowingStats(
- model = selectedModel, message = message
- )
- ) {
- val llmBenchmarkResult = message.llmBenchmarkResult
- if (llmBenchmarkResult != null) {
- viewModel.insertMessageAfter(
- model = selectedModel,
- anchorMessage = message,
- messageToAdd = llmBenchmarkResult,
- )
- }
- }
- // Remove the stats message.
- else {
- val curMessageIndex =
- viewModel.getMessageIndex(
- model = selectedModel,
- message = message
- )
- viewModel.removeMessageAt(
- model = selectedModel, index = curMessageIndex + 1
- )
- }
- },
- enabled = !uiState.inProgress
- )
- }
- }
- } else if (message.side == ChatSide.USER) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(4.dp)
- ) {
- // Run again button.
- if (selectedModel.showRunAgainButton) {
- MessageActionButton(
- label = stringResource(R.string.run_again),
- icon = Icons.Rounded.Refresh,
- onClick = {
- onRunAgainClicked(selectedModel, message)
- },
- enabled = !uiState.inProgress
- )
- }
-
- // Benchmark button
- if (selectedModel.showBenchmarkButton) {
- MessageActionButton(
- label = stringResource(R.string.benchmark),
- icon = Icons.Outlined.Timer,
- onClick = {
- showBenchmarkConfigsDialog = true
- benchmarkMessage.value = message
- },
- enabled = !uiState.inProgress
- )
- }
- }
+ }
+ } else if (message.side == ChatSide.USER) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ // Run again button.
+ if (selectedModel.showRunAgainButton) {
+ MessageActionButton(
+ label = stringResource(R.string.run_again),
+ icon = Icons.Rounded.Refresh,
+ onClick = {
+ onRunAgainClicked(selectedModel, message)
+ },
+ enabled = !uiState.inProgress
+ )
+ }
+
+ // Benchmark button
+ if (selectedModel.showBenchmarkButton) {
+ MessageActionButton(
+ label = stringResource(R.string.benchmark),
+ icon = Icons.Outlined.Timer,
+ onClick = {
+ showBenchmarkConfigsDialog = true
+ benchmarkMessage.value = message
+ },
+ enabled = !uiState.inProgress
+ )
}
}
}
}
}
}
+ }
+ }
- SnackbarHost(hostState = snackbarHostState, modifier = Modifier.padding(vertical = 4.dp))
+ SnackbarHost(hostState = snackbarHostState, modifier = Modifier.padding(vertical = 4.dp))
- // Show an info message for ask image task to get users started.
- if (task.type == TaskType.LLM_ASK_IMAGE && messages.isEmpty()) {
- Column(
- modifier = Modifier
- .padding(horizontal = 16.dp)
- .fillMaxSize(),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center
- ) {
- MessageBodyInfo(
- ChatMessageInfo(content = "To get started, click + below to add an image and type a prompt to ask a question about it."),
- smallFontSize = false
- )
- }
- }
+ // Show an info message for ask image task to get users started.
+ if (task.type == TaskType.LLM_ASK_IMAGE && messages.isEmpty()) {
+ Column(
+ modifier = Modifier
+ .padding(horizontal = 16.dp)
+ .fillMaxSize(),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Center
+ ) {
+ MessageBodyInfo(
+ ChatMessageInfo(content = "To get started, click + below to add an image and type a prompt to ask a question about it."),
+ smallFontSize = false
+ )
}
+ }
+ }
- // Chat input
- when (chatInputType) {
- ChatInputType.TEXT -> {
+ // Chat input
+ when (chatInputType) {
+ ChatInputType.TEXT -> {
// val isLlmTask = task.type == TaskType.LLM_CHAT
// val notLlmStartScreen = !(messages.size == 1 && messages[0] is ChatMessagePromptTemplates)
- val hasImageMessage = messages.any { it is ChatMessageImage }
- MessageInputText(
- modelManagerViewModel = modelManagerViewModel,
- curMessage = curMessage,
- inProgress = uiState.inProgress,
- isResettingSession = uiState.isResettingSession,
- modelPreparing = uiState.preparing,
- hasImageMessage = hasImageMessage,
- modelInitializing = modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING,
- textFieldPlaceHolderRes = task.textInputPlaceHolderRes,
- onValueChanged = { curMessage = it },
- onSendMessage = {
- onSendMessage(selectedModel, it)
- curMessage = ""
- },
- onOpenPromptTemplatesClicked = {
- onSendMessage(
- selectedModel, listOf(
- ChatMessagePromptTemplates(
- templates = selectedModel.llmPromptTemplates, showMakeYourOwn = false
- )
- )
+ MessageInputText(
+ modelManagerViewModel = modelManagerViewModel,
+ curMessage = curMessage,
+ inProgress = uiState.inProgress,
+ isResettingSession = uiState.isResettingSession,
+ modelPreparing = uiState.preparing,
+ hasImageMessage = hasImageMessageToLastConfigChange,
+ modelInitializing = modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING,
+ textFieldPlaceHolderRes = task.textInputPlaceHolderRes,
+ onValueChanged = { curMessage = it },
+ onSendMessage = {
+ onSendMessage(selectedModel, it)
+ curMessage = ""
+ },
+ onOpenPromptTemplatesClicked = {
+ onSendMessage(
+ selectedModel, listOf(
+ ChatMessagePromptTemplates(
+ templates = selectedModel.llmPromptTemplates, showMakeYourOwn = false
)
- },
- onStopButtonClicked = onStopButtonClicked,
-// showPromptTemplatesInMenu = isLlmTask && notLlmStartScreen,
- showPromptTemplatesInMenu = false,
- showImagePickerInMenu = selectedModel.llmSupportImage,
- showStopButtonWhenInProgress = showStopButtonInInputWhenInProgress,
+ )
)
- }
+ },
+ onStopButtonClicked = onStopButtonClicked,
+// showPromptTemplatesInMenu = isLlmTask && notLlmStartScreen,
+ showPromptTemplatesInMenu = false,
+ showImagePickerInMenu = selectedModel.llmSupportImage,
+ showStopButtonWhenInProgress = showStopButtonInInputWhenInProgress,
+ )
+ }
- ChatInputType.IMAGE -> MessageInputImage(
- disableButtons = uiState.inProgress,
- streamingMessage = streamingMessage,
- onImageSelected = { bitmap ->
- onSendMessage(
- selectedModel, listOf(
- ChatMessageImage(
- bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
- )
- )
- )
- },
- onStreamImage = { bitmap ->
- onStreamImageMessage(
- selectedModel, ChatMessageImage(
- bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
- )
+ ChatInputType.IMAGE -> MessageInputImage(
+ disableButtons = uiState.inProgress,
+ streamingMessage = streamingMessage,
+ onImageSelected = { bitmap ->
+ onSendMessage(
+ selectedModel, listOf(
+ ChatMessageImage(
+ bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
)
- },
- onStreamEnd = onStreamEnd,
+ )
)
- }
- }
-
- // A full-screen image viewer.
- if (targetSelectedImageMessage != null) {
- ZoomableBox(
- modifier = Modifier
- .fillMaxSize()
- .background(Color.Black.copy(alpha = 0.9f))
- .sharedElement(
- rememberSharedContentState(key = "bounds"),
- animatedVisibilityScope = this,
+ },
+ onStreamImage = { bitmap ->
+ onStreamImageMessage(
+ selectedModel, ChatMessageImage(
+ bitmap = bitmap, imageBitMap = bitmap.asImageBitmap(), side = ChatSide.USER
)
- .skipToLookaheadSize(),
- ) {
- // Image.
- Image(
- bitmap = targetSelectedImageMessage.imageBitMap,
- contentDescription = "",
- modifier = modifier
- .fillMaxSize()
- .graphicsLayer(
- scaleX = scale,
- scaleY = scale,
- translationX = offsetX,
- translationY = offsetY
- )
- .sharedElement(
- sharedContentState = rememberSharedContentState(key = "selected_image"),
- animatedVisibilityScope = this@AnimatedContent,
- ),
- contentScale = ContentScale.Fit,
)
+ },
+ onStreamEnd = onStreamEnd,
+ )
+ }
+ }
- // Close button.
- IconButton(
- onClick = {
- selectedImageMessage = null
- },
- colors = IconButtonDefaults.iconButtonColors(
- containerColor = MaterialTheme.colorScheme.surfaceVariant,
- ),
- modifier = Modifier.offset(x = (-8).dp, y = 8.dp)
- ) {
- Icon(
- Icons.Rounded.Close,
- contentDescription = "",
- tint = MaterialTheme.colorScheme.primary
- )
- }
- }
+ // A full-screen image viewer.
+ val curSelectedImageMessage = selectedImageMessage
+ AnimatedVisibility(
+ visible = curSelectedImageMessage != null,
+ enter = fadeIn(),
+ exit = fadeOut(),
+ ) {
+ if (curSelectedImageMessage == null) return@AnimatedVisibility
+
+ ZoomableBox(
+ modifier = Modifier
+ .fillMaxSize()
+ .background(Color.Black.copy(alpha = 0.9f))
+ ) {
+ // Image.
+ Image(
+ bitmap = curSelectedImageMessage.imageBitMap,
+ contentDescription = "",
+ modifier = modifier
+ .fillMaxSize()
+ .graphicsLayer(
+ scaleX = scale, scaleY = scale, translationX = offsetX, translationY = offsetY
+ ),
+ contentScale = ContentScale.Fit,
+ )
+
+ // Close button.
+ IconButton(
+ onClick = {
+ selectedImageMessage = null
+ }, colors = IconButtonDefaults.iconButtonColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ ), modifier = Modifier.offset(x = (-8).dp, y = 8.dp)
+ ) {
+ Icon(
+ Icons.Rounded.Close, contentDescription = "", tint = MaterialTheme.colorScheme.primary
+ )
}
}
}
@@ -635,7 +618,7 @@ fun ChatPanel(
}
}
- // Benchmark config dialog.
+// Benchmark config dialog.
if (showBenchmarkConfigsDialog) {
BenchmarkConfigDialog(onDismissed = { showBenchmarkConfigsDialog = false },
messageToBenchmark = benchmarkMessage.value,
@@ -644,7 +627,7 @@ fun ChatPanel(
})
}
- // Sheet to show when a message is long-pressed.
+// Sheet to show when a message is long-pressed.
if (showMessageLongPressedSheet) {
val message = longPressedMessage.value
if (message != null && message is ChatMessageText) {
@@ -700,22 +683,20 @@ fun ZoomableBox(
var offsetX by remember { mutableFloatStateOf(0f) }
var offsetY by remember { mutableFloatStateOf(0f) }
var size by remember { mutableStateOf(IntSize.Zero) }
- Box(
- modifier = modifier
- .clip(RectangleShape)
- .onSizeChanged { size = it }
- .pointerInput(Unit) {
- detectTransformGestures { _, pan, zoom, _ ->
- scale = maxOf(minScale, minOf(scale * zoom, maxScale))
- val maxX = (size.width * (scale - 1)) / 2
- val minX = -maxX
- offsetX = maxOf(minX, minOf(maxX, offsetX + pan.x))
- val maxY = (size.height * (scale - 1)) / 2
- val minY = -maxY
- offsetY = maxOf(minY, minOf(maxY, offsetY + pan.y))
- }
- },
- contentAlignment = Alignment.TopEnd
+ Box(modifier = modifier
+ .clip(RectangleShape)
+ .onSizeChanged { size = it }
+ .pointerInput(Unit) {
+ detectTransformGestures { _, pan, zoom, _ ->
+ scale = maxOf(minScale, minOf(scale * zoom, maxScale))
+ val maxX = (size.width * (scale - 1)) / 2
+ val minX = -maxX
+ offsetX = maxOf(minX, minOf(maxX, offsetX + pan.x))
+ val maxY = (size.height * (scale - 1)) / 2
+ val minY = -maxY
+ offsetY = maxOf(minY, minOf(maxY, offsetY + pan.y))
+ }
+ }, contentAlignment = Alignment.TopEnd
) {
val scope = ZoomableBoxScopeImpl(scale, offsetX, offsetY)
scope.content()
@@ -729,9 +710,7 @@ interface ZoomableBoxScope {
}
private data class ZoomableBoxScopeImpl(
- override val scale: Float,
- override val offsetX: Float,
- override val offsetY: Float
+ override val scale: Float, override val offsetX: Float, override val offsetY: Float
) : ZoomableBoxScope
@Preview(showBackground = true)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
index f3c369dce..7ec6cfbc6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
@@ -16,7 +16,6 @@
package com.google.aiedge.gallery.ui.home
-import android.app.Activity
import android.content.Context
import android.content.Intent
import android.net.Uri
@@ -354,7 +353,7 @@ private fun TaskList(
val linkColor = MaterialTheme.customColors.linkColor
val introText = buildAnnotatedString {
- append("Welcome to AI Edge Gallery! Explore a world of \namazing on-device models from ")
+ append("Welcome to Google AI Edge Gallery! Explore a world of \namazing on-device models from ")
withLink(
link = LinkAnnotation.Url(
url = "https://huggingface.co/litert-community", // Replace with the actual URL
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
index f0b8dec07..11a94b0e2 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
@@ -42,6 +42,7 @@ object LlmChatModelHelper {
fun initialize(
context: Context, model: Model, onDone: (String) -> Unit
) {
+ // Prepare options.
val maxTokens =
model.getIntConfigValue(key = ConfigKey.MAX_TOKENS, defaultValue = DEFAULT_MAX_TOKEN)
val topK = model.getIntConfigValue(key = ConfigKey.TOPK, defaultValue = DEFAULT_TOPK)
@@ -62,7 +63,7 @@ object LlmChatModelHelper {
.setMaxNumImages(if (model.llmSupportImage) 1 else 0)
.build()
- // Create an instance of the LLM Inference task
+ // Create an instance of the LLM Inference task and session.
try {
val llmInference = LlmInference.createFromOptions(context, options)
@@ -145,6 +146,9 @@ object LlmChatModelHelper {
}
// Start async inference.
+ //
+ // For a model that supports image modality, we need to add the text query chunk before adding
+ // image.
val session = instance.session
session.addQueryChunk(input)
if (image != null) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt
index 4f953768f..6e9e02be2 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt
@@ -205,7 +205,8 @@ fun GalleryTheme(
content: @Composable () -> Unit
) {
val themeOverride = ThemeSettings.themeOverride
- val darkTheme: Boolean = isSystemInDarkTheme() || themeOverride.value == THEME_DARK
+ val darkTheme: Boolean =
+ (isSystemInDarkTheme() || themeOverride.value == THEME_DARK) && themeOverride.value != THEME_LIGHT
StatusBarColorController(useDarkTheme = darkTheme)
diff --git a/Android/src/app/src/main/res/values/strings.xml b/Android/src/app/src/main/res/values/strings.xml
index 7b0242d84..fafbfb272 100644
--- a/Android/src/app/src/main/res/values/strings.xml
+++ b/Android/src/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
-->
- AI Edge Gallery
+ Google AI Edge Gallery
Model Manager
%1$s downloaded
Cancel
From 4d0c570d3465e3f18fdd0b72e1b7576b980e8635 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 11:32:13 -0700
Subject: [PATCH 008/336] Update model_allowlist.json
---
model_allowlist.json | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/model_allowlist.json b/model_allowlist.json
index 9d27bd4f6..1e8dc0fd2 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -11,22 +11,7 @@
"topK": 64,
"topP": 0.95,
"temperature": 1.0,
- "accelerators": "cpu,gpu"
- },
- "taskTypes": ["llm_chat", "llm_prompt_lab"]
- },
- {
- "name": "Hammer2.1-1.5b q8",
- "modelId": "litert-community/Hammer2.1-1.5b",
- "modelFile": "Hammer2.1-1.5b_multi-prefill-seq_q8_ekv1280.task",
- "description": "A variant of [MadeAgents/Hammer2.1-1.5b](https://huggingface.co/MadeAgents/Hammer2.1-1.5b) with 8-bit quantization ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference)",
- "sizeInBytes": 1617946305,
- "version": "20250514",
- "defaultConfig": {
- "topK": 40,
- "topP": 0.95,
- "temperature": 1.0,
- "accelerators": "cpu,gpu"
+ "accelerators": "gpu,cpu"
},
"taskTypes": ["llm_chat", "llm_prompt_lab"]
},
From e89fd9a23bc1f93dcac468270798725cfaa9861f Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 11:43:52 -0700
Subject: [PATCH 009/336] - Better text formatting on home screen for smaller
screen. - Set default backend based on the order of "accelerators" field in
model allowlist
---
Android/src/app/build.gradle.kts | 2 +-
.../main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt | 2 +-
.../com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt | 2 +-
.../google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt | 4 ----
.../com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt | 1 +
.../aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt | 4 +++-
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index a751214f6..09b16e545 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.2"
+ versionName = "0.9.3"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
index 7ec6cfbc6..90186d615 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
@@ -353,7 +353,7 @@ private fun TaskList(
val linkColor = MaterialTheme.customColors.linkColor
val introText = buildAnnotatedString {
- append("Welcome to Google AI Edge Gallery! Explore a world of \namazing on-device models from ")
+ append("Welcome to Google AI Edge Gallery! Explore a world of amazing on-device models from ")
withLink(
link = LinkAnnotation.Url(
url = "https://huggingface.co/litert-community", // Replace with the actual URL
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt
index 58759fe2a..0d9c06f10 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt
@@ -67,7 +67,7 @@ fun createLlmChatConfigs(
),
SegmentedButtonConfig(
key = ConfigKey.ACCELERATOR,
- defaultValue = if (accelerators.contains(Accelerator.GPU)) Accelerator.GPU.label else accelerators[0].label,
+ defaultValue = accelerators[0].label,
options = accelerators.map { it.label }
)
)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
index 11a94b0e2..aa2fb7889 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
@@ -132,12 +132,8 @@ object LlmChatModelHelper {
input: String,
resultListener: ResultListener,
cleanUpListener: CleanUpListener,
- singleTurn: Boolean = false,
image: Bitmap? = null,
) {
- if (singleTurn) {
- resetSession(model = model)
- }
val instance = model.instance as LlmModelInstance
// Set listener.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
index 91fabb335..91d6892a6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
@@ -61,6 +61,7 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
while (model.instance == null) {
delay(100)
}
+ delay(500)
// Run inference.
val instance = model.instance as LlmModelInstance
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
index 9f3b677a9..75e4d1346 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
@@ -78,6 +78,9 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_PROMPT_LAB) : ViewMo
delay(100)
}
+ LlmChatModelHelper.resetSession(model = model)
+ delay(500)
+
// Run inference.
val instance = model.instance as LlmModelInstance
val prefillTokens = instance.session.sizeInTokens(input)
@@ -145,7 +148,6 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_PROMPT_LAB) : ViewMo
setInProgress(false)
}
},
- singleTurn = true,
cleanUpListener = {
setPreparing(false)
setInProgress(false)
From 73f7dfeb632e2067cf2fe5082f046ac5f40a3e94 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 14:02:15 -0700
Subject: [PATCH 010/336] Update README.md
---
README.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 63 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 4dca702cb..bd4f58fe7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,64 @@
-# Google AI Edge Gallery
+# Google AI Edge Gallery ✨
-Google AI Edge Gallery is a mobile application designed to showcase the capabilities of Google AI Edge models, APIs, and tools. It serves as an interactive playground for developers and potentially tech enthusiasts to explore, experience, and evaluate various on-device ML models (primarily LiteRT-based) directly on their Android and iOS (coming soon) devices.
+[](LICENSE)
+[](https://github.com/google-ai-edge/gallery/releases)
+
+**Explore, Experience, and Evaluate the Future of On-Device Generative AI with Google AI Edge.**
+
+The Google AI Edge Gallery is an experimental app that puts the power of cutting-edge Generative AI models directly into your hands, running entirely on your Android *(available now)* and iOS *(coming soon)* devices. Discover what's possible, today!
+
+## 🚀 What is Google AI Edge Gallery?
+
+Google AI Edge Gallery is your interactive playground for on-device AI. It's built to:
+
+* **Inspire Developers:** See what you can build with Google AI Edge.
+* **Showcase Capabilities:** Experience the performance and quality of LiteRT-optimized models.
+* **Reduce Friction:** Easily try out different models and tasks without writing code.
+* **Foster Community:** An open-source project for learning.
+
+## ✨ Core Features
+
+* **📱 On-Device GenAI:** Run LLMs locally – fast, private, and offline-capable.
+* **🤖 Diverse Model Zoo:** Explore models from the Hugging Face LiteRT Community and Google.
+* **✍️ Prompt Lab:** Summarize, rewrite, generate code, or use freeform prompts to explore single-turn LLM use cases.
+* **💬 AI Chat:** Engage in multi-turn conversations.
+* **📊 Performance Insights:** Real-time benchmarks (TTFT, decode speed, latency).
+* **🧩 Bring Your Own Model:** Test your local LiteRT `.task` models.
+* **🔗 Developer Resources:** Quick links to model cards and source code.
+
+
+
+
+## 🏁 Get Started in Minutes!
+
+1. **Download the App:** Grab the [latest APK](https://github.com/google-ai-edge/gallery/releases/latest/download/ai-edge-gallery.apk).
+2. **Install & Explore:** For detailed installation instructions (including for corporate devices) and a full user guide, head over to our [**Project Wiki**](https://github.com/google-ai-edge/gallery/wiki)!
+
+## 🛠️ Technology Highlights
+
+* **Google AI Edge:** Core APIs and tools for on-device ML.
+* **LiteRT:** Lightweight runtime for optimized model execution.
+* **LLM Inference API:** Powering on-device Large Language Models.
+* **Hugging Face Integration:** For model discovery and download.
+
+## 🤝 Feedback
+
+This is an **experimental Alpha release**, and your input is crucial!
+
+* 🐞 **Found a bug?** [Report it here!](https://github.com/google-ai-edge/gallery/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D)
+* 💡 **Have an idea?** [Suggest a feature!](https://github.com/google-ai-edge/gallery/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=%5BFEATURE%5D)
+
+## 📄 License
+
+Licensed under the Apache License, Version 2.0. See the [LICENSE](LICENSE) file for details.
+
+## 🔗 Useful Links
+
+* [**Project Wiki (Detailed Guides)**](https://github.com/google-ai-edge/gallery/wiki)
+* [Hugging Face LiteRT Community](https://huggingface.co/litert-community)
+* [LLM Inference guide for Android](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android)
+* [Google AI Edge Documentation](https://ai.google.dev/edge)
From 1c31b598f846eaa1c59458f9913e1bd7c3566955 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 14:11:27 -0700
Subject: [PATCH 011/336] Update README.md
---
README.md | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index bd4f58fe7..3872c533c 100644
--- a/README.md
+++ b/README.md
@@ -5,34 +5,18 @@
**Explore, Experience, and Evaluate the Future of On-Device Generative AI with Google AI Edge.**
-The Google AI Edge Gallery is an experimental app that puts the power of cutting-edge Generative AI models directly into your hands, running entirely on your Android *(available now)* and iOS *(coming soon)* devices. Discover what's possible, today!
-
-## 🚀 What is Google AI Edge Gallery?
-
-Google AI Edge Gallery is your interactive playground for on-device AI. It's built to:
-
-* **Inspire Developers:** See what you can build with Google AI Edge.
-* **Showcase Capabilities:** Experience the performance and quality of LiteRT-optimized models.
-* **Reduce Friction:** Easily try out different models and tasks without writing code.
-* **Foster Community:** An open-source project for learning.
+The Google AI Edge Gallery is an experimental app that puts the power of cutting-edge Generative AI models directly into your hands, running entirely on your Android *(available now)* and iOS *(coming soon)* devices. Dive into a world of creative and practical AI use cases, all running locally, without needing an internet connection once the model is loaded. Experiment with different models, chat, ask questions with images, explore prompts, and more!
## ✨ Core Features
-* **📱 On-Device GenAI:** Run LLMs locally – fast, private, and offline-capable.
-* **🤖 Diverse Model Zoo:** Explore models from the Hugging Face LiteRT Community and Google.
+* **📱 Run Locally, Fully Offline:** Experience the magic of GenAI without an internet connection. All processing happens directly on your device.
+* **🤖 Choose Your Model:** Easily switch between different models from Hugging Face and compare their performance.
* **✍️ Prompt Lab:** Summarize, rewrite, generate code, or use freeform prompts to explore single-turn LLM use cases.
* **💬 AI Chat:** Engage in multi-turn conversations.
* **📊 Performance Insights:** Real-time benchmarks (TTFT, decode speed, latency).
* **🧩 Bring Your Own Model:** Test your local LiteRT `.task` models.
* **🔗 Developer Resources:** Quick links to model cards and source code.
-
-
-
## 🏁 Get Started in Minutes!
1. **Download the App:** Grab the [latest APK](https://github.com/google-ai-edge/gallery/releases/latest/download/ai-edge-gallery.apk).
From e53acf60659dbc88d443bd41f7e8bfcfe2df8756 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 14:15:35 -0700
Subject: [PATCH 012/336] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 3872c533c..641dd69f1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ The Google AI Edge Gallery is an experimental app that puts the power of cutting
## 🏁 Get Started in Minutes!
-1. **Download the App:** Grab the [latest APK](https://github.com/google-ai-edge/gallery/releases/latest/download/ai-edge-gallery.apk).
+1. **Download the App:** Grab the [**latest APK**](https://github.com/google-ai-edge/gallery/releases/latest/download/ai-edge-gallery.apk).
2. **Install & Explore:** For detailed installation instructions (including for corporate devices) and a full user guide, head over to our [**Project Wiki**](https://github.com/google-ai-edge/gallery/wiki)!
## 🛠️ Technology Highlights
From 7d567c3499492cbb330cd4e379d52fd04d454d2c Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 14:46:00 -0700
Subject: [PATCH 013/336] - Fix a bug where deleting a local model when there
are >1 local models shows the wrong download status. - Don't go back to model
selection screen automatically when there is an error during model
initialization, so that users have a chance to change model parameters (e.g.
accelerator) to retry the initialization. - Show error dialog properly in
prompt lab screen.
---
Android/src/app/build.gradle.kts | 2 +-
.../aiedge/gallery/ui/common/ErrorDialog.kt | 67 +++++++++++++++++++
.../gallery/ui/common/chat/ChatPanel.kt | 47 ++-----------
.../ui/llmsingleturn/LlmSingleTurnScreen.kt | 14 ++++
.../gallery/ui/modelmanager/ModelList.kt | 2 +-
.../ui/modelmanager/ModelManagerViewModel.kt | 3 +
6 files changed, 92 insertions(+), 43 deletions(-)
create mode 100644 Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 09b16e545..97e49fe7c 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -30,7 +30,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.3"
+ versionName = "0.9.4"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt
new file mode 100644
index 000000000..b9bebd1cf
--- /dev/null
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt
@@ -0,0 +1,67 @@
+/*
+ * 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.aiedge.gallery.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+
+@Composable
+fun ErrorDialog(error: String, onDismiss: () -> Unit) {
+ Dialog(
+ onDismissRequest = onDismiss
+ ) {
+ Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
+ Column(
+ modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ // Title
+ Text(
+ "Error",
+ style = MaterialTheme.typography.titleLarge,
+ modifier = Modifier.padding(bottom = 8.dp)
+ )
+
+ // Error
+ Text(
+ error,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.error,
+ )
+
+ Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
+ Button(
+ onClick = onDismiss
+ ) {
+ Text("Close")
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
index 626ef09b8..055b75d87 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
@@ -43,14 +43,11 @@ import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Timer
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.ContentCopy
import androidx.compose.material.icons.rounded.Refresh
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -97,11 +94,11 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
import com.google.aiedge.gallery.R
import com.google.aiedge.gallery.data.Model
import com.google.aiedge.gallery.data.Task
import com.google.aiedge.gallery.data.TaskType
+import com.google.aiedge.gallery.ui.common.ErrorDialog
import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.aiedge.gallery.ui.preview.PreviewChatModel
@@ -581,44 +578,12 @@ fun ChatPanel(
// Error dialog.
if (showErrorDialog) {
- Dialog(
- onDismissRequest = {
- showErrorDialog = false
- navigateUp()
- },
- ) {
- Card(modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
- Column(
- modifier = Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)
- ) {
- // Title
- Text(
- "Error",
- style = MaterialTheme.typography.titleLarge,
- modifier = Modifier.padding(bottom = 8.dp)
- )
-
- // Error
- Text(
- modelInitializationStatus?.error ?: "",
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.error,
- )
-
- Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
- Button(onClick = {
- showErrorDialog = false
- navigateUp()
- }) {
- Text("Close")
- }
- }
- }
- }
- }
+ ErrorDialog(error = modelInitializationStatus?.error ?: "", onDismiss = {
+ showErrorDialog = false
+ })
}
-// Benchmark config dialog.
+ // Benchmark config dialog.
if (showBenchmarkConfigsDialog) {
BenchmarkConfigDialog(onDismissed = { showBenchmarkConfigsDialog = false },
messageToBenchmark = benchmarkMessage.value,
@@ -627,7 +592,7 @@ fun ChatPanel(
})
}
-// Sheet to show when a message is long-pressed.
+ // Sheet to show when a message is long-pressed.
if (showMessageLongPressedSheet) {
val message = longPressedMessage.value
if (message != null && message is ChatMessageText) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
index 0748a8f4f..99bf31299 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
@@ -43,8 +43,10 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.lifecycle.viewmodel.compose.viewModel
import com.google.aiedge.gallery.data.ModelDownloadStatusType
import com.google.aiedge.gallery.ui.ViewModelProvider
+import com.google.aiedge.gallery.ui.common.ErrorDialog
import com.google.aiedge.gallery.ui.common.ModelPageAppBar
import com.google.aiedge.gallery.ui.common.chat.ModelDownloadStatusInfoPanel
+import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.aiedge.gallery.ui.preview.PreviewLlmSingleTurnViewModel
import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
@@ -78,6 +80,7 @@ fun LlmSingleTurnScreen(
val scope = rememberCoroutineScope()
val context = LocalContext.current
var navigatingUp by remember { mutableStateOf(false) }
+ var showErrorDialog by remember { mutableStateOf(false) }
val handleNavigateUp = {
navigatingUp = true
@@ -110,6 +113,11 @@ fun LlmSingleTurnScreen(
}
}
+ val modelInitializationStatus = modelManagerUiState.modelInitializationStatus[selectedModel.name]
+ LaunchedEffect(modelInitializationStatus) {
+ showErrorDialog = modelInitializationStatus?.status == ModelInitializationStatusType.ERROR
+ }
+
Scaffold(modifier = modifier, topBar = {
ModelPageAppBar(
task = task,
@@ -186,6 +194,12 @@ fun LlmSingleTurnScreen(
}
})
}
+
+ if (showErrorDialog) {
+ ErrorDialog(error = modelInitializationStatus?.error ?: "", onDismiss = {
+ showErrorDialog = false
+ })
+ }
}
}
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
index 1e5e00db0..d7657c7d0 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
@@ -160,7 +160,7 @@ fun ModelList(
}
// List of imported models within a task.
- items(items = importedModels) { model ->
+ items(items = importedModels, key = { it.name }) { model ->
Box {
ModelItem(
model = model,
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
index 50d5a572b..5414c6b55 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
@@ -683,6 +683,9 @@ open class ModelManagerViewModel(
Log.d(TAG, "Allowlist: $modelAllowlist")
// Convert models in the allowlist.
+ TASK_LLM_CHAT.models.clear()
+ TASK_LLM_PROMPT_LAB.models.clear()
+ TASK_LLM_ASK_IMAGE.models.clear()
for (allowedModel in modelAllowlist.models) {
if (allowedModel.disabled == true) {
continue
From 96f838b5503dbf5f3b4fb16e95fe878a5e3caec7 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 16:59:37 -0700
Subject: [PATCH 014/336] Update package to com.google.ai.edge.gallery
---
Android/src/app/build.gradle.kts | 5 +-
.../aiedge/gallery/ExampleInstrumentedTest.kt | 40 ------------
Android/src/app/src/main/AndroidManifest.xml | 6 +-
.../{aiedge => ai/edge}/gallery/GalleryApp.kt | 9 +--
.../edge}/gallery/GalleryApplication.kt | 8 +--
.../edge}/gallery/GalleryLifecycleProvider.kt | 2 +-
.../edge}/gallery/MainActivity.kt | 4 +-
.../edge}/gallery/data/AppBarAction.kt | 2 +-
.../edge}/gallery/data/AppContainer.kt | 6 +-
.../edge}/gallery/data/Config.kt | 2 +-
.../edge}/gallery/data/ConfigValue.kt | 2 +-
.../edge}/gallery/data/Consts.kt | 2 +-
.../edge}/gallery/data/DataStoreRepository.kt | 4 +-
.../edge}/gallery/data/DownloadRepository.kt | 18 +++---
.../{aiedge => ai/edge}/gallery/data/Model.kt | 6 +-
.../edge}/gallery/data/ModelAllowlist.kt | 12 ++--
.../{aiedge => ai/edge}/gallery/data/Tasks.kt | 12 ++--
.../edge}/gallery/ui/ViewModelProvider.kt | 18 +++---
.../edge}/gallery/ui/common/AuthConfig.kt | 4 +-
.../gallery/ui/common/DownloadAndTryButton.kt | 12 ++--
.../edge}/gallery/ui/common/ErrorDialog.kt | 2 +-
.../gallery/ui/common/ModelPageAppBar.kt | 14 ++--
.../edge}/gallery/ui/common/ModelPicker.kt | 18 +++---
.../ui/common/ModelPickerChipsPager.kt | 12 ++--
.../edge}/gallery/ui/common/TaskIcon.kt | 14 ++--
.../edge}/gallery/ui/common/Utils.kt | 30 +++++----
.../ui/common/chat/BenchmarkConfigDialog.kt | 14 ++--
.../gallery/ui/common/chat/ChatMessage.kt | 4 +-
.../edge}/gallery/ui/common/chat/ChatPanel.kt | 29 ++++-----
.../edge}/gallery/ui/common/chat/ChatView.kt | 27 ++++----
.../gallery/ui/common/chat/ChatViewModel.kt | 8 +--
.../gallery/ui/common/chat/ConfigDialog.kt | 20 +++---
.../edge}/gallery/ui/common/chat/DataCard.kt | 12 ++--
.../ui/common/chat/LiveCameraDialog.kt | 2 +-
.../gallery/ui/common/chat/MarkdownText.kt | 6 +-
.../ui/common/chat/MessageActionButton.kt | 6 +-
.../ui/common/chat/MessageBodyBenchmark.kt | 4 +-
.../ui/common/chat/MessageBodyBenchmarkLlm.kt | 4 +-
.../common/chat/MessageBodyClassification.kt | 4 +-
.../ui/common/chat/MessageBodyConfigUpdate.kt | 16 ++---
.../ui/common/chat/MessageBodyImage.kt | 2 +-
.../chat/MessageBodyImageWithHistory.kt | 2 +-
.../gallery/ui/common/chat/MessageBodyInfo.kt | 6 +-
.../ui/common/chat/MessageBodyLoading.kt | 8 +--
.../common/chat/MessageBodyPromptTemplates.kt | 12 ++--
.../gallery/ui/common/chat/MessageBodyText.kt | 4 +-
.../ui/common/chat/MessageBodyWarning.kt | 4 +-
.../ui/common/chat/MessageBubbleShape.kt | 2 +-
.../ui/common/chat/MessageInputImage.kt | 6 +-
.../ui/common/chat/MessageInputText.kt | 12 ++--
.../gallery/ui/common/chat/MessageLatency.kt | 6 +-
.../gallery/ui/common/chat/MessageSender.kt | 10 +--
.../chat/ModelDownloadStatusInfoPanel.kt | 12 ++--
.../common/chat/ModelDownloadingAnimation.kt | 28 ++++----
.../common/chat/ModelInitializationStatus.kt | 6 +-
.../ui/common/chat/ModelNotDownloaded.kt | 4 +-
.../gallery/ui/common/chat/ModelSelector.kt | 20 +++---
.../ui/common/chat/TextInputHistorySheet.kt | 8 +--
.../modelitem/AnimatedLayoutModifier.kt | 2 +-
.../modelitem/ConfirmDeleteModelDialog.kt | 6 +-
.../gallery/ui/common/modelitem/ModelItem.kt | 38 +++++------
.../common/modelitem/ModelItemActionButton.kt | 14 ++--
.../ui/common/modelitem/ModelNameAndStatus.kt | 19 +++---
.../gallery/ui/common/modelitem/StatusIcon.kt | 10 +--
.../edge}/gallery/ui/home/HomeScreen.kt | 28 ++++----
.../gallery/ui/home/ModelImportDialog.kt | 36 +++++------
.../gallery/ui/home/NewReleaseNotification.kt | 63 ++++++++++++------
.../edge}/gallery/ui/home/SettingsDialog.kt | 17 +++--
.../edge}/gallery/ui/icon/Deploy.kt | 2 +-
.../ImageClassificationModelHelper.kt | 10 +--
.../ImageClassificationScreen.kt | 12 ++--
.../ImageClassificationViewModel.kt | 18 +++---
.../ImageGenerationModelHelper.kt | 10 +--
.../imagegeneration/ImageGenerationScreen.kt | 10 +--
.../ImageGenerationViewModel.kt | 16 ++---
.../gallery/ui/llmchat/LlmChatConfigs.kt | 14 ++--
.../gallery/ui/llmchat/LlmChatModelHelper.kt | 10 +--
.../edge}/gallery/ui/llmchat/LlmChatScreen.kt | 12 ++--
.../gallery/ui/llmchat/LlmChatViewModel.kt | 28 ++++----
.../ui/llmsingleturn/LlmSingleTurnScreen.kt | 24 +++----
.../llmsingleturn/LlmSingleTurnViewModel.kt | 18 +++---
.../ui/llmsingleturn/PromptTemplateConfigs.kt | 2 +-
.../ui/llmsingleturn/PromptTemplatesPanel.kt | 14 ++--
.../gallery/ui/llmsingleturn/ResponsePanel.kt | 16 ++---
.../ui/llmsingleturn/SingleSelectButton.kt | 2 +-
.../ui/llmsingleturn/VerticalSplitView.kt | 6 +-
.../gallery/ui/modelmanager/ModelList.kt | 16 ++---
.../gallery/ui/modelmanager/ModelManager.kt | 18 +++---
.../ui/modelmanager/ModelManagerViewModel.kt | 64 +++++++++----------
.../gallery/ui/navigation/GalleryNavGraph.kt | 56 ++++++++--------
.../gallery/ui/preview/PreviewChatModel.kt | 16 ++---
.../ui/preview/PreviewDataStoreRepository.kt | 8 +--
.../ui/preview/PreviewDownloadRepository.kt | 10 +--
.../preview/PreviewLlmSingleTurnViewModel.kt | 4 +-
.../preview/PreviewModelManagerViewModel.kt | 10 +--
.../edge}/gallery/ui/preview/PreviewTasks.kt | 22 +++----
.../TextClassificationModelHelper.kt | 6 +-
.../TextClassificationScreen.kt | 10 +--
.../TextClassificationViewModel.kt | 22 +++----
.../edge}/gallery/ui/theme/Color.kt | 2 +-
.../edge}/gallery/ui/theme/Theme.kt | 2 +-
.../edge}/gallery/ui/theme/ThemeSettings.kt | 2 +-
.../edge}/gallery/ui/theme/Type.kt | 4 +-
.../edge}/gallery/worker/DownloadWorker.kt | 32 +++++-----
.../google/aiedge/gallery/ExampleUnitTest.kt | 33 ----------
105 files changed, 658 insertions(+), 708 deletions(-)
delete mode 100644 Android/src/app/src/androidTest/java/com/google/aiedge/gallery/ExampleInstrumentedTest.kt
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/GalleryApp.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/GalleryApplication.kt (86%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/GalleryLifecycleProvider.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/MainActivity.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/AppBarAction.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/AppContainer.kt (90%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/Config.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/ConfigValue.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/Consts.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/DataStoreRepository.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/DownloadRepository.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/Model.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/ModelAllowlist.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/data/Tasks.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/ViewModelProvider.kt (78%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/AuthConfig.kt (92%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/DownloadAndTryButton.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/ErrorDialog.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/ModelPageAppBar.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/ModelPicker.kt (88%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/ModelPickerChipsPager.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/TaskIcon.kt (90%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/Utils.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/BenchmarkConfigDialog.kt (88%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ChatMessage.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ChatPanel.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ChatView.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ChatViewModel.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ConfigDialog.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/DataCard.kt (88%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/LiveCameraDialog.kt (99%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MarkdownText.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageActionButton.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyBenchmark.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyClassification.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyConfigUpdate.kt (90%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyImage.kt (96%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyImageWithHistory.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyInfo.kt (92%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyLoading.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyPromptTemplates.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyText.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBodyWarning.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageBubbleShape.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageInputImage.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageInputText.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageLatency.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/MessageSender.kt (96%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt (92%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ModelDownloadingAnimation.kt (92%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ModelInitializationStatus.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ModelNotDownloaded.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/ModelSelector.kt (89%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/chat/TextInputHistorySheet.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/modelitem/ModelItem.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/modelitem/ModelItemActionButton.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/modelitem/ModelNameAndStatus.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/common/modelitem/StatusIcon.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/home/HomeScreen.kt (96%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/home/ModelImportDialog.kt (92%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/home/NewReleaseNotification.kt (62%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/home/SettingsDialog.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/icon/Deploy.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/imageclassification/ImageClassificationModelHelper.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/imageclassification/ImageClassificationScreen.kt (87%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/imageclassification/ImageClassificationViewModel.kt (89%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt (89%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/imagegeneration/ImageGenerationScreen.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/imagegeneration/ImageGenerationViewModel.kt (82%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmchat/LlmChatConfigs.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmchat/LlmChatModelHelper.kt (95%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmchat/LlmChatScreen.kt (91%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmchat/LlmChatViewModel.kt (89%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt (90%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt (99%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/ResponsePanel.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/SingleSelectButton.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/llmsingleturn/VerticalSplitView.kt (96%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/modelmanager/ModelList.kt (93%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/modelmanager/ModelManager.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/modelmanager/ModelManagerViewModel.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/navigation/GalleryNavGraph.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/preview/PreviewChatModel.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/preview/PreviewDataStoreRepository.kt (85%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/preview/PreviewDownloadRepository.kt (82%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/preview/PreviewModelManagerViewModel.kt (86%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/preview/PreviewTasks.kt (82%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/textclassification/TextClassificationModelHelper.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/textclassification/TextClassificationScreen.kt (87%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/textclassification/TextClassificationViewModel.kt (84%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/theme/Color.kt (98%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/theme/Theme.kt (99%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/theme/ThemeSettings.kt (94%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/ui/theme/Type.kt (97%)
rename Android/src/app/src/main/java/com/google/{aiedge => ai/edge}/gallery/worker/DownloadWorker.kt (90%)
delete mode 100644 Android/src/app/src/test/java/com/google/aiedge/gallery/ExampleUnitTest.kt
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 97e49fe7c..412a1eb3c 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -22,10 +22,11 @@ plugins {
}
android {
- namespace = "com.google.aiedge.gallery"
+ namespace = "com.google.ai.edge.gallery"
compileSdk = 35
defaultConfig {
+ // Don't change to com.google.ai.edge.gallery yet.
applicationId = "com.google.aiedge.gallery"
minSdk = 26
targetSdk = 35
@@ -33,7 +34,7 @@ android {
versionName = "0.9.4"
// Needed for HuggingFace auth workflows.
- manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth"
+ manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/Android/src/app/src/androidTest/java/com/google/aiedge/gallery/ExampleInstrumentedTest.kt b/Android/src/app/src/androidTest/java/com/google/aiedge/gallery/ExampleInstrumentedTest.kt
deleted file mode 100644
index f26352af1..000000000
--- a/Android/src/app/src/androidTest/java/com/google/aiedge/gallery/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.aiedge.gallery
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
- @Test
- fun useAppContext() {
- // Context of the app under test.
- val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("com.google.aiedge.gallery", appContext.packageName)
- }
-}
\ No newline at end of file
diff --git a/Android/src/app/src/main/AndroidManifest.xml b/Android/src/app/src/main/AndroidManifest.xml
index 1f7f37e89..62b91d11c 100644
--- a/Android/src/app/src/main/AndroidManifest.xml
+++ b/Android/src/app/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
android:required="false" />
-
+
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt
index 02c01383a..53e5ec9ca 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApp.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt
@@ -16,7 +16,7 @@
@file:OptIn(ExperimentalMaterial3Api::class)
-package com.google.aiedge.gallery
+package com.google.ai.edge.gallery
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -49,9 +49,10 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
-import com.google.aiedge.gallery.data.AppBarAction
-import com.google.aiedge.gallery.data.AppBarActionType
-import com.google.aiedge.gallery.ui.navigation.GalleryNavHost
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.AppBarAction
+import com.google.ai.edge.gallery.data.AppBarActionType
+import com.google.ai.edge.gallery.ui.navigation.GalleryNavHost
/**
* Top level composable representing the main screen of the application.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApplication.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt
similarity index 86%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApplication.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt
index 49a71226a..942bf5efb 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryApplication.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery
+package com.google.ai.edge.gallery
import android.app.Application
import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.preferencesDataStore
-import com.google.aiedge.gallery.data.AppContainer
-import com.google.aiedge.gallery.data.DefaultAppContainer
-import com.google.aiedge.gallery.ui.theme.ThemeSettings
+import com.google.ai.edge.gallery.data.AppContainer
+import com.google.ai.edge.gallery.data.DefaultAppContainer
+import com.google.ai.edge.gallery.ui.theme.ThemeSettings
private val Context.dataStore: DataStore by preferencesDataStore(name = "app_gallery_preferences")
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryLifecycleProvider.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryLifecycleProvider.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryLifecycleProvider.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryLifecycleProvider.kt
index fde845b73..3d76eb8a2 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/GalleryLifecycleProvider.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryLifecycleProvider.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery
+package com.google.ai.edge.gallery
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/MainActivity.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/MainActivity.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/MainActivity.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/MainActivity.kt
index 5512a8e58..1356d126d 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/MainActivity.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/MainActivity.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery
+package com.google.ai.edge.gallery
import android.os.Bundle
import androidx.activity.ComponentActivity
@@ -24,7 +24,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/AppBarAction.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/AppBarAction.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/AppBarAction.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/AppBarAction.kt
index 6a6dbcf96..f13989634 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/AppBarAction.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/AppBarAction.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
/** Possible action for app bar. */
enum class AppBarActionType {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/AppContainer.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/AppContainer.kt
similarity index 90%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/AppContainer.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/AppContainer.kt
index c95d0790b..57a905d0e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/AppContainer.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/AppContainer.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
-import com.google.aiedge.gallery.GalleryLifecycleProvider
-import com.google.aiedge.gallery.AppLifecycleProvider
+import com.google.ai.edge.gallery.GalleryLifecycleProvider
+import com.google.ai.edge.gallery.AppLifecycleProvider
/**
* App container for Dependency injection.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Config.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/Config.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt
index 4ebde2696..4106d7d0b 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Config.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
/**
* The types of configuration editors available.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ConfigValue.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/ConfigValue.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/ConfigValue.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/ConfigValue.kt
index e73edb148..ef3e5aef5 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ConfigValue.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/ConfigValue.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
import kotlinx.serialization.KSerializer
import kotlinx.serialization.Serializable
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Consts.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/Consts.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
index 4082be340..75eb4e46b 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Consts.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
// Keys used to send/receive data to Work.
const val KEY_MODEL_URL = "KEY_MODEL_URL"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DataStoreRepository.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DataStoreRepository.kt
index 304658034..82749e93a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DataStoreRepository.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DataStoreRepository.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
import android.security.keystore.KeyGenParameterSpec
import android.security.keystore.KeyProperties
@@ -26,7 +26,7 @@ import androidx.datastore.preferences.core.longPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.google.aiedge.gallery.ui.theme.THEME_AUTO
+import com.google.ai.edge.gallery.ui.theme.THEME_AUTO
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
import java.security.KeyStore
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DownloadRepository.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/DownloadRepository.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
index 96dc1f0c3..131f36d58 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/DownloadRepository.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
import android.Manifest
import android.app.NotificationChannel
@@ -37,9 +37,9 @@ import androidx.work.OutOfQuotaPolicy
import androidx.work.WorkInfo
import androidx.work.WorkManager
import androidx.work.WorkQuery
-import com.google.aiedge.gallery.AppLifecycleProvider
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.worker.DownloadWorker
+import com.google.ai.edge.gallery.AppLifecycleProvider
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.worker.DownloadWorker
import com.google.common.util.concurrent.FutureCallback
import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.ListenableFuture
@@ -112,7 +112,7 @@ class DefaultDownloadRepository(
// Create worker request.
val downloadWorkRequest =
OneTimeWorkRequestBuilder().setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
- .setInputData(inputData).addTag("${MODEL_NAME_TAG}:${model.name}").build()
+ .setInputData(inputData).addTag("$MODEL_NAME_TAG:${model.name}").build()
val workerId = downloadWorkRequest.id
@@ -128,7 +128,7 @@ class DefaultDownloadRepository(
}
override fun cancelDownloadModel(model: Model) {
- workManager.cancelAllWorkByTag("${MODEL_NAME_TAG}:${model.name}")
+ workManager.cancelAllWorkByTag("$MODEL_NAME_TAG:${model.name}")
}
override fun cancelAll(models: List, onComplete: () -> Unit) {
@@ -138,7 +138,7 @@ class DefaultDownloadRepository(
}
val futures = mutableListOf>()
- for (tag in models.map { "${MODEL_NAME_TAG}:${it.name}" }) {
+ for (tag in models.map { "$MODEL_NAME_TAG:${it.name}" }) {
futures.add(workManager.cancelAllWorkByTag(tag).result)
}
val combinedFuture: ListenableFuture> = Futures.allAsList(futures)
@@ -248,7 +248,7 @@ class DefaultDownloadRepository(
var modelName = ""
Log.d(TAG, "work: ${info.id}, tags: $tags")
for (tag in tags) {
- if (tag.startsWith("${MODEL_NAME_TAG}:")) {
+ if (tag.startsWith("$MODEL_NAME_TAG:")) {
val index = tag.indexOf(':')
if (index >= 0) {
modelName = tag.substring(index + 1)
@@ -282,7 +282,7 @@ class DefaultDownloadRepository(
// Create an Intent to open your app with a deep link.
val intent = Intent(
Intent.ACTION_VIEW,
- Uri.parse("com.google.aiedge.gallery://model/${modelName}")
+ Uri.parse("com.google.ai.edge.gallery://model/${modelName}")
).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Model.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/Model.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt
index 508e9f3a2..ee5f10ac4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Model.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
import android.content.Context
-import com.google.aiedge.gallery.ui.common.chat.PromptTemplate
-import com.google.aiedge.gallery.ui.common.convertValueToTargetType
+import com.google.ai.edge.gallery.ui.common.chat.PromptTemplate
+import com.google.ai.edge.gallery.ui.common.convertValueToTargetType
import java.io.File
data class ModelDataFile(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/ModelAllowlist.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/ModelAllowlist.kt
index 02b97c1f4..ffb821137 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/ModelAllowlist.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/ModelAllowlist.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_ACCELERATORS
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_TEMPERATURE
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_TOPK
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_TOPP
-import com.google.aiedge.gallery.ui.llmchat.createLlmChatConfigs
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_ACCELERATORS
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_TEMPERATURE
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_TOPK
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_TOPP
+import com.google.ai.edge.gallery.ui.llmchat.createLlmChatConfigs
import kotlinx.serialization.Serializable
/** A model in the model allowlist. */
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Tasks.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Tasks.kt
index 64ce7a530..41a2314b5 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/data/Tasks.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Tasks.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.data
+package com.google.ai.edge.gallery.data
import androidx.annotation.StringRes
import androidx.compose.material.icons.Icons
@@ -25,7 +25,7 @@ import androidx.compose.material.icons.rounded.ImageSearch
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableLongStateOf
import androidx.compose.ui.graphics.vector.ImageVector
-import com.google.aiedge.gallery.R
+import com.google.ai.edge.gallery.R
/** Type of task. */
enum class TaskType(val label: String, val id: String) {
@@ -96,7 +96,7 @@ val TASK_LLM_CHAT = Task(
models = mutableListOf(),
description = "Chat with on-device large language models",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android",
- sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt",
+ sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt",
textInputPlaceHolderRes = R.string.text_input_placeholder_llm_chat
)
@@ -106,7 +106,7 @@ val TASK_LLM_PROMPT_LAB = Task(
models = mutableListOf(),
description = "Single turn use cases with on-device large language model",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android",
- sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt",
+ sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt",
textInputPlaceHolderRes = R.string.text_input_placeholder_llm_chat
)
@@ -116,7 +116,7 @@ val TASK_LLM_ASK_IMAGE = Task(
models = mutableListOf(),
description = "Ask questions about images with on-device large language models",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference/android",
- sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt",
+ sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt",
textInputPlaceHolderRes = R.string.text_input_placeholder_llm_chat
)
@@ -126,7 +126,7 @@ val TASK_IMAGE_GENERATION = Task(
models = MODELS_IMAGE_GENERATION,
description = "Generate images from text",
docUrl = "https://ai.google.dev/edge/mediapipe/solutions/vision/image_generator/android",
- sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt",
+ sourceCodeUrl = "https://github.com/google-ai-edge/gallery/blob/main/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt",
textInputPlaceHolderRes = R.string.text_image_generation_text_field_placeholder
)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/ViewModelProvider.kt
similarity index 78%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/ViewModelProvider.kt
index cf224719f..8a257dd2c 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/ViewModelProvider.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/ViewModelProvider.kt
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui
+package com.google.ai.edge.gallery.ui
import android.app.Application
import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
-import com.google.aiedge.gallery.GalleryApplication
-import com.google.aiedge.gallery.ui.imageclassification.ImageClassificationViewModel
-import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationViewModel
-import com.google.aiedge.gallery.ui.llmchat.LlmChatViewModel
-import com.google.aiedge.gallery.ui.llmchat.LlmAskImageViewModel
-import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnViewModel
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.textclassification.TextClassificationViewModel
+import com.google.ai.edge.gallery.GalleryApplication
+import com.google.ai.edge.gallery.ui.imageclassification.ImageClassificationViewModel
+import com.google.ai.edge.gallery.ui.imagegeneration.ImageGenerationViewModel
+import com.google.ai.edge.gallery.ui.llmchat.LlmChatViewModel
+import com.google.ai.edge.gallery.ui.llmchat.LlmAskImageViewModel
+import com.google.ai.edge.gallery.ui.llmsingleturn.LlmSingleTurnViewModel
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.textclassification.TextClassificationViewModel
object ViewModelProvider {
val Factory = viewModelFactory {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/AuthConfig.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/AuthConfig.kt
similarity index 92%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/AuthConfig.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/AuthConfig.kt
index 737bcbbcd..11e30e089 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/AuthConfig.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/AuthConfig.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import android.net.Uri
import net.openid.appauth.AuthorizationServiceConfiguration
@@ -27,7 +27,7 @@ object AuthConfig {
// The scheme needs to match the
// "android.defaultConfig.manifestPlaceholders["appAuthRedirectScheme"]" field in
// "build.gradle.kts".
- const val redirectUri = "com.google.aiedge.gallery.oauth://oauthredirect"
+ const val redirectUri = "com.google.ai.edge.gallery.oauth://oauthredirect"
// OAuth 2.0 Endpoints (Authorization + Token Exchange)
private const val authEndpoint = "https://huggingface.co/oauth/authorize"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/DownloadAndTryButton.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/DownloadAndTryButton.kt
index b2871db40..9924da158 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/DownloadAndTryButton.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/DownloadAndTryButton.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import android.content.Intent
import android.net.Uri
@@ -51,11 +51,11 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.modelmanager.TokenRequestResultType
-import com.google.aiedge.gallery.ui.modelmanager.TokenStatus
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.modelmanager.TokenRequestResultType
+import com.google.ai.edge.gallery.ui.modelmanager.TokenStatus
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ErrorDialog.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ErrorDialog.kt
index b9bebd1cf..ee5641e50 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ErrorDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ErrorDialog.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt
index 8986bf112..64e0861cb 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPageAppBar.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -48,12 +48,12 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.chat.ConfigDialog
-import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.chat.ConfigDialog
+import com.google.ai.edge.gallery.ui.modelmanager.ModelInitializationStatusType
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
@OptIn(ExperimentalMaterial3Api::class)
@Composable
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPicker.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt
similarity index 88%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPicker.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt
index c27f74deb..3e85a63da 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPicker.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -41,14 +41,14 @@ import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.modelitem.StatusIcon
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.modelitem.StatusIcon
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrow
@Composable
fun ModelPicker(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt
index 160d4545a..ea1e2fae9 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/ModelPickerChipsPager.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
@@ -59,11 +59,11 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalWindowInfo
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.modelitem.StatusIcon
-import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.modelitem.StatusIcon
+import com.google.ai.edge.gallery.ui.modelmanager.ModelInitializationStatusType
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlin.math.absoluteValue
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/TaskIcon.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/TaskIcon.kt
similarity index 90%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/TaskIcon.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/TaskIcon.kt
index 02a58541b..0ae662eb6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/TaskIcon.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/TaskIcon.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@@ -41,12 +41,12 @@ import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.data.TASKS
-import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.TASKS
+import com.google.ai.edge.gallery.data.TASK_LLM_CHAT
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
private val SHAPES: List =
listOf(R.drawable.pantegon, R.drawable.double_circle, R.drawable.circle, R.drawable.four_circle)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt
index 50a2d274f..64df7ec9d 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/Utils.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common
+package com.google.ai.edge.gallery.ui.common
import android.Manifest
import android.content.Context
@@ -28,18 +28,18 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASKS
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.data.ValueType
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageBenchmarkResult
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageType
-import com.google.aiedge.gallery.ui.common.chat.ChatViewModel
-import com.google.aiedge.gallery.ui.common.chat.Histogram
-import com.google.aiedge.gallery.ui.common.chat.Stat
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASKS
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.data.ValueType
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageBenchmarkResult
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageType
+import com.google.ai.edge.gallery.ui.common.chat.ChatViewModel
+import com.google.ai.edge.gallery.ui.common.chat.Histogram
+import com.google.ai.edge.gallery.ui.common.chat.Stat
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.theme.customColors
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import java.io.File
@@ -207,7 +207,9 @@ fun Context.createTempPictureUri(
}
return FileProvider.getUriForFile(
- applicationContext, "com.google.aiedge.gallery.provider", tempFile
+ applicationContext,
+ "com.google.aiedge.gallery.provider" /* {applicationId}.provider */,
+ tempFile
)
}
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/BenchmarkConfigDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/BenchmarkConfigDialog.kt
similarity index 88%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/BenchmarkConfigDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/BenchmarkConfigDialog.kt
index 79931ad2f..14ebc6f49 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/BenchmarkConfigDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/BenchmarkConfigDialog.kt
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.NumberSliderConfig
-import com.google.aiedge.gallery.data.ValueType
-import com.google.aiedge.gallery.ui.common.convertValueToTargetType
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.NumberSliderConfig
+import com.google.ai.edge.gallery.data.ValueType
+import com.google.ai.edge.gallery.ui.common.convertValueToTargetType
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
private const val DEFAULT_BENCHMARK_WARM_UP_ITERATIONS = 50f
private const val DEFAULT_BENCHMARK_ITERATIONS = 200f
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatMessage.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatMessage.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt
index 926043524..c33c46247 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatMessage.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.graphics.Bitmap
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.unit.Dp
-import com.google.aiedge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Model
enum class ChatMessageType {
INFO,
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
index 055b75d87..dfe178326 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ExperimentalSharedTransitionApi
@@ -94,18 +94,18 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.data.TaskType
-import com.google.aiedge.gallery.ui.common.ErrorDialog
-import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewChatModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.data.TaskType
+import com.google.ai.edge.gallery.ui.common.ErrorDialog
+import com.google.ai.edge.gallery.ui.modelmanager.ModelInitializationStatusType
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewChatModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
import kotlinx.coroutines.launch
enum class ChatInputType {
@@ -301,8 +301,7 @@ fun ChatPanel(
is ChatMessageConfigValuesChange -> MessageBodyConfigUpdate(message = message)
// Prompt templates.
- is ChatMessagePromptTemplates -> MessageBodyPromptTemplates(
- message = message,
+ is ChatMessagePromptTemplates -> MessageBodyPromptTemplates(message = message,
task = task,
onPromptClicked = { template ->
onSendMessage(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
index c5805729a..d623fd34d 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatView.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
@@ -14,12 +14,11 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.util.Log
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
@@ -28,7 +27,6 @@ import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
@@ -38,23 +36,20 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
-import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.ModelPageAppBar
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.modelmanager.PagerScrollState
-import com.google.aiedge.gallery.ui.preview.PreviewChatModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.ModelPageAppBar
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.modelmanager.PagerScrollState
+import com.google.ai.edge.gallery.ui.preview.PreviewChatModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlin.math.absoluteValue
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt
index b186305f5..285506c09 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.util.Log
import androidx.lifecycle.ViewModel
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.processLlmResponse
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.processLlmResponse
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ConfigDialog.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ConfigDialog.kt
index 9450383e4..34952c562 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ConfigDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ConfigDialog.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.util.Log
import androidx.compose.foundation.border
@@ -64,15 +64,15 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
-import com.google.aiedge.gallery.data.BooleanSwitchConfig
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.LabelConfig
-import com.google.aiedge.gallery.data.NumberSliderConfig
-import com.google.aiedge.gallery.data.SegmentedButtonConfig
-import com.google.aiedge.gallery.data.ValueType
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
+import com.google.ai.edge.gallery.data.BooleanSwitchConfig
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.LabelConfig
+import com.google.ai.edge.gallery.data.NumberSliderConfig
+import com.google.ai.edge.gallery.data.SegmentedButtonConfig
+import com.google.ai.edge.gallery.data.ValueType
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrow
import kotlin.Double.Companion.NaN
private const val TAG = "AGConfigDialog"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/DataCard.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/DataCard.kt
similarity index 88%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/DataCard.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/DataCard.kt
index 57e6c4e70..bf1163faf 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/DataCard.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/DataCard.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -28,11 +28,11 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.bodySmallMediumNarrow
-import com.google.aiedge.gallery.ui.theme.bodySmallMediumNarrowBold
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrowMedium
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.bodySmallMediumNarrow
+import com.google.ai.edge.gallery.ui.theme.bodySmallMediumNarrowBold
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrow
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrowMedium
/**
* Composable function to display a data card with a label and a numeric value.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/LiveCameraDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/LiveCameraDialog.kt
similarity index 99%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/LiveCameraDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/LiveCameraDialog.kt
index 8099e45cb..3d318369b 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/LiveCameraDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/LiveCameraDialog.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.graphics.Bitmap
import android.graphics.Matrix
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MarkdownText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MarkdownText.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt
index 265d93a45..8044c7767 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MarkdownText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ProvideTextStyle
@@ -26,8 +26,8 @@ import androidx.compose.ui.text.TextLinkStyles
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.tooling.preview.Preview
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
import com.halilibo.richtext.commonmark.Markdown
import com.halilibo.richtext.ui.CodeBlockStyle
import com.halilibo.richtext.ui.RichTextStyle
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageActionButton.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageActionButton.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageActionButton.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageActionButton.kt
index 35ab9d700..1bf59fc66 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageActionButton.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageActionButton.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@@ -37,8 +37,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.bodySmallNarrow
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.bodySmallNarrow
/**
* Composable function to display an action button below a chat message.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyBenchmark.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyBenchmark.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyBenchmark.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyBenchmark.kt
index b21fb4c0c..7c8f56860 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyBenchmark.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyBenchmark.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -33,7 +33,7 @@ import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
import kotlin.math.max
private const val DEFAULT_HISTOGRAM_BAR_HEIGHT = 50f
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt
index dc87652d0..b26b2cd5f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyBenchmarkLlm.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -25,7 +25,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display benchmark LLM results within a chat message.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyClassification.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyClassification.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyClassification.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyClassification.kt
index 6508a45ec..52999fc7c 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyClassification.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyClassification.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -36,7 +36,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
val CLASSIFICATION_BAR_HEIGHT = 8.dp
val CLASSIFICATION_BAR_MAX_WIDTH = 200.dp
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyConfigUpdate.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyConfigUpdate.kt
similarity index 90%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyConfigUpdate.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyConfigUpdate.kt
index b05af4104..c51b15d35 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyConfigUpdate.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyConfigUpdate.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -37,13 +37,13 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.ui.common.convertValueToTargetType
-import com.google.aiedge.gallery.ui.common.getConfigValueString
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.bodySmallNarrow
-import com.google.aiedge.gallery.ui.theme.titleSmaller
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.ui.common.convertValueToTargetType
+import com.google.ai.edge.gallery.ui.common.getConfigValueString
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.bodySmallNarrow
+import com.google.ai.edge.gallery.ui.theme.titleSmaller
/**
* Composable function to display a message indicating configuration value changes.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyImage.kt
similarity index 96%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyImage.kt
index e69f24c6e..a4d7d4df6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImage.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyImage.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.height
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImageWithHistory.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyImageWithHistory.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImageWithHistory.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyImageWithHistory.kt
index 9a6c16256..22009431e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyImageWithHistory.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyImageWithHistory.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.Image
import androidx.compose.foundation.gestures.detectHorizontalDragGestures
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyInfo.kt
similarity index 92%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyInfo.kt
index 844dce6ae..1092993b6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyInfo.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyInfo.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -29,8 +29,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
/**
* Composable function to display informational message content within a chat.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyLoading.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyLoading.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyLoading.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyLoading.kt
index 705625fd4..d89fb5574 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyLoading.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyLoading.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.tween
@@ -35,9 +35,9 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.ui.common.getTaskIconColor
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.common.getTaskIconColor
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyPromptTemplates.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyPromptTemplates.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyPromptTemplates.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyPromptTemplates.kt
index 1a81f2bd5..777d6a40c 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyPromptTemplates.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyPromptTemplates.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -43,11 +43,11 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.getTaskIconColor
-import com.google.aiedge.gallery.ui.preview.ALL_PREVIEW_TASKS
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.getTaskIconColor
+import com.google.ai.edge.gallery.ui.preview.ALL_PREVIEW_TASKS
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
private const val CARD_HEIGHT = 100
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyText.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt
index ed4c58fdf..f31797f1e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
@@ -28,7 +28,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display the text content of a ChatMessageText.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyWarning.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyWarning.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyWarning.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyWarning.kt
index b2039c14b..af29e4013 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBodyWarning.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyWarning.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display warning message content within a chat.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBubbleShape.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBubbleShape.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBubbleShape.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBubbleShape.kt
index 26d523cad..85ca175ec 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageBubbleShape.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBubbleShape.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.geometry.RoundRect
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputImage.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputImage.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputImage.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputImage.kt
index 29a95fdb6..8e2a99fe0 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputImage.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputImage.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.Manifest
import android.content.Context
@@ -52,8 +52,8 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
-import com.google.aiedge.gallery.ui.common.createTempPictureUri
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.common.createTempPictureUri
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
private const val TAG = "AGMessageInputImage"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
index 7359457b7..4a1e87ddb 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageInputText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.Manifest
import android.content.Context
@@ -80,11 +80,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.ui.common.createTempPictureUri
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.common.createTempPictureUri
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display a text input field for composing chat messages.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageLatency.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageLatency.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageLatency.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageLatency.kt
index c387a77d2..925376514 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageLatency.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageLatency.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -26,8 +26,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.common.humanReadableDuration
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.common.humanReadableDuration
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display the latency of a chat message, if available.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageSender.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
similarity index 96%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageSender.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
index 3bf410697..46ad5b8d0 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/MessageSender.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import android.graphics.Bitmap
import androidx.annotation.StringRes
@@ -35,10 +35,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.bodySmallNarrow
-import com.google.aiedge.gallery.ui.theme.bodySmallSemiBold
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.bodySmallNarrow
+import com.google.ai.edge.gallery.ui.theme.bodySmallSemiBold
data class MessageLayoutConfig(
val horizontalArrangement: Arrangement.Horizontal,
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt
similarity index 92%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt
index 37777ce11..6105ebd6c 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadStatusInfoPanel.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
@@ -34,11 +34,11 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.DownloadAndTryButton
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.DownloadAndTryButton
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.coroutines.delay
@Composable
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelDownloadingAnimation.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
similarity index 92%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
index 155974c9f..cca917e4a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.Easing
@@ -54,19 +54,19 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.formatToHourMinSecond
-import com.google.aiedge.gallery.ui.common.getTaskIconColor
-import com.google.aiedge.gallery.ui.common.humanReadableSize
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST1
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.formatToHourMinSecond
+import com.google.ai.edge.gallery.ui.common.getTaskIconColor
+import com.google.ai.edge.gallery.ui.common.humanReadableSize
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST1
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrow
import kotlinx.coroutines.delay
import kotlin.math.cos
import kotlin.math.pow
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelInitializationStatus.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelInitializationStatus.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelInitializationStatus.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelInitializationStatus.kt
index b4eaa3462..4b5439f72 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelInitializationStatus.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelInitializationStatus.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -36,8 +36,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display a visual indicator for model initialization status.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelNotDownloaded.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelNotDownloaded.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelNotDownloaded.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelNotDownloaded.kt
index eea3cdf6d..d6e3ad7e2 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelNotDownloaded.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelNotDownloaded.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -25,7 +25,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display a button to download model if the model has not been downloaded.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelSelector.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelSelector.kt
similarity index 89%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelSelector.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelSelector.kt
index 46b059c17..060b4c236 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/ModelSelector.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelSelector.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -33,15 +33,15 @@ import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.convertValueToTargetType
-import com.google.aiedge.gallery.ui.common.modelitem.ModelItem
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.preview.TASK_TEST2
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.convertValueToTargetType
+import com.google.ai.edge.gallery.ui.common.modelitem.ModelItem
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST2
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/**
* Composable function to display a selectable model item with an option to configure its settings.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/TextInputHistorySheet.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/TextInputHistorySheet.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/TextInputHistorySheet.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/TextInputHistorySheet.kt
index 50629f200..c864ff1b4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/chat/TextInputHistorySheet.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/TextInputHistorySheet.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.chat
+package com.google.ai.edge.gallery.ui.common.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@@ -55,9 +55,9 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt
index 7212c5766..c3d05f601 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/AnimatedLayoutModifier.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.modelitem
+package com.google.ai.edge.gallery.ui.common.modelitem
import androidx.compose.animation.core.DeferredTargetAnimation
import androidx.compose.animation.core.ExperimentalAnimatableApi
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt
index 9286131ec..51438965e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ConfirmDeleteModelDialog.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.modelitem
+package com.google.ai.edge.gallery.ui.common.modelitem
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
@@ -22,8 +22,8 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.data.Model
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.Model
/**
* Composable function to display a confirmation dialog for deleting a model.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelItem.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelItem.kt
index 3738be2bf..fe5ed42a6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItem.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelItem.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.modelitem
+package com.google.ai.edge.gallery.ui.common.modelitem
import android.content.Intent
import android.net.Uri
@@ -55,24 +55,24 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.DownloadAndTryButton
-import com.google.aiedge.gallery.ui.common.TaskIcon
-import com.google.aiedge.gallery.ui.common.chat.MarkdownText
-import com.google.aiedge.gallery.ui.common.checkNotificationPermissionAndStartDownload
-import com.google.aiedge.gallery.ui.common.getTaskBgColor
-import com.google.aiedge.gallery.ui.common.getTaskIconColor
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST1
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST2
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST3
-import com.google.aiedge.gallery.ui.preview.MODEL_TEST4
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.preview.TASK_TEST2
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.DownloadAndTryButton
+import com.google.ai.edge.gallery.ui.common.TaskIcon
+import com.google.ai.edge.gallery.ui.common.chat.MarkdownText
+import com.google.ai.edge.gallery.ui.common.checkNotificationPermissionAndStartDownload
+import com.google.ai.edge.gallery.ui.common.getTaskBgColor
+import com.google.ai.edge.gallery.ui.common.getTaskIconColor
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST1
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST2
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST3
+import com.google.ai.edge.gallery.ui.preview.MODEL_TEST4
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST2
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
private val DEFAULT_VERTICAL_PADDING = 16.dp
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelItemActionButton.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelItemActionButton.kt
index d852d8a3d..cf14bd58f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelItemActionButton.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelItemActionButton.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.modelitem
+package com.google.ai.edge.gallery.ui.common.modelitem
import android.content.Context
import androidx.compose.foundation.layout.Row
@@ -35,12 +35,12 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatus
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.getTaskIconColor
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatus
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.getTaskIconColor
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
/**
* Composable function to display action buttons for a model item, based on its download status.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
index 53115bd8e..7735f87c8 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/ModelNameAndStatus.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.modelitem
+package com.google.ai.edge.gallery.ui.common.modelitem
import androidx.compose.animation.AnimatedVisibilityScope
import androidx.compose.animation.ExperimentalSharedTransitionApi
@@ -33,19 +33,18 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.focusModifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatus
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.formatToHourMinSecond
-import com.google.aiedge.gallery.ui.common.getTaskIconColor
-import com.google.aiedge.gallery.ui.common.humanReadableSize
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatus
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.formatToHourMinSecond
+import com.google.ai.edge.gallery.ui.common.getTaskIconColor
+import com.google.ai.edge.gallery.ui.common.humanReadableSize
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrow
/**
* Composable function to display the model name and its download status information.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/StatusIcon.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/StatusIcon.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt
index 9c775a803..2ba284bc0 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/common/modelitem/StatusIcon.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.common.modelitem
+package com.google.ai.edge.gallery.ui.common.modelitem
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -33,10 +33,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.ModelDownloadStatus
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.data.ModelDownloadStatus
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
/**
* Composable function to display an icon representing the download status of a model.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
similarity index 96%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
index 90186d615..62fa540b3 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.home
+package com.google.ai.edge.gallery.ui.home
import android.content.Context
import android.content.Intent
@@ -98,19 +98,19 @@ import androidx.compose.ui.text.withLink
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.GalleryTopAppBar
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.data.AppBarAction
-import com.google.aiedge.gallery.data.AppBarActionType
-import com.google.aiedge.gallery.data.ImportedModelInfo
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.TaskIcon
-import com.google.aiedge.gallery.ui.common.getTaskBgColor
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
-import com.google.aiedge.gallery.ui.theme.titleMediumNarrow
+import com.google.ai.edge.gallery.GalleryTopAppBar
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.AppBarAction
+import com.google.ai.edge.gallery.data.AppBarActionType
+import com.google.ai.edge.gallery.data.ImportedModelInfo
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.TaskIcon
+import com.google.ai.edge.gallery.ui.common.getTaskBgColor
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.ui.theme.titleMediumNarrow
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/ModelImportDialog.kt
similarity index 92%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/ModelImportDialog.kt
index 7708d19f6..a1fd2632f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/ModelImportDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/ModelImportDialog.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.home
+package com.google.ai.edge.gallery.ui.home
import android.content.Context
import android.net.Uri
@@ -59,23 +59,23 @@ import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
-import com.google.aiedge.gallery.data.Accelerator
-import com.google.aiedge.gallery.data.BooleanSwitchConfig
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.IMPORTS_DIR
-import com.google.aiedge.gallery.data.LabelConfig
-import com.google.aiedge.gallery.data.ImportedModelInfo
-import com.google.aiedge.gallery.data.NumberSliderConfig
-import com.google.aiedge.gallery.data.SegmentedButtonConfig
-import com.google.aiedge.gallery.data.ValueType
-import com.google.aiedge.gallery.ui.common.chat.ConfigEditorsPanel
-import com.google.aiedge.gallery.ui.common.ensureValidFileName
-import com.google.aiedge.gallery.ui.common.humanReadableSize
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_MAX_TOKEN
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_TEMPERATURE
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_TOPK
-import com.google.aiedge.gallery.ui.llmchat.DEFAULT_TOPP
+import com.google.ai.edge.gallery.data.Accelerator
+import com.google.ai.edge.gallery.data.BooleanSwitchConfig
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.IMPORTS_DIR
+import com.google.ai.edge.gallery.data.LabelConfig
+import com.google.ai.edge.gallery.data.ImportedModelInfo
+import com.google.ai.edge.gallery.data.NumberSliderConfig
+import com.google.ai.edge.gallery.data.SegmentedButtonConfig
+import com.google.ai.edge.gallery.data.ValueType
+import com.google.ai.edge.gallery.ui.common.chat.ConfigEditorsPanel
+import com.google.ai.edge.gallery.ui.common.ensureValidFileName
+import com.google.ai.edge.gallery.ui.common.humanReadableSize
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_MAX_TOKEN
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_TEMPERATURE
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_TOPK
+import com.google.ai.edge.gallery.ui.llmchat.DEFAULT_TOPP
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/NewReleaseNotification.kt
similarity index 62%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/NewReleaseNotification.kt
index 05978dc17..b4a61d8b8 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/NewReleaseNotification.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/NewReleaseNotification.kt
@@ -1,4 +1,4 @@
-package com.google.aiedge.gallery.ui.home
+package com.google.ai.edge.gallery.ui.home
import android.util.Log
import androidx.compose.animation.AnimatedVisibility
@@ -14,19 +14,25 @@ import androidx.compose.material.icons.automirrored.rounded.OpenInNew
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.BuildConfig
-import com.google.aiedge.gallery.ui.common.getJsonResponse
-import com.google.aiedge.gallery.ui.modelmanager.ClickableLink
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import com.google.ai.edge.gallery.BuildConfig
+import com.google.ai.edge.gallery.ui.common.getJsonResponse
+import com.google.ai.edge.gallery.ui.modelmanager.ClickableLink
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.serialization.Serializable
import kotlin.math.max
@@ -44,22 +50,43 @@ data class ReleaseInfo(
fun NewReleaseNotification() {
var newReleaseVersion by remember { mutableStateOf("") }
var newReleaseUrl by remember { mutableStateOf("") }
+ val lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current
+ val coroutineScope = rememberCoroutineScope()
- LaunchedEffect(Unit) {
- withContext(Dispatchers.IO) {
- Log.d("AGNewReleaseNotification", "Checking for new release...")
- val info = getJsonResponse("https://api.github.com/repos/$REPO/releases/latest")
- if (info != null) {
- val curRelease = BuildConfig.VERSION_NAME
- val newRelease = info.jsonObj.tag_name
- val isNewer = isNewerRelease(currentRelease = curRelease, newRelease = newRelease)
- Log.d(TAG, "curRelease: $curRelease, newRelease: $newRelease, isNewer: $isNewer")
- if (isNewer) {
- newReleaseVersion = newRelease
- newReleaseUrl = info.jsonObj.html_url
+ DisposableEffect(lifecycleOwner) {
+ // Create a LifecycleEventObserver to listen for specific lifecycle events.
+ val observer = LifecycleEventObserver { _, event ->
+ // Log or perform actions based on the lifecycle event.
+ when (event) {
+ Lifecycle.Event.ON_RESUME -> {
+ coroutineScope.launch {
+ withContext(Dispatchers.IO) {
+ Log.d(TAG, "Checking for new release...")
+ val info =
+ getJsonResponse("https://api.github.com/repos/$REPO/releases/latest")
+ if (info != null) {
+ val curRelease = BuildConfig.VERSION_NAME
+ val newRelease = info.jsonObj.tag_name
+ val isNewer = isNewerRelease(currentRelease = curRelease, newRelease = newRelease)
+ Log.d(TAG, "curRelease: $curRelease, newRelease: $newRelease, isNewer: $isNewer")
+ if (isNewer) {
+ newReleaseVersion = newRelease
+ newReleaseUrl = info.jsonObj.html_url
+ }
+ }
+ }
+ }
}
+
+ else -> {}
}
}
+
+ lifecycleOwner.lifecycle.addObserver(observer)
+
+ onDispose {
+ lifecycleOwner.lifecycle.removeObserver(observer)
+ }
}
AnimatedVisibility(
@@ -97,7 +124,7 @@ fun NewReleaseNotification() {
}
}
-fun isNewerRelease(currentRelease: String, newRelease: String): Boolean {
+private fun isNewerRelease(currentRelease: String, newRelease: String): Boolean {
// Split the version strings into their individual components (e.g., "0.9.0" -> ["0", "9", "0"])
val currentComponents = currentRelease.split('.').map { it.toIntOrNull() ?: 0 }
val newComponents = newRelease.split('.').map { it.toIntOrNull() ?: 0 }
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/SettingsDialog.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/SettingsDialog.kt
index e5becbe3f..c0cae8f8b 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/SettingsDialog.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/SettingsDialog.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.home
+package com.google.ai.edge.gallery.ui.home
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -61,13 +60,13 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
-import com.google.aiedge.gallery.BuildConfig
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.theme.THEME_AUTO
-import com.google.aiedge.gallery.ui.theme.THEME_DARK
-import com.google.aiedge.gallery.ui.theme.THEME_LIGHT
-import com.google.aiedge.gallery.ui.theme.ThemeSettings
-import com.google.aiedge.gallery.ui.theme.labelSmallNarrow
+import com.google.ai.edge.gallery.BuildConfig
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.theme.THEME_AUTO
+import com.google.ai.edge.gallery.ui.theme.THEME_DARK
+import com.google.ai.edge.gallery.ui.theme.THEME_LIGHT
+import com.google.ai.edge.gallery.ui.theme.ThemeSettings
+import com.google.ai.edge.gallery.ui.theme.labelSmallNarrow
import java.time.Instant
import java.time.ZoneId
import java.time.format.DateTimeFormatter
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/icon/Deploy.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/icon/Deploy.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/icon/Deploy.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/icon/Deploy.kt
index 85b391fe0..390861152 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/icon/Deploy.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/icon/Deploy.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.icon
+package com.google.ai.edge.gallery.ui.icon
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationModelHelper.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationModelHelper.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationModelHelper.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationModelHelper.kt
index 0e05b07e8..6d13d5606 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationModelHelper.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.imageclassification
+package com.google.ai.edge.gallery.ui.imageclassification
import android.content.Context
import android.graphics.Bitmap
@@ -23,10 +23,10 @@ import androidx.compose.ui.graphics.Color
import com.google.android.gms.tflite.client.TfLiteInitializationOptions
import com.google.android.gms.tflite.gpu.support.TfLiteGpu
import com.google.android.gms.tflite.java.TfLite
-import com.google.aiedge.gallery.ui.common.chat.Classification
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.ui.common.LatencyProvider
+import com.google.ai.edge.gallery.ui.common.chat.Classification
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.ui.common.LatencyProvider
import org.tensorflow.lite.DataType
import org.tensorflow.lite.InterpreterApi
import org.tensorflow.lite.gpu.GpuDelegateFactory
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationScreen.kt
similarity index 87%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationScreen.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationScreen.kt
index 98290bbd7..0b616d6a6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationScreen.kt
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.imageclassification
+package com.google.ai.edge.gallery.ui.imageclassification
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.aiedge.gallery.ui.ViewModelProvider
-import com.google.aiedge.gallery.ui.common.chat.ChatInputType
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageImage
-import com.google.aiedge.gallery.ui.common.chat.ChatView
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.ViewModelProvider
+import com.google.ai.edge.gallery.ui.common.chat.ChatInputType
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageImage
+import com.google.ai.edge.gallery.ui.common.chat.ChatView
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.serialization.Serializable
/** Navigation destination data */
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationViewModel.kt
similarity index 89%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationViewModel.kt
index 769f549ef..e00839d57 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imageclassification/ImageClassificationViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imageclassification/ImageClassificationViewModel.kt
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.imageclassification
+package com.google.ai.edge.gallery.ui.imageclassification
import android.content.Context
import android.graphics.Bitmap
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewModelScope
-import com.google.aiedge.gallery.ui.common.chat.ChatMessage
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageClassification
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageImage
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageType
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_IMAGE_CLASSIFICATION
-import com.google.aiedge.gallery.ui.common.chat.ChatViewModel
-import com.google.aiedge.gallery.ui.common.runBasicBenchmark
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessage
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageClassification
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageImage
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageType
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_IMAGE_CLASSIFICATION
+import com.google.ai.edge.gallery.ui.common.chat.ChatViewModel
+import com.google.ai.edge.gallery.ui.common.runBasicBenchmark
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt
similarity index 89%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt
index 019930c8e..f8284bbc6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationModelHelper.kt
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.imagegeneration
+package com.google.ai.edge.gallery.ui.imagegeneration
import android.content.Context
import android.graphics.Bitmap
import android.util.Log
import com.google.mediapipe.framework.image.BitmapExtractor
import com.google.mediapipe.tasks.vision.imagegenerator.ImageGenerator
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.ui.common.LatencyProvider
-import com.google.aiedge.gallery.ui.common.cleanUpMediapipeTaskErrorMessage
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.ui.common.LatencyProvider
+import com.google.ai.edge.gallery.ui.common.cleanUpMediapipeTaskErrorMessage
import kotlin.random.Random
private const val TAG = "AGImageGenerationModelHelper"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationScreen.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationScreen.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationScreen.kt
index ffa02274d..704867a63 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationScreen.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.imagegeneration
+package com.google.ai.edge.gallery.ui.imagegeneration
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.aiedge.gallery.ui.ViewModelProvider
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageText
-import com.google.aiedge.gallery.ui.common.chat.ChatView
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.ViewModelProvider
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageText
+import com.google.ai.edge.gallery.ui.common.chat.ChatView
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.serialization.Serializable
/** Navigation destination data */
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationViewModel.kt
similarity index 82%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationViewModel.kt
index 1715dc463..efa431211 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/imagegeneration/ImageGenerationViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/imagegeneration/ImageGenerationViewModel.kt
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.imagegeneration
+package com.google.ai.edge.gallery.ui.imagegeneration
import android.graphics.Bitmap
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap
import androidx.lifecycle.viewModelScope
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_IMAGE_GENERATION
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageImageWithHistory
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageLoading
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageType
-import com.google.aiedge.gallery.ui.common.chat.ChatSide
-import com.google.aiedge.gallery.ui.common.chat.ChatViewModel
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_IMAGE_GENERATION
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageImageWithHistory
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageLoading
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageType
+import com.google.ai.edge.gallery.ui.common.chat.ChatSide
+import com.google.ai.edge.gallery.ui.common.chat.ChatViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt
index 0d9c06f10..7fd130805 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmchat
+package com.google.ai.edge.gallery.ui.llmchat
-import com.google.aiedge.gallery.data.Accelerator
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.NumberSliderConfig
-import com.google.aiedge.gallery.data.SegmentedButtonConfig
-import com.google.aiedge.gallery.data.ValueType
+import com.google.ai.edge.gallery.data.Accelerator
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.NumberSliderConfig
+import com.google.ai.edge.gallery.data.SegmentedButtonConfig
+import com.google.ai.edge.gallery.data.ValueType
const val DEFAULT_MAX_TOKEN = 1024
const val DEFAULT_TOPK = 40
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt
similarity index 95%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt
index aa2fb7889..2e9062b70 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmchat
+package com.google.ai.edge.gallery.ui.llmchat
import android.content.Context
import android.graphics.Bitmap
import android.util.Log
-import com.google.aiedge.gallery.data.Accelerator
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.ui.common.cleanUpMediapipeTaskErrorMessage
+import com.google.ai.edge.gallery.data.Accelerator
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.ui.common.cleanUpMediapipeTaskErrorMessage
import com.google.mediapipe.framework.image.BitmapImageBuilder
import com.google.mediapipe.tasks.genai.llminference.GraphOptions
import com.google.mediapipe.tasks.genai.llminference.LlmInference
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatScreen.kt
similarity index 91%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatScreen.kt
index 2080ad72f..6cebc5320 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatScreen.kt
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmchat
+package com.google.ai.edge.gallery.ui.llmchat
import android.graphics.Bitmap
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.aiedge.gallery.ui.ViewModelProvider
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageImage
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageText
-import com.google.aiedge.gallery.ui.common.chat.ChatView
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.ViewModelProvider
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageImage
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageText
+import com.google.ai.edge.gallery.ui.common.chat.ChatView
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.serialization.Serializable
/** Navigation destination data */
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt
similarity index 89%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt
index 91d6892a6..9eff00aa9 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt
@@ -14,25 +14,25 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmchat
+package com.google.ai.edge.gallery.ui.llmchat
import android.content.Context
import android.graphics.Bitmap
import android.util.Log
import androidx.lifecycle.viewModelScope
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.TASK_LLM_ASK_IMAGE
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageBenchmarkLlmResult
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageLoading
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageText
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageType
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageWarning
-import com.google.aiedge.gallery.ui.common.chat.ChatSide
-import com.google.aiedge.gallery.ui.common.chat.ChatViewModel
-import com.google.aiedge.gallery.ui.common.chat.Stat
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_LLM_CHAT
+import com.google.ai.edge.gallery.data.TASK_LLM_ASK_IMAGE
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageBenchmarkLlmResult
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageLoading
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageText
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageType
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageWarning
+import com.google.ai.edge.gallery.ui.common.chat.ChatSide
+import com.google.ai.edge.gallery.ui.common.chat.ChatViewModel
+import com.google.ai.edge.gallery.ui.common.chat.Stat
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
similarity index 90%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
index 99bf31299..94d1c6619 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnScreen.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import android.util.Log
import androidx.activity.compose.BackHandler
@@ -41,17 +41,17 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.tooling.preview.Preview
import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.ui.ViewModelProvider
-import com.google.aiedge.gallery.ui.common.ErrorDialog
-import com.google.aiedge.gallery.ui.common.ModelPageAppBar
-import com.google.aiedge.gallery.ui.common.chat.ModelDownloadStatusInfoPanel
-import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewLlmSingleTurnViewModel
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.ui.ViewModelProvider
+import com.google.ai.edge.gallery.ui.common.ErrorDialog
+import com.google.ai.edge.gallery.ui.common.ModelPageAppBar
+import com.google.ai.edge.gallery.ui.common.chat.ModelDownloadStatusInfoPanel
+import com.google.ai.edge.gallery.ui.modelmanager.ModelInitializationStatusType
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewLlmSingleTurnViewModel
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.serialization.Serializable
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
index 75e4d1346..64ce612c4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageBenchmarkLlmResult
-import com.google.aiedge.gallery.ui.common.chat.Stat
-import com.google.aiedge.gallery.ui.common.processLlmResponse
-import com.google.aiedge.gallery.ui.llmchat.LlmChatModelHelper
-import com.google.aiedge.gallery.ui.llmchat.LlmModelInstance
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_LLM_PROMPT_LAB
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageBenchmarkLlmResult
+import com.google.ai.edge.gallery.ui.common.chat.Stat
+import com.google.ai.edge.gallery.ui.common.processLlmResponse
+import com.google.ai.edge.gallery.ui.llmchat.LlmChatModelHelper
+import com.google.ai.edge.gallery.ui.llmchat.LlmModelInstance
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt
similarity index 99%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt
index efc9d60f8..3b4e815c1 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplateConfigs.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.AnnotatedString
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
index ce55efd23..fd02b6499 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
@@ -85,12 +85,12 @@ import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.text.TextLayoutResult
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.ui.common.chat.MessageBubbleShape
-import com.google.aiedge.gallery.ui.modelmanager.ModelInitializationStatusType
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.ui.common.chat.MessageBubbleShape
+import com.google.ai.edge.gallery.ui.modelmanager.ModelInitializationStatusType
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.theme.customColors
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt
index d458f42de..43ece196e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/ResponsePanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import android.util.Log
import androidx.compose.foundation.layout.Arrangement
@@ -56,13 +56,13 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
-import com.google.aiedge.gallery.ui.common.chat.MarkdownText
-import com.google.aiedge.gallery.ui.common.chat.MessageBodyBenchmarkLlm
-import com.google.aiedge.gallery.ui.common.chat.MessageBodyLoading
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.modelmanager.PagerScrollState
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_LLM_PROMPT_LAB
+import com.google.ai.edge.gallery.ui.common.chat.MarkdownText
+import com.google.ai.edge.gallery.ui.common.chat.MessageBodyBenchmarkLlm
+import com.google.ai.edge.gallery.ui.common.chat.MessageBodyLoading
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.modelmanager.PagerScrollState
private val OPTIONS = listOf("Response", "Benchmark")
private val ICONS = listOf(Icons.Outlined.AutoAwesome, Icons.Outlined.Timer)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/SingleSelectButton.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/SingleSelectButton.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/SingleSelectButton.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/SingleSelectButton.kt
index b6650008f..76d3747cf 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/SingleSelectButton.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/SingleSelectButton.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/VerticalSplitView.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/VerticalSplitView.kt
similarity index 96%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/VerticalSplitView.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/VerticalSplitView.kt
index 13c732198..c91bcb5c4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/VerticalSplitView.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/VerticalSplitView.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.llmsingleturn
+package com.google.ai.edge.gallery.ui.llmsingleturn
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.detectDragGestures
@@ -42,8 +42,8 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
@Composable
fun VerticalSplitView(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
similarity index 93%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
index d7657c7d0..8d2a3682e 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelList.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.modelmanager
+package com.google.ai.edge.gallery.ui.modelmanager
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -49,13 +49,13 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.common.modelitem.ModelItem
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
-import com.google.aiedge.gallery.ui.theme.customColors
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.common.modelitem.ModelItem
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.ui.theme.customColors
private const val TAG = "AGModelList"
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManager.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManager.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManager.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManager.kt
index 49994e8be..f6eb4f0bf 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManager.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManager.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.modelmanager
+package com.google.ai.edge.gallery.ui.modelmanager
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.fillMaxSize
@@ -28,14 +28,14 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
-import com.google.aiedge.gallery.GalleryTopAppBar
-import com.google.aiedge.gallery.data.AppBarAction
-import com.google.aiedge.gallery.data.AppBarActionType
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.ui.preview.PreviewModelManagerViewModel
-import com.google.aiedge.gallery.ui.preview.TASK_TEST1
-import com.google.aiedge.gallery.ui.theme.GalleryTheme
+import com.google.ai.edge.gallery.GalleryTopAppBar
+import com.google.ai.edge.gallery.data.AppBarAction
+import com.google.ai.edge.gallery.data.AppBarActionType
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
+import com.google.ai.edge.gallery.ui.preview.TASK_TEST1
+import com.google.ai.edge.gallery.ui.theme.GalleryTheme
/** A screen to manage models. */
@OptIn(ExperimentalMaterial3Api::class)
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt
index 5414c6b55..2abad3c29 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/modelmanager/ModelManagerViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.modelmanager
+package com.google.ai.edge.gallery.ui.modelmanager
import android.content.Context
import android.net.Uri
@@ -22,37 +22,37 @@ import android.util.Log
import androidx.activity.result.ActivityResult
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import com.google.aiedge.gallery.data.AGWorkInfo
-import com.google.aiedge.gallery.data.Accelerator
-import com.google.aiedge.gallery.data.AccessTokenData
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.DataStoreRepository
-import com.google.aiedge.gallery.data.DownloadRepository
-import com.google.aiedge.gallery.data.EMPTY_MODEL
-import com.google.aiedge.gallery.data.IMPORTS_DIR
-import com.google.aiedge.gallery.data.ImportedModelInfo
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelAllowlist
-import com.google.aiedge.gallery.data.ModelDownloadStatus
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.data.TASKS
-import com.google.aiedge.gallery.data.TASK_LLM_ASK_IMAGE
-import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.data.TaskType
-import com.google.aiedge.gallery.data.ValueType
-import com.google.aiedge.gallery.data.getModelByName
-import com.google.aiedge.gallery.ui.common.AuthConfig
-import com.google.aiedge.gallery.ui.common.convertValueToTargetType
-import com.google.aiedge.gallery.ui.common.getJsonResponse
-import com.google.aiedge.gallery.ui.common.processTasks
-import com.google.aiedge.gallery.ui.imageclassification.ImageClassificationModelHelper
-import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationModelHelper
-import com.google.aiedge.gallery.ui.llmchat.LlmChatModelHelper
-import com.google.aiedge.gallery.ui.llmchat.createLlmChatConfigs
-import com.google.aiedge.gallery.ui.textclassification.TextClassificationModelHelper
+import com.google.ai.edge.gallery.data.AGWorkInfo
+import com.google.ai.edge.gallery.data.Accelerator
+import com.google.ai.edge.gallery.data.AccessTokenData
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.DataStoreRepository
+import com.google.ai.edge.gallery.data.DownloadRepository
+import com.google.ai.edge.gallery.data.EMPTY_MODEL
+import com.google.ai.edge.gallery.data.IMPORTS_DIR
+import com.google.ai.edge.gallery.data.ImportedModelInfo
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelAllowlist
+import com.google.ai.edge.gallery.data.ModelDownloadStatus
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.data.TASKS
+import com.google.ai.edge.gallery.data.TASK_LLM_ASK_IMAGE
+import com.google.ai.edge.gallery.data.TASK_LLM_CHAT
+import com.google.ai.edge.gallery.data.TASK_LLM_PROMPT_LAB
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.data.TaskType
+import com.google.ai.edge.gallery.data.ValueType
+import com.google.ai.edge.gallery.data.getModelByName
+import com.google.ai.edge.gallery.ui.common.AuthConfig
+import com.google.ai.edge.gallery.ui.common.convertValueToTargetType
+import com.google.ai.edge.gallery.ui.common.getJsonResponse
+import com.google.ai.edge.gallery.ui.common.processTasks
+import com.google.ai.edge.gallery.ui.imageclassification.ImageClassificationModelHelper
+import com.google.ai.edge.gallery.ui.imagegeneration.ImageGenerationModelHelper
+import com.google.ai.edge.gallery.ui.llmchat.LlmChatModelHelper
+import com.google.ai.edge.gallery.ui.llmchat.createLlmChatConfigs
+import com.google.ai.edge.gallery.ui.textclassification.TextClassificationModelHelper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/navigation/GalleryNavGraph.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/navigation/GalleryNavGraph.kt
index 2486aba7f..fa5886865 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/navigation/GalleryNavGraph.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/navigation/GalleryNavGraph.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.navigation
+package com.google.ai.edge.gallery.ui.navigation
import android.util.Log
import androidx.compose.animation.AnimatedContentTransitionScope
@@ -42,32 +42,32 @@ import androidx.navigation.NavType
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.navArgument
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_IMAGE_CLASSIFICATION
-import com.google.aiedge.gallery.data.TASK_IMAGE_GENERATION
-import com.google.aiedge.gallery.data.TASK_LLM_CHAT
-import com.google.aiedge.gallery.data.TASK_LLM_ASK_IMAGE
-import com.google.aiedge.gallery.data.TASK_LLM_PROMPT_LAB
-import com.google.aiedge.gallery.data.TASK_TEXT_CLASSIFICATION
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.data.TaskType
-import com.google.aiedge.gallery.data.getModelByName
-import com.google.aiedge.gallery.ui.ViewModelProvider
-import com.google.aiedge.gallery.ui.home.HomeScreen
-import com.google.aiedge.gallery.ui.imageclassification.ImageClassificationDestination
-import com.google.aiedge.gallery.ui.imageclassification.ImageClassificationScreen
-import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationDestination
-import com.google.aiedge.gallery.ui.imagegeneration.ImageGenerationScreen
-import com.google.aiedge.gallery.ui.llmchat.LlmChatDestination
-import com.google.aiedge.gallery.ui.llmchat.LlmChatScreen
-import com.google.aiedge.gallery.ui.llmchat.LlmAskImageDestination
-import com.google.aiedge.gallery.ui.llmchat.LlmAskImageScreen
-import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnDestination
-import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnScreen
-import com.google.aiedge.gallery.ui.modelmanager.ModelManager
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
-import com.google.aiedge.gallery.ui.textclassification.TextClassificationDestination
-import com.google.aiedge.gallery.ui.textclassification.TextClassificationScreen
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_IMAGE_CLASSIFICATION
+import com.google.ai.edge.gallery.data.TASK_IMAGE_GENERATION
+import com.google.ai.edge.gallery.data.TASK_LLM_CHAT
+import com.google.ai.edge.gallery.data.TASK_LLM_ASK_IMAGE
+import com.google.ai.edge.gallery.data.TASK_LLM_PROMPT_LAB
+import com.google.ai.edge.gallery.data.TASK_TEXT_CLASSIFICATION
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.data.TaskType
+import com.google.ai.edge.gallery.data.getModelByName
+import com.google.ai.edge.gallery.ui.ViewModelProvider
+import com.google.ai.edge.gallery.ui.home.HomeScreen
+import com.google.ai.edge.gallery.ui.imageclassification.ImageClassificationDestination
+import com.google.ai.edge.gallery.ui.imageclassification.ImageClassificationScreen
+import com.google.ai.edge.gallery.ui.imagegeneration.ImageGenerationDestination
+import com.google.ai.edge.gallery.ui.imagegeneration.ImageGenerationScreen
+import com.google.ai.edge.gallery.ui.llmchat.LlmChatDestination
+import com.google.ai.edge.gallery.ui.llmchat.LlmChatScreen
+import com.google.ai.edge.gallery.ui.llmchat.LlmAskImageDestination
+import com.google.ai.edge.gallery.ui.llmchat.LlmAskImageScreen
+import com.google.ai.edge.gallery.ui.llmsingleturn.LlmSingleTurnDestination
+import com.google.ai.edge.gallery.ui.llmsingleturn.LlmSingleTurnScreen
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManager
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.textclassification.TextClassificationDestination
+import com.google.ai.edge.gallery.ui.textclassification.TextClassificationScreen
private const val TAG = "AGGalleryNavGraph"
private const val ROUTE_PLACEHOLDER = "placeholder"
@@ -267,7 +267,7 @@ fun GalleryNavHost(
if (data != null) {
intent.data = null
Log.d(TAG, "navigation link clicked: $data")
- if (data.toString().startsWith("com.google.aiedge.gallery://model/")) {
+ if (data.toString().startsWith("com.google.ai.edge.gallery://model/")) {
val modelName = data.pathSegments.last()
getModelByName(modelName)?.let { model ->
// TODO(jingjin): need to show a list of possible tasks for this model.
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewChatModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewChatModel.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewChatModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewChatModel.kt
index cdc6ec74e..6db68e72a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewChatModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewChatModel.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.preview
+package com.google.ai.edge.gallery.ui.preview
import android.content.Context
import android.graphics.Bitmap
@@ -23,13 +23,13 @@ import android.graphics.drawable.Drawable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.asImageBitmap
import androidx.core.content.ContextCompat
-import com.google.aiedge.gallery.R
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageClassification
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageImage
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageText
-import com.google.aiedge.gallery.ui.common.chat.ChatSide
-import com.google.aiedge.gallery.ui.common.chat.ChatViewModel
-import com.google.aiedge.gallery.ui.common.chat.Classification
+import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageClassification
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageImage
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageText
+import com.google.ai.edge.gallery.ui.common.chat.ChatSide
+import com.google.ai.edge.gallery.ui.common.chat.ChatViewModel
+import com.google.ai.edge.gallery.ui.common.chat.Classification
class PreviewChatModel(context: Context) : ChatViewModel(task = TASK_TEST1) {
init {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewDataStoreRepository.kt
similarity index 85%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewDataStoreRepository.kt
index b756c8e84..8a5455a9c 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDataStoreRepository.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewDataStoreRepository.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.preview
+package com.google.ai.edge.gallery.ui.preview
-import com.google.aiedge.gallery.data.AccessTokenData
-import com.google.aiedge.gallery.data.DataStoreRepository
-import com.google.aiedge.gallery.data.ImportedModelInfo
+import com.google.ai.edge.gallery.data.AccessTokenData
+import com.google.ai.edge.gallery.data.DataStoreRepository
+import com.google.ai.edge.gallery.data.ImportedModelInfo
class PreviewDataStoreRepository : DataStoreRepository {
override fun saveTextInputHistory(history: List) {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDownloadRepository.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewDownloadRepository.kt
similarity index 82%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDownloadRepository.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewDownloadRepository.kt
index a37fe2080..072ab98d4 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewDownloadRepository.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewDownloadRepository.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.preview
+package com.google.ai.edge.gallery.ui.preview
-import com.google.aiedge.gallery.data.AGWorkInfo
-import com.google.aiedge.gallery.data.DownloadRepository
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.ModelDownloadStatus
+import com.google.ai.edge.gallery.data.AGWorkInfo
+import com.google.ai.edge.gallery.data.DownloadRepository
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.ModelDownloadStatus
import java.util.UUID
class PreviewDownloadRepository : DownloadRepository {
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt
index 792c11647..d3a7e5755 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewLlmSingleTurnViewModel.kt
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.preview
+package com.google.ai.edge.gallery.ui.preview
-import com.google.aiedge.gallery.ui.llmsingleturn.LlmSingleTurnViewModel
+import com.google.ai.edge.gallery.ui.llmsingleturn.LlmSingleTurnViewModel
class PreviewLlmSingleTurnViewModel : LlmSingleTurnViewModel(task = TASK_TEST1)
\ No newline at end of file
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewModelManagerViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewModelManagerViewModel.kt
similarity index 86%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewModelManagerViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewModelManagerViewModel.kt
index f87438100..63da5294f 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewModelManagerViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewModelManagerViewModel.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.preview
+package com.google.ai.edge.gallery.ui.preview
import android.content.Context
-import com.google.aiedge.gallery.data.ModelDownloadStatus
-import com.google.aiedge.gallery.data.ModelDownloadStatusType
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerUiState
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.data.ModelDownloadStatus
+import com.google.ai.edge.gallery.data.ModelDownloadStatusType
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerUiState
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.coroutines.flow.update
class PreviewModelManagerViewModel(context: Context) :
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewTasks.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewTasks.kt
similarity index 82%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewTasks.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewTasks.kt
index 80e6010fc..6555d7ed1 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/preview/PreviewTasks.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/preview/PreviewTasks.kt
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.preview
+package com.google.ai.edge.gallery.ui.preview
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.AccountBox
import androidx.compose.material.icons.rounded.AutoAwesome
-import com.google.aiedge.gallery.data.BooleanSwitchConfig
-import com.google.aiedge.gallery.data.Config
-import com.google.aiedge.gallery.data.ConfigKey
-import com.google.aiedge.gallery.data.LabelConfig
-import com.google.aiedge.gallery.data.SegmentedButtonConfig
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.NumberSliderConfig
-import com.google.aiedge.gallery.data.Task
-import com.google.aiedge.gallery.data.TaskType
-import com.google.aiedge.gallery.data.ValueType
+import com.google.ai.edge.gallery.data.BooleanSwitchConfig
+import com.google.ai.edge.gallery.data.Config
+import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.LabelConfig
+import com.google.ai.edge.gallery.data.SegmentedButtonConfig
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.NumberSliderConfig
+import com.google.ai.edge.gallery.data.Task
+import com.google.ai.edge.gallery.data.TaskType
+import com.google.ai.edge.gallery.data.ValueType
val TEST_CONFIGS1: List = listOf(
LabelConfig(
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationModelHelper.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationModelHelper.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationModelHelper.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationModelHelper.kt
index 3a3ab0125..358d734b6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationModelHelper.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.textclassification
+package com.google.ai.edge.gallery.ui.textclassification
import android.content.Context
import android.util.Log
import com.google.mediapipe.tasks.components.containers.Category
import com.google.mediapipe.tasks.core.BaseOptions
import com.google.mediapipe.tasks.text.textclassifier.TextClassifier
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.ui.common.LatencyProvider
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.ui.common.LatencyProvider
import java.io.File
import java.io.FileInputStream
import java.nio.ByteBuffer
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationScreen.kt
similarity index 87%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationScreen.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationScreen.kt
index f31394c6d..38e3a00cb 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationScreen.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.textclassification
+package com.google.ai.edge.gallery.ui.textclassification
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.aiedge.gallery.ui.ViewModelProvider
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageText
-import com.google.aiedge.gallery.ui.common.chat.ChatView
-import com.google.aiedge.gallery.ui.modelmanager.ModelManagerViewModel
+import com.google.ai.edge.gallery.ui.ViewModelProvider
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageText
+import com.google.ai.edge.gallery.ui.common.chat.ChatView
+import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import kotlinx.serialization.Serializable
/** Navigation destination data */
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationViewModel.kt
similarity index 84%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationViewModel.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationViewModel.kt
index 41684bf64..b2326cb35 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/textclassification/TextClassificationViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/textclassification/TextClassificationViewModel.kt
@@ -14,22 +14,22 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.textclassification
+package com.google.ai.edge.gallery.ui.textclassification
import android.util.Log
import androidx.compose.ui.graphics.Color
import androidx.lifecycle.viewModelScope
import com.google.mediapipe.tasks.components.containers.Category
-import com.google.aiedge.gallery.data.Model
-import com.google.aiedge.gallery.data.TASK_TEXT_CLASSIFICATION
-import com.google.aiedge.gallery.ui.common.chat.ChatMessage
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageClassification
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageText
-import com.google.aiedge.gallery.ui.common.chat.ChatMessageType
-import com.google.aiedge.gallery.ui.common.chat.ChatViewModel
-import com.google.aiedge.gallery.ui.common.chat.Classification
-import com.google.aiedge.gallery.ui.common.getDistinctiveColor
-import com.google.aiedge.gallery.ui.common.runBasicBenchmark
+import com.google.ai.edge.gallery.data.Model
+import com.google.ai.edge.gallery.data.TASK_TEXT_CLASSIFICATION
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessage
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageClassification
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageText
+import com.google.ai.edge.gallery.ui.common.chat.ChatMessageType
+import com.google.ai.edge.gallery.ui.common.chat.ChatViewModel
+import com.google.ai.edge.gallery.ui.common.chat.Classification
+import com.google.ai.edge.gallery.ui.common.getDistinctiveColor
+import com.google.ai.edge.gallery.ui.common.runBasicBenchmark
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Color.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Color.kt
similarity index 98%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Color.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Color.kt
index 145e8a586..a9520794a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Color.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Color.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.theme
+package com.google.ai.edge.gallery.ui.theme
import androidx.compose.ui.graphics.Color
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Theme.kt
similarity index 99%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Theme.kt
index 6e9e02be2..5d8cd0e04 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Theme.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Theme.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.theme
+package com.google.ai.edge.gallery.ui.theme
import android.app.Activity
import androidx.compose.foundation.isSystemInDarkTheme
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/ThemeSettings.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/ThemeSettings.kt
similarity index 94%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/ThemeSettings.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/ThemeSettings.kt
index 333ce413e..2978016c1 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/ThemeSettings.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/ThemeSettings.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.theme
+package com.google.ai.edge.gallery.ui.theme
import androidx.compose.runtime.mutableStateOf
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Type.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt
similarity index 97%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Type.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt
index 8630f0515..1fee396b6 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/theme/Type.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.ui.theme
+package com.google.ai.edge.gallery.ui.theme
import androidx.compose.material3.Typography
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
-import com.google.aiedge.gallery.R
+import com.google.ai.edge.gallery.R
val nunitoFontFamily = FontFamily(
Font(R.font.nunito_regular, FontWeight.Normal),
diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/worker/DownloadWorker.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
similarity index 90%
rename from Android/src/app/src/main/java/com/google/aiedge/gallery/worker/DownloadWorker.kt
rename to Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
index 69f73ebd1..377741b0a 100644
--- a/Android/src/app/src/main/java/com/google/aiedge/gallery/worker/DownloadWorker.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
@@ -14,28 +14,28 @@
* limitations under the License.
*/
-package com.google.aiedge.gallery.worker
+package com.google.ai.edge.gallery.worker
import android.content.Context
import android.util.Log
import androidx.work.CoroutineWorker
import androidx.work.Data
import androidx.work.WorkerParameters
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_ACCESS_TOKEN
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_ERROR_MESSAGE
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_FILE_NAME
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_MODEL_DIR
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_RATE
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_RECEIVED_BYTES
-import com.google.aiedge.gallery.data.KEY_MODEL_DOWNLOAD_REMAINING_MS
-import com.google.aiedge.gallery.data.KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES
-import com.google.aiedge.gallery.data.KEY_MODEL_EXTRA_DATA_URLS
-import com.google.aiedge.gallery.data.KEY_MODEL_IS_ZIP
-import com.google.aiedge.gallery.data.KEY_MODEL_START_UNZIPPING
-import com.google.aiedge.gallery.data.KEY_MODEL_TOTAL_BYTES
-import com.google.aiedge.gallery.data.KEY_MODEL_UNZIPPED_DIR
-import com.google.aiedge.gallery.data.KEY_MODEL_URL
-import com.google.aiedge.gallery.data.KEY_MODEL_VERSION
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_ACCESS_TOKEN
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_ERROR_MESSAGE
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_FILE_NAME
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_MODEL_DIR
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_RATE
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_RECEIVED_BYTES
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_REMAINING_MS
+import com.google.ai.edge.gallery.data.KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES
+import com.google.ai.edge.gallery.data.KEY_MODEL_EXTRA_DATA_URLS
+import com.google.ai.edge.gallery.data.KEY_MODEL_IS_ZIP
+import com.google.ai.edge.gallery.data.KEY_MODEL_START_UNZIPPING
+import com.google.ai.edge.gallery.data.KEY_MODEL_TOTAL_BYTES
+import com.google.ai.edge.gallery.data.KEY_MODEL_UNZIPPED_DIR
+import com.google.ai.edge.gallery.data.KEY_MODEL_URL
+import com.google.ai.edge.gallery.data.KEY_MODEL_VERSION
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.io.BufferedInputStream
diff --git a/Android/src/app/src/test/java/com/google/aiedge/gallery/ExampleUnitTest.kt b/Android/src/app/src/test/java/com/google/aiedge/gallery/ExampleUnitTest.kt
deleted file mode 100644
index 1e8d62b39..000000000
--- a/Android/src/app/src/test/java/com/google/aiedge/gallery/ExampleUnitTest.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.aiedge.gallery
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
- @Test
- fun addition_isCorrect() {
- assertEquals(4, 2 + 2)
- }
-}
\ No newline at end of file
From 6785ad881a1761573f9fe65bbf1209248f691d4c Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 17:02:53 -0700
Subject: [PATCH 015/336] Bump version
---
Android/src/app/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 412a1eb3c..c6571f0be 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -31,7 +31,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.4"
+ versionName = "0.9.5"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"
From 0b67ccce1ab901414e8f5f624601ccef70ff635c Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 20:23:05 -0700
Subject: [PATCH 016/336] Fix a download resume bug.
---
Android/src/app/build.gradle.kts | 2 +-
Android/src/app/src/main/AndroidManifest.xml | 8 +++++
.../com/google/ai/edge/gallery/GalleryApp.kt | 2 +-
.../ai/edge/gallery/GalleryApplication.kt | 3 ++
.../google/ai/edge/gallery/GalleryService.kt | 12 +++++++
.../com/google/ai/edge/gallery/data/Consts.kt | 1 +
.../edge/gallery/data/DownloadRepository.kt | 29 ++++++++--------
.../google/ai/edge/gallery/ui/common/Utils.kt | 34 +++++++++++++++++++
.../ai/edge/gallery/worker/DownloadWorker.kt | 14 ++++++--
9 files changed, 86 insertions(+), 19 deletions(-)
create mode 100644 Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryService.kt
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index c6571f0be..98ecf34d9 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -31,7 +31,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.5"
+ versionName = "0.9.6"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"
diff --git a/Android/src/app/src/main/AndroidManifest.xml b/Android/src/app/src/main/AndroidManifest.xml
index 62b91d11c..acd3cb2fa 100644
--- a/Android/src/app/src/main/AndroidManifest.xml
+++ b/Android/src/app/src/main/AndroidManifest.xml
@@ -18,6 +18,8 @@
+
+
@@ -80,6 +82,12 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt
index 53e5ec9ca..19f53a095 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApp.kt
@@ -49,7 +49,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
-import com.google.ai.edge.gallery.R
import com.google.ai.edge.gallery.data.AppBarAction
import com.google.ai.edge.gallery.data.AppBarActionType
import com.google.ai.edge.gallery.ui.navigation.GalleryNavHost
@@ -65,6 +64,7 @@ fun GalleryApp(navController: NavHostController = rememberNavController()) {
/**
* The top app bar.
*/
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun GalleryTopAppBar(
title: String,
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt
index 942bf5efb..d6c02a357 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryApplication.kt
@@ -23,6 +23,7 @@ import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.preferencesDataStore
import com.google.ai.edge.gallery.data.AppContainer
import com.google.ai.edge.gallery.data.DefaultAppContainer
+import com.google.ai.edge.gallery.ui.common.writeLaunchInfo
import com.google.ai.edge.gallery.ui.theme.ThemeSettings
private val Context.dataStore: DataStore by preferencesDataStore(name = "app_gallery_preferences")
@@ -34,6 +35,8 @@ class GalleryApplication : Application() {
override fun onCreate() {
super.onCreate()
+
+ writeLaunchInfo(context = this)
container = DefaultAppContainer(this, dataStore)
// Load theme.
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryService.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryService.kt
new file mode 100644
index 000000000..f24594322
--- /dev/null
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/GalleryService.kt
@@ -0,0 +1,12 @@
+package com.google.ai.edge.gallery
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+// TODO(jingjin): implement foreground service.
+class GalleryService : Service() {
+ override fun onBind(p0: Intent?): IBinder? {
+ return null
+ }
+}
\ No newline at end of file
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
index 75eb4e46b..57a32824b 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
@@ -27,6 +27,7 @@ const val KEY_MODEL_DOWNLOAD_RATE = "KEY_MODEL_DOWNLOAD_RATE"
const val KEY_MODEL_DOWNLOAD_REMAINING_MS = "KEY_MODEL_DOWNLOAD_REMAINING_SECONDS"
const val KEY_MODEL_DOWNLOAD_ERROR_MESSAGE = "KEY_MODEL_DOWNLOAD_ERROR_MESSAGE"
const val KEY_MODEL_DOWNLOAD_ACCESS_TOKEN = "KEY_MODEL_DOWNLOAD_ACCESS_TOKEN"
+const val KEY_MODEL_DOWNLOAD_APP_TS = "KEY_MODEL_DOWNLOAD_APP_TS"
const val KEY_MODEL_EXTRA_DATA_URLS = "KEY_MODEL_EXTRA_DATA_URLS"
const val KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES = "KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES"
const val KEY_MODEL_IS_ZIP = "KEY_MODEL_IS_ZIP"
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
index 131f36d58..8dcd8040f 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
@@ -39,6 +39,7 @@ import androidx.work.WorkManager
import androidx.work.WorkQuery
import com.google.ai.edge.gallery.AppLifecycleProvider
import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.ui.common.readLaunchInfo
import com.google.ai.edge.gallery.worker.DownloadWorker
import com.google.common.util.concurrent.FutureCallback
import com.google.common.util.concurrent.Futures
@@ -85,24 +86,23 @@ class DefaultDownloadRepository(
override fun downloadModel(
model: Model, onStatusUpdated: (model: Model, status: ModelDownloadStatus) -> Unit
) {
+ val appTs = readLaunchInfo(context = context)?.ts ?: 0
+
// Create input data.
val builder = Data.Builder()
val totalBytes = model.totalBytes + model.extraDataFiles.sumOf { it.sizeInBytes }
- val inputDataBuilder = builder.putString(KEY_MODEL_URL, model.url)
- .putString(KEY_MODEL_VERSION, model.version)
- .putString(KEY_MODEL_DOWNLOAD_MODEL_DIR, model.normalizedName)
- .putString(KEY_MODEL_DOWNLOAD_FILE_NAME, model.downloadFileName)
- .putBoolean(KEY_MODEL_IS_ZIP, model.isZip).putString(KEY_MODEL_UNZIPPED_DIR, model.unzipDir)
- .putLong(
- KEY_MODEL_TOTAL_BYTES, totalBytes
- )
+ val inputDataBuilder =
+ builder.putString(KEY_MODEL_URL, model.url).putString(KEY_MODEL_VERSION, model.version)
+ .putString(KEY_MODEL_DOWNLOAD_MODEL_DIR, model.normalizedName)
+ .putString(KEY_MODEL_DOWNLOAD_FILE_NAME, model.downloadFileName)
+ .putBoolean(KEY_MODEL_IS_ZIP, model.isZip).putString(KEY_MODEL_UNZIPPED_DIR, model.unzipDir)
+ .putLong(KEY_MODEL_TOTAL_BYTES, totalBytes).putLong(KEY_MODEL_DOWNLOAD_APP_TS, appTs)
+
if (model.extraDataFiles.isNotEmpty()) {
- inputDataBuilder.putString(
- KEY_MODEL_EXTRA_DATA_URLS, model.extraDataFiles.joinToString(",") { it.url }
- ).putString(
+ inputDataBuilder.putString(KEY_MODEL_EXTRA_DATA_URLS,
+ model.extraDataFiles.joinToString(",") { it.url }).putString(
KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES,
- model.extraDataFiles.joinToString(",") { it.downloadFileName }
- )
+ model.extraDataFiles.joinToString(",") { it.downloadFileName })
}
if (model.accessToken != null) {
inputDataBuilder.putString(KEY_MODEL_DOWNLOAD_ACCESS_TOKEN, model.accessToken)
@@ -281,8 +281,7 @@ class DefaultDownloadRepository(
// Create an Intent to open your app with a deep link.
val intent = Intent(
- Intent.ACTION_VIEW,
- Uri.parse("com.google.ai.edge.gallery://model/${modelName}")
+ Intent.ACTION_VIEW, Uri.parse("com.google.ai.edge.gallery://model/${modelName}")
).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt
index 64df7ec9d..5b72d170d 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/Utils.kt
@@ -40,6 +40,8 @@ import com.google.ai.edge.gallery.ui.common.chat.Histogram
import com.google.ai.edge.gallery.ui.common.chat.Stat
import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.ai.edge.gallery.ui.theme.customColors
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.json.Json
import java.io.File
@@ -52,6 +54,9 @@ import kotlin.math.min
import kotlin.math.pow
import kotlin.math.sqrt
+private const val TAG = "AGUtils"
+private const val LAUNCH_INFO_FILE_NAME = "launch_info"
+
private val STATS = listOf(
Stat(id = "min", label = "Min", unit = "ms"),
Stat(id = "max", label = "Max", unit = "ms"),
@@ -70,6 +75,10 @@ data class JsonObjAndTextContent(
val jsonObj: T, val textContent: String,
)
+data class LaunchInfo(
+ val ts: Long
+)
+
/** Format the bytes into a human-readable format. */
fun Long.humanReadableSize(si: Boolean = true, extraDecimalForGbAndAbove: Boolean = false): String {
val bytes = this
@@ -531,3 +540,28 @@ inline fun getJsonResponse(url: String): JsonObjAndTextContent? {
return null
}
+
+fun writeLaunchInfo(context: Context) {
+ try {
+ val gson = Gson()
+ val launchInfo = LaunchInfo(ts = System.currentTimeMillis())
+ val jsonString = gson.toJson(launchInfo)
+ val file = File(context.getExternalFilesDir(null), LAUNCH_INFO_FILE_NAME)
+ file.writeText(jsonString)
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to write launch info", e)
+ }
+}
+
+fun readLaunchInfo(context: Context): LaunchInfo? {
+ try {
+ val gson = Gson()
+ val type = object : TypeToken() {}.type
+ val file = File(context.getExternalFilesDir(null), LAUNCH_INFO_FILE_NAME)
+ val content = file.readText()
+ return gson.fromJson(content, type)
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to read launch info", e)
+ return null
+ }
+}
\ No newline at end of file
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
index 377741b0a..c29453571 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
@@ -22,6 +22,7 @@ import androidx.work.CoroutineWorker
import androidx.work.Data
import androidx.work.WorkerParameters
import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_ACCESS_TOKEN
+import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_APP_TS
import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_ERROR_MESSAGE
import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_FILE_NAME
import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_MODEL_DIR
@@ -36,6 +37,7 @@ import com.google.ai.edge.gallery.data.KEY_MODEL_TOTAL_BYTES
import com.google.ai.edge.gallery.data.KEY_MODEL_UNZIPPED_DIR
import com.google.ai.edge.gallery.data.KEY_MODEL_URL
import com.google.ai.edge.gallery.data.KEY_MODEL_VERSION
+import com.google.ai.edge.gallery.ui.common.readLaunchInfo
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.io.BufferedInputStream
@@ -60,6 +62,8 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
private val externalFilesDir = context.getExternalFilesDir(null)
override suspend fun doWork(): Result {
+ val appTs = readLaunchInfo(context = applicationContext)?.ts ?: 0
+
val fileUrl = inputData.getString(KEY_MODEL_URL)
val version = inputData.getString(KEY_MODEL_VERSION)!!
val fileName = inputData.getString(KEY_MODEL_DOWNLOAD_FILE_NAME)
@@ -71,6 +75,12 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
inputData.getString(KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES)?.split(",") ?: listOf()
val totalBytes = inputData.getLong(KEY_MODEL_TOTAL_BYTES, 0L)
val accessToken = inputData.getString(KEY_MODEL_DOWNLOAD_ACCESS_TOKEN)
+ val workerAppTs = inputData.getLong(KEY_MODEL_DOWNLOAD_APP_TS, 0L)
+
+ if (workerAppTs > 0 && appTs > 0 && workerAppTs != appTs) {
+ Log.d(TAG, "Worker is from previous launch. Ignoring...")
+ return Result.success()
+ }
return withContext(Dispatchers.IO) {
if (fileUrl == null || fileName == null) {
@@ -172,11 +182,11 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
var bytesPerMs = 0f
if (lastSetProgressTs != 0L) {
if (bytesReadSizeBuffer.size == 5) {
- bytesReadSizeBuffer.removeAt(bytesReadLatencyBuffer.lastIndex)
+ bytesReadSizeBuffer.removeAt(0)
}
bytesReadSizeBuffer.add(deltaBytes)
if (bytesReadLatencyBuffer.size == 5) {
- bytesReadLatencyBuffer.removeAt(bytesReadLatencyBuffer.lastIndex)
+ bytesReadLatencyBuffer.removeAt(0)
}
bytesReadLatencyBuffer.add(curTs - lastSetProgressTs)
deltaBytes = 0L
From eff2c6227625ac082d9c765597fc7011b0113617 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Mon, 19 May 2025 22:59:10 -0700
Subject: [PATCH 017/336] Better image viewer
---
.../edge/gallery/ui/common/chat/ChatPanel.kt | 117 ++----------------
.../edge/gallery/ui/common/chat/ChatView.kt | 80 ++++++++++--
.../gallery/ui/common/chat/ZoomableBox.kt | 71 +++++++++++
3 files changed, 153 insertions(+), 115 deletions(-)
create mode 100644 Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ZoomableBox.kt
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
index dfe178326..b2f8319c3 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
@@ -16,15 +16,10 @@
package com.google.ai.edge.gallery.ui.common.chat
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalSharedTransitionApi
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.Image
+import android.graphics.Bitmap
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.gestures.detectTransformGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -34,7 +29,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@@ -45,13 +39,10 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Timer
-import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.ContentCopy
import androidx.compose.material.icons.rounded.Refresh
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.SnackbarHost
@@ -62,7 +53,6 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -73,16 +63,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
import androidx.compose.ui.input.nestedscroll.NestedScrollSource
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
@@ -92,7 +78,6 @@ import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import com.google.ai.edge.gallery.R
import com.google.ai.edge.gallery.data.Model
@@ -115,7 +100,7 @@ enum class ChatInputType {
/**
* Composable function for the main chat panel, displaying messages and handling user input.
*/
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ChatPanel(
modelManagerViewModel: ModelManagerViewModel,
@@ -130,6 +115,7 @@ fun ChatPanel(
onStreamImageMessage: (Model, ChatMessageImage) -> Unit = { _, _ -> },
onStreamEnd: (Int) -> Unit = {},
onStopButtonClicked: () -> Unit = {},
+ onImageSelected: (Bitmap) -> Unit = {},
chatInputType: ChatInputType = ChatInputType.TEXT,
showStopButtonInInputWhenInProgress: Boolean = false,
) {
@@ -140,7 +126,6 @@ fun ChatPanel(
val snackbarHostState = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
val haptic = LocalHapticFeedback.current
- var selectedImageMessage by remember { mutableStateOf(null) }
val hasImageMessageToLastConfigChange = remember(messages) {
var foundImageMessage = false
for (message in messages.reversed()) {
@@ -278,7 +263,7 @@ fun ChatPanel(
bottom = 6.dp,
),
horizontalAlignment = hAlign,
- ) {
+ ) messageColumn@{
// Sender row.
MessageSender(
message = message,
@@ -316,7 +301,8 @@ fun ChatPanel(
var messageBubbleModifier = Modifier
.clip(
MessageBubbleShape(
- radius = bubbleBorderRadius, hardCornerAtLeftOrRight = hardCornerAtLeftOrRight
+ radius = bubbleBorderRadius,
+ hardCornerAtLeftOrRight = hardCornerAtLeftOrRight
)
)
.background(backgroundColor)
@@ -340,9 +326,12 @@ fun ChatPanel(
// Image
is ChatMessageImage -> {
- MessageBodyImage(message = message, modifier = Modifier.clickable {
- selectedImageMessage = message
- })
+ MessageBodyImage(
+ message = message, modifier = Modifier
+ .clickable {
+ onImageSelected(message.bitmap)
+ }
+ )
}
// Image with history (for image gen)
@@ -534,47 +523,6 @@ fun ChatPanel(
}
}
- // A full-screen image viewer.
- val curSelectedImageMessage = selectedImageMessage
- AnimatedVisibility(
- visible = curSelectedImageMessage != null,
- enter = fadeIn(),
- exit = fadeOut(),
- ) {
- if (curSelectedImageMessage == null) return@AnimatedVisibility
-
- ZoomableBox(
- modifier = Modifier
- .fillMaxSize()
- .background(Color.Black.copy(alpha = 0.9f))
- ) {
- // Image.
- Image(
- bitmap = curSelectedImageMessage.imageBitMap,
- contentDescription = "",
- modifier = modifier
- .fillMaxSize()
- .graphicsLayer(
- scaleX = scale, scaleY = scale, translationX = offsetX, translationY = offsetY
- ),
- contentScale = ContentScale.Fit,
- )
-
- // Close button.
- IconButton(
- onClick = {
- selectedImageMessage = null
- }, colors = IconButtonDefaults.iconButtonColors(
- containerColor = MaterialTheme.colorScheme.surfaceVariant,
- ), modifier = Modifier.offset(x = (-8).dp, y = 8.dp)
- ) {
- Icon(
- Icons.Rounded.Close, contentDescription = "", tint = MaterialTheme.colorScheme.primary
- )
- }
- }
- }
-
// Error dialog.
if (showErrorDialog) {
ErrorDialog(error = modelInitializationStatus?.error ?: "", onDismiss = {
@@ -636,47 +584,6 @@ fun ChatPanel(
}
}
-@Composable
-fun ZoomableBox(
- modifier: Modifier = Modifier,
- minScale: Float = 1f,
- maxScale: Float = 5f,
- content: @Composable ZoomableBoxScope.() -> Unit
-) {
- var scale by remember { mutableFloatStateOf(1f) }
- var offsetX by remember { mutableFloatStateOf(0f) }
- var offsetY by remember { mutableFloatStateOf(0f) }
- var size by remember { mutableStateOf(IntSize.Zero) }
- Box(modifier = modifier
- .clip(RectangleShape)
- .onSizeChanged { size = it }
- .pointerInput(Unit) {
- detectTransformGestures { _, pan, zoom, _ ->
- scale = maxOf(minScale, minOf(scale * zoom, maxScale))
- val maxX = (size.width * (scale - 1)) / 2
- val minX = -maxX
- offsetX = maxOf(minX, minOf(maxX, offsetX + pan.x))
- val maxY = (size.height * (scale - 1)) / 2
- val minY = -maxY
- offsetY = maxOf(minY, minOf(maxY, offsetY + pan.y))
- }
- }, contentAlignment = Alignment.TopEnd
- ) {
- val scope = ZoomableBoxScopeImpl(scale, offsetX, offsetY)
- scope.content()
- }
-}
-
-interface ZoomableBoxScope {
- val scale: Float
- val offsetX: Float
- val offsetY: Float
-}
-
-private data class ZoomableBoxScopeImpl(
- override val scale: Float, override val offsetX: Float, override val offsetY: Float
-) : ZoomableBoxScope
-
@Preview(showBackground = true)
@Composable
fun ChatPanelPreview() {
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
index d623fd34d..71c0d6da5 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
@@ -16,15 +16,28 @@
package com.google.ai.edge.gallery.ui.common.chat
+import android.graphics.Bitmap
import android.util.Log
import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
@@ -37,9 +50,13 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
import com.google.ai.edge.gallery.data.Model
import com.google.ai.edge.gallery.data.ModelDownloadStatusType
import com.google.ai.edge.gallery.data.Task
@@ -84,9 +101,10 @@ fun ChatView(
val uiState by viewModel.uiState.collectAsState()
val modelManagerUiState by modelManagerViewModel.uiState.collectAsState()
val selectedModel = modelManagerUiState.selectedModel
+ var selectedImage by remember { mutableStateOf(null) }
+ var showImageViewer by remember { mutableStateOf(false) }
- val pagerState = rememberPagerState(
- initialPage = task.models.indexOf(selectedModel),
+ val pagerState = rememberPagerState(initialPage = task.models.indexOf(selectedModel),
pageCount = { task.models.size })
val context = LocalContext.current
val scope = rememberCoroutineScope()
@@ -139,8 +157,7 @@ fun ChatView(
LaunchedEffect(pagerState) {
snapshotFlow {
PagerScrollState(
- page = pagerState.currentPage,
- offset = pagerState.currentPageOffsetFraction
+ page = pagerState.currentPage, offset = pagerState.currentPageOffsetFraction
)
}.collect { scrollState ->
modelManagerViewModel.pagerScrollState.value = scrollState
@@ -164,9 +181,7 @@ fun ChatView(
onResetSessionClicked = onResetSessionClicked,
onConfigChanged = { old, new ->
viewModel.addConfigChangedMessage(
- oldConfigValues = old,
- newConfigValues = new,
- model = selectedModel
+ oldConfigValues = old, newConfigValues = new, model = selectedModel
)
},
onBackClicked = {
@@ -197,9 +212,7 @@ fun ChatView(
.background(MaterialTheme.colorScheme.surface)
) {
ModelDownloadStatusInfoPanel(
- model = curSelectedModel,
- task = task,
- modelManagerViewModel = modelManagerViewModel
+ model = curSelectedModel, task = task, modelManagerViewModel = modelManagerViewModel
)
// The main messages panel.
@@ -223,6 +236,10 @@ fun ChatView(
onStopButtonClicked = {
onStopButtonClicked(curSelectedModel)
},
+ onImageSelected = { bitmap ->
+ selectedImage = bitmap
+ showImageViewer = true
+ },
modifier = Modifier
.weight(1f)
.graphicsLayer { alpha = curAlpha },
@@ -232,6 +249,49 @@ fun ChatView(
}
}
}
+
+ // Image viewer.
+ AnimatedVisibility(
+ visible = showImageViewer,
+ enter = slideInVertically(initialOffsetY = { fullHeight -> fullHeight }) + fadeIn(),
+ exit = slideOutVertically(
+ targetOffsetY = { fullHeight -> fullHeight },
+ ) + fadeOut()
+ ) {
+ selectedImage?.let { image ->
+ ZoomableBox(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(top = innerPadding.calculateTopPadding())
+ .background(Color.Black.copy(alpha = 0.95f)),
+ ) {
+ Image(
+ bitmap = image.asImageBitmap(), contentDescription = "",
+ modifier = modifier
+ .fillMaxSize()
+ .graphicsLayer(
+ scaleX = scale, scaleY = scale, translationX = offsetX, translationY = offsetY
+ ),
+ contentScale = ContentScale.Fit,
+ )
+
+ // Close button.
+ IconButton(
+ onClick = {
+ showImageViewer = false
+ }, colors = IconButtonDefaults.iconButtonColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ ), modifier = Modifier.offset(x = (-8).dp, y = 8.dp)
+ ) {
+ Icon(
+ Icons.Rounded.Close,
+ contentDescription = "",
+ tint = MaterialTheme.colorScheme.primary
+ )
+ }
+ }
+ }
+ }
}
}
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ZoomableBox.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ZoomableBox.kt
new file mode 100644
index 000000000..81b2a1ac9
--- /dev/null
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ZoomableBox.kt
@@ -0,0 +1,71 @@
+/*
+ * 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.chat
+
+import androidx.compose.foundation.gestures.detectTransformGestures
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.unit.IntSize
+
+@Composable
+fun ZoomableBox(
+ modifier: Modifier = Modifier,
+ minScale: Float = 1f,
+ maxScale: Float = 5f,
+ content: @Composable ZoomableBoxScope.() -> Unit
+) {
+ var scale by remember { mutableFloatStateOf(1f) }
+ var offsetX by remember { mutableFloatStateOf(0f) }
+ var offsetY by remember { mutableFloatStateOf(0f) }
+ var size by remember { mutableStateOf(IntSize.Zero) }
+ Box(modifier = modifier
+ .onSizeChanged { size = it }
+ .pointerInput(Unit) {
+ detectTransformGestures { _, pan, zoom, _ ->
+ scale = maxOf(minScale, minOf(scale * zoom, maxScale))
+ val maxX = (size.width * (scale - 1)) / 2
+ val minX = -maxX
+ offsetX = maxOf(minX, minOf(maxX, offsetX + pan.x))
+ val maxY = (size.height * (scale - 1)) / 2
+ val minY = -maxY
+ offsetY = maxOf(minY, minOf(maxY, offsetY + pan.y))
+ }
+ }, contentAlignment = Alignment.TopEnd
+ ) {
+ val scope = ZoomableBoxScopeImpl(scale, offsetX, offsetY)
+ scope.content()
+ }
+}
+
+interface ZoomableBoxScope {
+ val scale: Float
+ val offsetX: Float
+ val offsetY: Float
+}
+
+private data class ZoomableBoxScopeImpl(
+ override val scale: Float, override val offsetX: Float, override val offsetY: Float
+) : ZoomableBoxScope
From b8afe01e761420d9755b1c7d7f2d19e8974bbea4 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Tue, 20 May 2025 09:24:47 -0700
Subject: [PATCH 018/336] Bump version
---
Android/src/app/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 98ecf34d9..1d92c85c5 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -31,7 +31,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "0.9.6"
+ versionName = "1.0.0"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"
From e2de386c6cd86e1410d126c42186ff005706010c Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Tue, 20 May 2025 09:32:05 -0700
Subject: [PATCH 019/336] Update model_allowlist.json
---
model_allowlist.json | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/model_allowlist.json b/model_allowlist.json
index 1e8dc0fd2..f70aba256 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -1,5 +1,21 @@
{
"models": [
+ {
+ "name": "Gemma-3n-E2B-it-int4",
+ "modelId": "google/gemma-3n-E2B-it-litert-preview",
+ "modelFile": "gemma-3n-E2B-it-int4.task",
+ "description": "Preview version of [Gemma 3n E2B](https://ai.google.dev/gemma/docs/gemma-3n) ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference). The current checkpoint only supports text and vision input.",
+ "sizeInBytes": 3136226711,
+ "version": "20250520",
+ "llmSupportImage": true,
+ "defaultConfig": {
+ "topK": 64,
+ "topP": 0.95,
+ "temperature": 1.0,
+ "accelerators": "cpu"
+ },
+ "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_ask_image"]
+ },
{
"name": "Gemma3-1B-IT q4",
"modelId": "litert-community/Gemma3-1B-IT",
From 513f9f92e13262c2a5feb20e96cb7eaf28b81b23 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Tue, 20 May 2025 09:54:03 -0700
Subject: [PATCH 020/336] Update README.md
---
README.md | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/README.md b/README.md
index 641dd69f1..2c58b3fb7 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,23 @@
The Google AI Edge Gallery is an experimental app that puts the power of cutting-edge Generative AI models directly into your hands, running entirely on your Android *(available now)* and iOS *(coming soon)* devices. Dive into a world of creative and practical AI use cases, all running locally, without needing an internet connection once the model is loaded. Experiment with different models, chat, ask questions with images, explore prompts, and more!
+**Overview**
+
+
+**Ask Image**
+
+
+**Prompt Lab**
+
+
+**AI Chat**
+
+
## ✨ Core Features
* **📱 Run Locally, Fully Offline:** Experience the magic of GenAI without an internet connection. All processing happens directly on your device.
* **🤖 Choose Your Model:** Easily switch between different models from Hugging Face and compare their performance.
+* **🖼️ Ask Image:** Upload an image and ask questions about it. Get descriptions, solve problems, or identify objects.
* **✍️ Prompt Lab:** Summarize, rewrite, generate code, or use freeform prompts to explore single-turn LLM use cases.
* **💬 AI Chat:** Engage in multi-turn conversations.
* **📊 Performance Insights:** Real-time benchmarks (TTFT, decode speed, latency).
From ec463c78975952a5e8dc8de261332553a3ebb121 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Wed, 21 May 2025 09:33:14 -0700
Subject: [PATCH 021/336] Update model_allowlist.json
---
model_allowlist.json | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/model_allowlist.json b/model_allowlist.json
index f70aba256..8fbc7ce34 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -12,7 +12,23 @@
"topK": 64,
"topP": 0.95,
"temperature": 1.0,
- "accelerators": "cpu"
+ "accelerators": "cpu,gpu"
+ },
+ "taskTypes": ["llm_chat", "llm_prompt_lab", "llm_ask_image"]
+ },
+ {
+ "name": "Gemma-3n-E4B-it-int4",
+ "modelId": "google/gemma-3n-E4B-it-litert-preview",
+ "modelFile": "gemma-3n-E4B-it-int4.task",
+ "description": "Preview version of [Gemma 3n E4B](https://ai.google.dev/gemma/docs/gemma-3n) ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference). The current checkpoint only supports text and vision input.",
+ "sizeInBytes": 4405655031,
+ "version": "20250520",
+ "llmSupportImage": true,
+ "defaultConfig": {
+ "topK": 64,
+ "topP": 0.95,
+ "temperature": 1.0,
+ "accelerators": "cpu,gpu"
},
"taskTypes": ["llm_chat", "llm_prompt_lab", "llm_ask_image"]
},
From 965d5705f027229be0e4859880e4041b4414d3a8 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Wed, 21 May 2025 09:43:37 -0700
Subject: [PATCH 022/336] Update model_allowlist.json
---
model_allowlist.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/model_allowlist.json b/model_allowlist.json
index 8fbc7ce34..380e92257 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -12,6 +12,7 @@
"topK": 64,
"topP": 0.95,
"temperature": 1.0,
+ "maxTokens": 4096,
"accelerators": "cpu,gpu"
},
"taskTypes": ["llm_chat", "llm_prompt_lab", "llm_ask_image"]
@@ -28,6 +29,7 @@
"topK": 64,
"topP": 0.95,
"temperature": 1.0,
+ "maxTokens": 4096,
"accelerators": "cpu,gpu"
},
"taskTypes": ["llm_chat", "llm_prompt_lab", "llm_ask_image"]
From d6d40b16f7b71d8056aaa15070bf339e0dbf1230 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Wed, 21 May 2025 11:15:21 -0700
Subject: [PATCH 023/336] Update model_allowlist.json
---
model_allowlist.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/model_allowlist.json b/model_allowlist.json
index 380e92257..6c21c0249 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -4,7 +4,7 @@
"name": "Gemma-3n-E2B-it-int4",
"modelId": "google/gemma-3n-E2B-it-litert-preview",
"modelFile": "gemma-3n-E2B-it-int4.task",
- "description": "Preview version of [Gemma 3n E2B](https://ai.google.dev/gemma/docs/gemma-3n) ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference). The current checkpoint only supports text and vision input.",
+ "description": "Preview version of [Gemma 3n E2B](https://ai.google.dev/gemma/docs/gemma-3n) ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference). The current checkpoint only supports text and vision input, with 4096 context length.",
"sizeInBytes": 3136226711,
"version": "20250520",
"llmSupportImage": true,
@@ -21,7 +21,7 @@
"name": "Gemma-3n-E4B-it-int4",
"modelId": "google/gemma-3n-E4B-it-litert-preview",
"modelFile": "gemma-3n-E4B-it-int4.task",
- "description": "Preview version of [Gemma 3n E4B](https://ai.google.dev/gemma/docs/gemma-3n) ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference). The current checkpoint only supports text and vision input.",
+ "description": "Preview version of [Gemma 3n E4B](https://ai.google.dev/gemma/docs/gemma-3n) ready for deployment on Android using the [MediaPipe LLM Inference API](https://ai.google.dev/edge/mediapipe/solutions/genai/llm_inference). The current checkpoint only supports text and vision input, with 4096 context length.",
"sizeInBytes": 4405655031,
"version": "20250520",
"llmSupportImage": true,
From 71e5e9da42bce1734313c5f8a6fde0fe858a7a13 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Wed, 21 May 2025 11:18:17 -0700
Subject: [PATCH 024/336] Update model_allowlist.json
---
model_allowlist.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/model_allowlist.json b/model_allowlist.json
index 6c21c0249..ba347ac63 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -45,6 +45,7 @@
"topK": 64,
"topP": 0.95,
"temperature": 1.0,
+ "maxTokens": 1024,
"accelerators": "gpu,cpu"
},
"taskTypes": ["llm_chat", "llm_prompt_lab"]
@@ -60,6 +61,7 @@
"topK": 40,
"topP": 0.95,
"temperature": 1.0,
+ "maxTokens": 1024,
"accelerators": "cpu"
},
"taskTypes": ["llm_chat", "llm_prompt_lab"]
From 0d255cff969afddbc88c676e2bc75a886288264f Mon Sep 17 00:00:00 2001
From: Yasir Modak <42785357+ymodak@users.noreply.github.com>
Date: Wed, 21 May 2025 11:29:40 -0700
Subject: [PATCH 025/336] Create bug_report.yml
Creating a bug template for incoming issues
---
.github/ISSUE_TEMPLATE/bug_report.yml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..b914b9da4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,22 @@
+name: Bug report
+description: Use this template to report bugs
+labels: ["type:bug"]
+body:
+ - type: markdown
+ attributes:
+ value: >
+ - type: textarea
+ id: description
+ attributes:
+ label: >
+ Description of the bug:
+ - type: textarea
+ id: behavior
+ attributes:
+ label: >
+ Actual vs expected behavior:
+ - type: textarea
+ id: info
+ attributes:
+ label: >
+ Any other information you'd like to share?
From ab5816d668ed02ed22da6fb12fcabc1b12250a93 Mon Sep 17 00:00:00 2001
From: Yasir Modak <42785357+ymodak@users.noreply.github.com>
Date: Wed, 21 May 2025 11:32:56 -0700
Subject: [PATCH 026/336] Create feature_request.yml
Creating feature request template for incoming issues
---
.github/ISSUE_TEMPLATE/feature_request.yml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..85183f3d2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,22 @@
+name: Feature request
+description: Use this template to suggest a new feature
+labels: ["type:feature request"]
+body:
+ - type: markdown
+ attributes:
+ value: >
+ - type: textarea
+ id: description
+ attributes:
+ label: >
+ Description of the feature request:
+ - type: textarea
+ id: behavior
+ attributes:
+ label: >
+ What problem are you trying to solve with this feature?
+ - type: textarea
+ id: info
+ attributes:
+ label: >
+ Any other information you'd like to share?
From f9cab2f06dad30c62190a7b4d7bf51894bc0a0c5 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Wed, 21 May 2025 12:33:35 -0700
Subject: [PATCH 027/336] - Improve UX - Fix a bug related to LLM inference
engine cleanup.
---
Android/src/app/build.gradle.kts | 2 +-
.../com/google/ai/edge/gallery/data/Config.kt | 2 +-
.../com/google/ai/edge/gallery/data/Model.kt | 2 +-
.../edge/gallery/ui/common/ModelPageAppBar.kt | 40 ++++---
.../ai/edge/gallery/ui/common/ModelPicker.kt | 14 ++-
.../ui/common/ModelPickerChipsPager.kt | 8 +-
.../edge/gallery/ui/common/chat/ChatPanel.kt | 3 +-
.../edge/gallery/ui/common/chat/ChatView.kt | 2 +-
.../gallery/ui/common/chat/MarkdownText.kt | 4 +-
.../gallery/ui/common/chat/MessageBodyText.kt | 2 +-
.../ui/common/chat/MessageInputText.kt | 110 +++++++++++++++++-
.../gallery/ui/common/chat/MessageSender.kt | 26 +++--
.../common/chat/ModelDownloadingAnimation.kt | 4 +-
.../gallery/ui/common/modelitem/StatusIcon.kt | 10 +-
.../ai/edge/gallery/ui/home/HomeScreen.kt | 2 +-
.../edge/gallery/ui/llmchat/LlmChatConfigs.kt | 8 +-
.../gallery/ui/llmchat/LlmChatModelHelper.kt | 48 ++++----
.../ui/llmsingleturn/PromptTemplatesPanel.kt | 2 +-
.../edge/gallery/ui/modelmanager/ModelList.kt | 4 +-
.../google/ai/edge/gallery/ui/theme/Type.kt | 3 +
Android/src/settings.gradle.kts | 2 +-
21 files changed, 218 insertions(+), 80 deletions(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 1d92c85c5..1e42bd6fd 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -31,7 +31,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "1.0.0"
+ versionName = "1.0.1"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt
index 4106d7d0b..1c850886b 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Config.kt
@@ -89,7 +89,7 @@ class NumberSliderConfig(
type = ConfigEditorType.NUMBER_SLIDER,
key = key,
defaultValue = defaultValue,
- valueType = valueType
+ valueType = valueType,
)
/**
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt
index ee5f10ac4..e79613ad8 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Model.kt
@@ -209,7 +209,7 @@ enum class ConfigKey(val label: String) {
SUPPORT_IMAGE("Support image"),
MAX_RESULT_COUNT("Max result count"),
USE_GPU("Use GPU"),
- ACCELERATOR("Accelerator"),
+ ACCELERATOR("Choose accelerator"),
COMPATIBLE_ACCELERATORS("Compatible accelerators"),
WARM_UP_ITERATIONS("Warm up iterations"),
BENCHMARK_ITERATIONS("Benchmark iterations"),
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt
index 64e0861cb..e900f5daf 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPageAppBar.kt
@@ -16,12 +16,14 @@
package com.google.ai.edge.gallery.ui.common
+import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.material.icons.rounded.MapsUgc
@@ -42,7 +44,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.scale
+import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.vectorResource
@@ -68,7 +70,7 @@ fun ModelPageAppBar(
modifier: Modifier = Modifier,
isResettingSession: Boolean = false,
onResetSessionClicked: (Model) -> Unit = {},
- showResetSessionButton: Boolean = false,
+ canShowResetSessionButton: Boolean = false,
onConfigChanged: (oldConfigValues: Map, newConfigValues: Map) -> Unit = { _, _ -> },
) {
var showConfigDialog by remember { mutableStateOf(false) }
@@ -96,7 +98,7 @@ fun ModelPageAppBar(
)
Text(
task.type.label,
- style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.SemiBold),
+ style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.SemiBold),
color = getTaskIconColor(task = task)
)
}
@@ -121,11 +123,12 @@ fun ModelPageAppBar(
},
// The config button for the model (if existed).
actions = {
- val showConfigButton =
- model.configs.isNotEmpty() && curDownloadStatus?.status == ModelDownloadStatusType.SUCCEEDED
+ val downloadSucceeded = curDownloadStatus?.status == ModelDownloadStatusType.SUCCEEDED
+ val showConfigButton = model.configs.isNotEmpty() && downloadSucceeded
+ val showResetSessionButton = canShowResetSessionButton && downloadSucceeded
Box(modifier = Modifier.size(42.dp), contentAlignment = Alignment.Center) {
var configButtonOffset = 0.dp
- if (showConfigButton && showResetSessionButton) {
+ if (showConfigButton && canShowResetSessionButton) {
configButtonOffset = (-40).dp
}
val isModelInitializing =
@@ -138,14 +141,14 @@ fun ModelPageAppBar(
},
enabled = enableConfigButton,
modifier = Modifier
- .scale(0.75f)
.offset(x = configButtonOffset)
.alpha(if (!enableConfigButton) 0.5f else 1f)
) {
Icon(
imageVector = Icons.Rounded.Tune,
contentDescription = "",
- tint = MaterialTheme.colorScheme.primary
+ tint = MaterialTheme.colorScheme.primary,
+ modifier = Modifier.size(20.dp)
)
}
}
@@ -164,14 +167,23 @@ fun ModelPageAppBar(
},
enabled = enableResetButton,
modifier = Modifier
- .scale(0.75f)
.alpha(if (!enableResetButton) 0.5f else 1f)
) {
- Icon(
- imageVector = Icons.Rounded.MapsUgc,
- contentDescription = "",
- tint = MaterialTheme.colorScheme.primary
- )
+ Box(
+ modifier = Modifier
+ .size(32.dp)
+ .clip(CircleShape)
+ .background(MaterialTheme.colorScheme.surfaceContainer),
+ contentAlignment = Alignment.Center
+ ) {
+ Icon(
+ imageVector = Icons.Rounded.MapsUgc,
+ contentDescription = "",
+ tint = MaterialTheme.colorScheme.primary,
+ modifier = Modifier
+ .size(20.dp)
+ )
+ }
}
}
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt
index 3e85a63da..94090edb3 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPicker.kt
@@ -16,6 +16,7 @@
package com.google.ai.edge.gallery.ui.common
+import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -26,6 +27,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.outlined.CheckCircle
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -35,6 +37,7 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.vectorResource
@@ -83,6 +86,7 @@ fun ModelPicker(
// Model list.
for (model in task.models) {
+ val selected = model.name == modelManagerUiState.selectedModel.name
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
@@ -91,12 +95,16 @@ fun ModelPicker(
.clickable {
onModelSelected(model)
}
+ .background(if (selected) MaterialTheme.colorScheme.surfaceContainer else Color.Transparent)
.padding(horizontal = 16.dp, vertical = 8.dp),
) {
Spacer(modifier = Modifier.width(24.dp))
Column(modifier = Modifier.weight(1f)) {
Text(model.name, style = MaterialTheme.typography.bodyMedium)
- Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(4.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
StatusIcon(downloadStatus = modelManagerUiState.modelDownloadStatus[model.name])
Text(
model.sizeInBytes.humanReadableSize(),
@@ -105,9 +113,9 @@ fun ModelPicker(
)
}
}
- if (model.name == modelManagerUiState.selectedModel.name) {
+ if (selected) {
Icon(
- Icons.Outlined.CheckCircle,
+ Icons.Filled.CheckCircle,
modifier = Modifier.size(16.dp),
contentDescription = ""
)
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt
index ea1e2fae9..1fe96554f 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/ModelPickerChipsPager.kt
@@ -130,8 +130,8 @@ fun ModelPickerChipsPager(
showModelPicker = true
}
.padding(start = 8.dp, end = 2.dp)
- .padding(vertical = 1.dp)) Inner@{
- Box(contentAlignment = Alignment.Center, modifier = Modifier.size(18.dp)) {
+ .padding(vertical = 4.dp)) Inner@{
+ Box(contentAlignment = Alignment.Center, modifier = Modifier.size(21.dp)) {
StatusIcon(downloadStatus = modelManagerUiState.modelDownloadStatus[model.name])
this@Inner.AnimatedVisibility(
visible = modelInitializationStatus?.status == ModelInitializationStatusType.INITIALIZING,
@@ -141,7 +141,7 @@ fun ModelPickerChipsPager(
// Circular progress indicator.
CircularProgressIndicator(
modifier = Modifier
- .size(17.dp)
+ .size(24.dp)
.alpha(0.5f),
strokeWidth = 2.dp,
color = MaterialTheme.colorScheme.onSurfaceVariant
@@ -150,7 +150,7 @@ fun ModelPickerChipsPager(
}
Text(
model.name,
- style = MaterialTheme.typography.labelMedium,
+ style = MaterialTheme.typography.labelLarge,
modifier = Modifier
.padding(start = 4.dp)
.widthIn(0.dp, screenWidthDp - 250.dp),
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
index b2f8319c3..85a9df14a 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
@@ -80,6 +80,7 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.google.ai.edge.gallery.R
+import com.google.ai.edge.gallery.data.ConfigKey
import com.google.ai.edge.gallery.data.Model
import com.google.ai.edge.gallery.data.Task
import com.google.ai.edge.gallery.data.TaskType
@@ -267,7 +268,7 @@ fun ChatPanel(
// Sender row.
MessageSender(
message = message,
- agentNameRes = task.agentNameRes,
+ agentName = stringResource(task.agentNameRes),
imageHistoryCurIndex = imageHistoryCurIndex.intValue
)
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
index 71c0d6da5..f6c75ea3f 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatView.kt
@@ -174,7 +174,7 @@ fun ChatView(
task = task,
model = selectedModel,
modelManagerViewModel = modelManagerViewModel,
- showResetSessionButton = true,
+ canShowResetSessionButton = true,
isResettingSession = uiState.isResettingSession,
inProgress = uiState.inProgress,
modelPreparing = uiState.preparing,
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt
index 8044c7767..3c07e92b6 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MarkdownText.kt
@@ -44,12 +44,12 @@ fun MarkdownText(
smallFontSize: Boolean = false
) {
val fontSize =
- if (smallFontSize) MaterialTheme.typography.bodySmall.fontSize else MaterialTheme.typography.bodyMedium.fontSize
+ if (smallFontSize) MaterialTheme.typography.bodyMedium.fontSize else MaterialTheme.typography.bodyLarge.fontSize
CompositionLocalProvider {
ProvideTextStyle(
value = TextStyle(
fontSize = fontSize,
- lineHeight = fontSize * 1.4,
+ lineHeight = fontSize * 1.3,
)
) {
RichText(
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt
index f31797f1e..8304c8749 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageBodyText.kt
@@ -38,7 +38,7 @@ fun MessageBodyText(message: ChatMessageText) {
if (message.side == ChatSide.USER) {
Text(
message.content,
- style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
+ style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
color = Color.White,
modifier = Modifier.padding(12.dp)
)
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
index 4a1e87ddb..45b0940ce 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
@@ -23,10 +23,18 @@ import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.Matrix
import android.net.Uri
+import android.util.Log
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.StringRes
+import androidx.camera.core.CameraControl
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ImageCapture
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.lifecycle.awaitInstance
+import androidx.camera.view.LifecycleCameraController
+import androidx.camera.view.PreviewView
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -36,6 +44,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
@@ -53,16 +62,21 @@ import androidx.compose.material.icons.rounded.Photo
import androidx.compose.material.icons.rounded.PhotoCamera
import androidx.compose.material.icons.rounded.PostAdd
import androidx.compose.material.icons.rounded.Stop
+import androidx.compose.material3.Button
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -73,18 +87,23 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.focus.focusModifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.content.ContextCompat
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
import com.google.ai.edge.gallery.R
import com.google.ai.edge.gallery.ui.common.createTempPictureUri
import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import java.util.concurrent.Executors
/**
* Composable function to display a text input field for composing chat messages.
@@ -92,6 +111,7 @@ import com.google.ai.edge.gallery.ui.theme.GalleryTheme
* This function renders a row containing a text field for message input and a send button.
* It handles message composition, input validation, and sending messages.
*/
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MessageInputText(
modelManagerViewModel: ModelManagerViewModel,
@@ -114,6 +134,8 @@ fun MessageInputText(
val modelManagerUiState by modelManagerViewModel.uiState.collectAsState()
var showAddContentMenu by remember { mutableStateOf(false) }
var showTextInputHistorySheet by remember { mutableStateOf(false) }
+ var showCameraCaptureBottomSheet by remember { mutableStateOf(false) }
+ var cameraCaptureSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
var tempPhotoUri by remember { mutableStateOf(value = Uri.EMPTY) }
var pickedImages by remember { mutableStateOf>(listOf()) }
val updatePickedImages: (Bitmap) -> Unit = { bitmap ->
@@ -145,6 +167,7 @@ fun MessageInputText(
if (permissionGranted) {
showAddContentMenu = false
tempPhotoUri = context.createTempPictureUri()
+// showCameraCaptureBottomSheet = true
cameraLauncher.launch(tempPhotoUri)
}
}
@@ -241,6 +264,7 @@ fun MessageInputText(
) -> {
showAddContentMenu = false
tempPhotoUri = context.createTempPictureUri()
+// showCameraCaptureBottomSheet = true
cameraLauncher.launch(tempPhotoUri)
}
@@ -313,7 +337,7 @@ fun MessageInputText(
disabledIndicatorColor = Color.Transparent,
disabledContainerColor = Color.Transparent,
),
- textStyle = MaterialTheme.typography.bodyMedium,
+ textStyle = MaterialTheme.typography.bodyLarge,
modifier = Modifier
.weight(1f)
.padding(start = 36.dp),
@@ -379,6 +403,90 @@ fun MessageInputText(
modelManagerViewModel.clearTextInputHistory()
})
}
+
+ if (showCameraCaptureBottomSheet) {
+ ModalBottomSheet(
+ sheetState = cameraCaptureSheetState,
+ onDismissRequest = { showCameraCaptureBottomSheet = false }) {
+ val lifecycleOwner = LocalLifecycleOwner.current
+ val previewUseCase = remember { androidx.camera.core.Preview.Builder().build() }
+ val imageCaptureUseCase = remember { ImageCapture.Builder().build() }
+ var cameraProvider by remember { mutableStateOf(null) }
+ var cameraControl by remember { mutableStateOf(null) }
+ val localContext = LocalContext.current
+
+ val executor = remember { Executors.newSingleThreadExecutor() }
+ val capturedImageUri = remember { mutableStateOf(null) }
+
+ fun rebindCameraProvider() {
+ cameraProvider?.let { cameraProvider ->
+ val cameraSelector = CameraSelector.Builder()
+ .requireLensFacing(CameraSelector.LENS_FACING_FRONT)
+ .build()
+ cameraProvider.unbindAll()
+ val camera = cameraProvider.bindToLifecycle(
+ lifecycleOwner = lifecycleOwner,
+ cameraSelector = cameraSelector,
+ previewUseCase,
+ imageCaptureUseCase
+ )
+ cameraControl = camera.cameraControl
+ }
+ }
+
+ LaunchedEffect(Unit) {
+ cameraProvider = ProcessCameraProvider.awaitInstance(localContext)
+ rebindCameraProvider()
+ }
+
+// val cameraController = remember {
+// LifecycleCameraController(context).apply {
+// bindToLifecycle(lifecycleOwner)
+// }
+// }
+
+ Box(modifier = Modifier.fillMaxSize()) {
+ // PreviewView for the camera feed.
+ AndroidView(
+ modifier = Modifier.fillMaxSize(),
+ factory = { ctx ->
+ PreviewView(context).also {
+ previewUseCase.surfaceProvider = it.surfaceProvider
+ rebindCameraProvider()
+ }
+// PreviewView(ctx).apply {
+// scaleType = PreviewView.ScaleType.FILL_START
+// implementationMode = PreviewView.ImplementationMode.COMPATIBLE
+// controller = cameraController // Attach the lifecycle-aware camera controller.
+// }
+ },
+// onRelease = {
+// // Called when the PreviewView is removed from the composable hierarchy
+// cameraController.unbind() // Unbinds the camera to free up resources
+// }
+ )
+ // Button that triggers the image capture process
+ IconButton(
+ colors = IconButtonDefaults.iconButtonColors(
+ containerColor = MaterialTheme.colorScheme.tertiaryContainer,
+ ),
+ modifier = Modifier
+ .align(Alignment.BottomCenter)
+ .padding(bottom = 32.dp)
+ .size(64.dp),
+ onClick = {
+ },
+ ) {
+ Icon(
+ Icons.Rounded.PhotoCamera,
+ contentDescription = "",
+ tint = MaterialTheme.colorScheme.onTertiaryContainer,
+ modifier = Modifier.size(36.dp)
+ )
+ }
+ }
+ }
+ }
}
private fun handleImageSelected(
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
index 46ad5b8d0..38d6860b2 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
@@ -17,7 +17,6 @@
package com.google.ai.edge.gallery.ui.common.chat
import android.graphics.Bitmap
-import androidx.annotation.StringRes
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -38,7 +37,6 @@ import androidx.compose.ui.unit.dp
import com.google.ai.edge.gallery.R
import com.google.ai.edge.gallery.ui.theme.GalleryTheme
import com.google.ai.edge.gallery.ui.theme.bodySmallNarrow
-import com.google.ai.edge.gallery.ui.theme.bodySmallSemiBold
data class MessageLayoutConfig(
val horizontalArrangement: Arrangement.Horizontal,
@@ -56,7 +54,9 @@ data class MessageLayoutConfig(
*/
@Composable
fun MessageSender(
- message: ChatMessage, @StringRes agentNameRes: Int, imageHistoryCurIndex: Int = 0
+ message: ChatMessage,
+ agentName: String = "",
+ imageHistoryCurIndex: Int = 0
) {
// No user label for system messages.
if (message.side == ChatSide.SYSTEM) {
@@ -64,7 +64,7 @@ fun MessageSender(
}
val (horizontalArrangement, modifier, userLabel, rightSideLabel) = getMessageLayoutConfig(
- message = message, agentNameRes = agentNameRes, imageHistoryCurIndex = imageHistoryCurIndex
+ message = message, agentName = agentName, imageHistoryCurIndex = imageHistoryCurIndex
)
Row(
@@ -76,7 +76,7 @@ fun MessageSender(
// Sender label.
Text(
userLabel,
- style = bodySmallSemiBold,
+ style = MaterialTheme.typography.titleSmall,
)
when (message) {
@@ -152,7 +152,7 @@ fun MessageSender(
@Composable
private fun getMessageLayoutConfig(
message: ChatMessage,
- @StringRes agentNameRes: Int,
+ agentName: String,
imageHistoryCurIndex: Int,
): MessageLayoutConfig {
var userLabel = stringResource(R.string.chat_you)
@@ -161,7 +161,7 @@ private fun getMessageLayoutConfig(
var modifier = Modifier.padding(bottom = 2.dp)
if (message.side == ChatSide.AGENT) {
- userLabel = stringResource(agentNameRes)
+ userLabel = agentName
}
when (message) {
@@ -207,12 +207,12 @@ fun MessageSenderPreview() {
// Agent message.
MessageSender(
message = ChatMessageText(content = "hello world", side = ChatSide.AGENT),
- agentNameRes = R.string.chat_generic_agent_name
+ agentName = stringResource(R.string.chat_generic_agent_name)
)
// User message.
MessageSender(
message = ChatMessageText(content = "hello world", side = ChatSide.USER),
- agentNameRes = R.string.chat_generic_agent_name
+ agentName = stringResource(R.string.chat_generic_agent_name)
)
// Benchmark during warmup.
MessageSender(
@@ -225,7 +225,8 @@ fun MessageSenderPreview() {
warmupTotal = 50,
iterationCurrent = 0,
iterationTotal = 200
- ), agentNameRes = R.string.chat_generic_agent_name
+ ),
+ agentName = stringResource(R.string.chat_generic_agent_name)
)
// Benchmark during running.
MessageSender(
@@ -238,7 +239,8 @@ fun MessageSenderPreview() {
warmupTotal = 50,
iterationCurrent = 123,
iterationTotal = 200
- ), agentNameRes = R.string.chat_generic_agent_name
+ ),
+ agentName = stringResource(R.string.chat_generic_agent_name)
)
// Image generation during running.
MessageSender(
@@ -248,7 +250,7 @@ fun MessageSenderPreview() {
totalIterations = 10,
ChatSide.AGENT
),
- agentNameRes = R.string.chat_generic_agent_name,
+ agentName = stringResource(R.string.chat_generic_agent_name),
imageHistoryCurIndex = 4,
)
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
index cca917e4a..df6be3e85 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ModelDownloadingAnimation.kt
@@ -226,7 +226,7 @@ fun ModelDownloadingAnimation(
Text(
sizeLabel,
color = MaterialTheme.colorScheme.secondary,
- style = labelSmallNarrow.copy(fontSize = 9.sp, lineHeight = 10.sp),
+ style = MaterialTheme.typography.labelMedium,
textAlign = TextAlign.Center,
overflow = TextOverflow.Visible,
modifier = Modifier
@@ -266,7 +266,7 @@ fun ModelDownloadingAnimation(
"Feel free to switch apps or lock your device.\n"
+ "The download will continue in the background.\n"
+ "We'll send a notification when it's done.",
- style = MaterialTheme.typography.bodyMedium,
+ style = MaterialTheme.typography.bodyLarge,
textAlign = TextAlign.Center
)
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt
index 2ba284bc0..042a8ed08 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/modelitem/StatusIcon.kt
@@ -38,6 +38,8 @@ import com.google.ai.edge.gallery.data.ModelDownloadStatusType
import com.google.ai.edge.gallery.ui.theme.GalleryTheme
import com.google.ai.edge.gallery.ui.theme.customColors
+private val SIZE = 18.dp
+
/**
* Composable function to display an icon representing the download status of a model.
*/
@@ -53,7 +55,7 @@ fun StatusIcon(downloadStatus: ModelDownloadStatus?, modifier: Modifier = Modifi
Icons.AutoMirrored.Outlined.HelpOutline,
tint = Color(0xFFCCCCCC),
contentDescription = "",
- modifier = Modifier.size(14.dp)
+ modifier = Modifier.size(SIZE)
)
ModelDownloadStatusType.SUCCEEDED -> {
@@ -61,7 +63,7 @@ fun StatusIcon(downloadStatus: ModelDownloadStatus?, modifier: Modifier = Modifi
Icons.Filled.DownloadForOffline,
tint = MaterialTheme.customColors.successColor,
contentDescription = "",
- modifier = Modifier.size(14.dp)
+ modifier = Modifier.size(SIZE)
)
}
@@ -69,13 +71,13 @@ fun StatusIcon(downloadStatus: ModelDownloadStatus?, modifier: Modifier = Modifi
Icons.Rounded.Error,
tint = Color(0xFFAA0000),
contentDescription = "",
- modifier = Modifier.size(14.dp)
+ modifier = Modifier.size(SIZE)
)
ModelDownloadStatusType.IN_PROGRESS -> Icon(
Icons.Rounded.Downloading,
contentDescription = "",
- modifier = Modifier.size(14.dp)
+ modifier = Modifier.size(SIZE)
)
else -> {}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
index 62fa540b3..37e48c3cd 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
@@ -387,7 +387,7 @@ private fun TaskList(
Text(
introText,
textAlign = TextAlign.Center,
- style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+ style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
modifier = Modifier.padding(bottom = 20.dp)
)
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt
index 7fd130805..3fcc5fa5e 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatConfigs.kt
@@ -19,6 +19,7 @@ package com.google.ai.edge.gallery.ui.llmchat
import com.google.ai.edge.gallery.data.Accelerator
import com.google.ai.edge.gallery.data.Config
import com.google.ai.edge.gallery.data.ConfigKey
+import com.google.ai.edge.gallery.data.LabelConfig
import com.google.ai.edge.gallery.data.NumberSliderConfig
import com.google.ai.edge.gallery.data.SegmentedButtonConfig
import com.google.ai.edge.gallery.data.ValueType
@@ -37,12 +38,9 @@ fun createLlmChatConfigs(
accelerators: List = DEFAULT_ACCELERATORS,
): List {
return listOf(
- NumberSliderConfig(
+ LabelConfig(
key = ConfigKey.MAX_TOKENS,
- sliderMin = 100f,
- sliderMax = 1024f,
- defaultValue = defaultMaxToken.toFloat(),
- valueType = ValueType.INT
+ defaultValue = "$defaultMaxToken",
),
NumberSliderConfig(
key = ConfigKey.TOPK,
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt
index 2e9062b70..ce2094edb 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt
@@ -84,27 +84,31 @@ object LlmChatModelHelper {
}
fun resetSession(model: Model) {
- Log.d(TAG, "Resetting session for model '${model.name}'")
-
- val instance = model.instance as LlmModelInstance? ?: return
- val session = instance.session
- session.close()
-
- val inference = instance.engine
- val topK = model.getIntConfigValue(key = ConfigKey.TOPK, defaultValue = DEFAULT_TOPK)
- val topP = model.getFloatConfigValue(key = ConfigKey.TOPP, defaultValue = DEFAULT_TOPP)
- val temperature =
- model.getFloatConfigValue(key = ConfigKey.TEMPERATURE, defaultValue = DEFAULT_TEMPERATURE)
- val newSession = LlmInferenceSession.createFromOptions(
- inference,
- LlmInferenceSession.LlmInferenceSessionOptions.builder().setTopK(topK).setTopP(topP)
- .setTemperature(temperature)
- .setGraphOptions(
- GraphOptions.builder().setEnableVisionModality(model.llmSupportImage).build()
- ).build()
- )
- instance.session = newSession
- Log.d(TAG, "Resetting done")
+ try {
+ Log.d(TAG, "Resetting session for model '${model.name}'")
+
+ val instance = model.instance as LlmModelInstance? ?: return
+ val session = instance.session
+ session.close()
+
+ val inference = instance.engine
+ val topK = model.getIntConfigValue(key = ConfigKey.TOPK, defaultValue = DEFAULT_TOPK)
+ val topP = model.getFloatConfigValue(key = ConfigKey.TOPP, defaultValue = DEFAULT_TOPP)
+ val temperature =
+ model.getFloatConfigValue(key = ConfigKey.TEMPERATURE, defaultValue = DEFAULT_TEMPERATURE)
+ val newSession = LlmInferenceSession.createFromOptions(
+ inference,
+ LlmInferenceSession.LlmInferenceSessionOptions.builder().setTopK(topK).setTopP(topP)
+ .setTemperature(temperature)
+ .setGraphOptions(
+ GraphOptions.builder().setEnableVisionModality(model.llmSupportImage).build()
+ ).build()
+ )
+ instance.session = newSession
+ Log.d(TAG, "Resetting done")
+ } catch (e: Exception) {
+ Log.d(TAG, "Failed to reset session", e)
+ }
}
fun cleanUp(model: Model) {
@@ -114,7 +118,7 @@ object LlmChatModelHelper {
val instance = model.instance as LlmModelInstance
try {
- instance.session.close()
+ // This will also close the session. Do not call session.close manually.
instance.engine.close()
} catch (e: Exception) {
// ignore
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
index fd02b6499..59bdc0eac 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/PromptTemplatesPanel.kt
@@ -241,7 +241,7 @@ fun PromptTemplatesPanel(
disabledIndicatorColor = Color.Transparent,
disabledContainerColor = Color.Transparent,
),
- textStyle = MaterialTheme.typography.bodyMedium,
+ textStyle = MaterialTheme.typography.bodyLarge,
placeholder = { Text("Enter content") },
modifier = Modifier
.padding(bottom = 40.dp)
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
index 8d2a3682e..ee8a295ba 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
@@ -102,7 +102,7 @@ fun ModelList(
Text(
task.description,
textAlign = TextAlign.Center,
- style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+ style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
modifier = Modifier.fillMaxWidth()
)
}
@@ -200,7 +200,7 @@ fun ClickableLink(
Text(
text = annotatedText,
textAlign = TextAlign.Center,
- style = MaterialTheme.typography.bodySmall,
+ style = MaterialTheme.typography.bodyLarge,
modifier = Modifier
.padding(start = 6.dp)
.clickable {
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt
index 1fee396b6..d786a04c1 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/theme/Type.kt
@@ -79,6 +79,9 @@ val bodySmallNarrow =
val bodySmallSemiBold =
baseline.bodySmall.copy(fontFamily = nunitoFontFamily, fontWeight = FontWeight.SemiBold)
+val bodyMediumSemiBold =
+ baseline.bodyMedium.copy(fontFamily = nunitoFontFamily, fontWeight = FontWeight.SemiBold)
+
val bodySmallMediumNarrow =
baseline.bodySmall.copy(fontFamily = nunitoFontFamily, letterSpacing = 0.0.sp, fontSize = 14.sp)
diff --git a/Android/src/settings.gradle.kts b/Android/src/settings.gradle.kts
index 229f0387e..de7c1d0ba 100644
--- a/Android/src/settings.gradle.kts
+++ b/Android/src/settings.gradle.kts
@@ -30,7 +30,7 @@ pluginManagement {
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
- mavenLocal()
+// mavenLocal()
google()
mavenCentral()
}
From 6f7e7236c1b5e465c809b5fa4a60657d989b265d Mon Sep 17 00:00:00 2001
From: Yasir Modak <42785357+ymodak@users.noreply.github.com>
Date: Wed, 21 May 2025 14:06:15 -0700
Subject: [PATCH 028/336] Revert "Create feature_request.yml"
---
.github/ISSUE_TEMPLATE/feature_request.yml | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
deleted file mode 100644
index 85183f3d2..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Feature request
-description: Use this template to suggest a new feature
-labels: ["type:feature request"]
-body:
- - type: markdown
- attributes:
- value: >
- - type: textarea
- id: description
- attributes:
- label: >
- Description of the feature request:
- - type: textarea
- id: behavior
- attributes:
- label: >
- What problem are you trying to solve with this feature?
- - type: textarea
- id: info
- attributes:
- label: >
- Any other information you'd like to share?
From 35e79353f369d91177c87c93e4e6dbec9c8a9d9f Mon Sep 17 00:00:00 2001
From: Yasir Modak <42785357+ymodak@users.noreply.github.com>
Date: Wed, 21 May 2025 14:11:57 -0700
Subject: [PATCH 029/336] Revert "Create bug_report.yml"
---
.github/ISSUE_TEMPLATE/bug_report.yml | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
deleted file mode 100644
index b914b9da4..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Bug report
-description: Use this template to report bugs
-labels: ["type:bug"]
-body:
- - type: markdown
- attributes:
- value: >
- - type: textarea
- id: description
- attributes:
- label: >
- Description of the bug:
- - type: textarea
- id: behavior
- attributes:
- label: >
- Actual vs expected behavior:
- - type: textarea
- id: info
- attributes:
- label: >
- Any other information you'd like to share?
From f50d0655752699f7217ccd145d737d984cdc0a20 Mon Sep 17 00:00:00 2001
From: Yasir Modak <42785357+ymodak@users.noreply.github.com>
Date: Wed, 21 May 2025 14:13:22 -0700
Subject: [PATCH 030/336] Update issue templates
---
.github/ISSUE_TEMPLATE/bug_report.md | 34 +++++++++++++++++++++++
.github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++
2 files changed, 54 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..4908d31c1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..bbcbbe7d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
From 517f220d1b757ef52614f5813d0070fd8d620832 Mon Sep 17 00:00:00 2001
From: Jing Jin <8752427+jinjingforever@users.noreply.github.com>
Date: Wed, 21 May 2025 17:34:35 -0700
Subject: [PATCH 031/336] - Use camerax to implement image capture in-app
instead of using the native camera app to reduce the possibility of app being
killed due to GPU OOM. - Show accelerator name in chat message sender labels.
- Attach download workers with silent foreground notifications to make them
less likely to be killed. - Update app icon to be consistent with Google
style. - Bump up version to 1.0.2.
---
Android/src/app/build.gradle.kts | 2 +-
Android/src/app/src/main/AndroidManifest.xml | 15 +-
.../com/google/ai/edge/gallery/data/Consts.kt | 1 +
.../edge/gallery/data/DownloadRepository.kt | 16 +-
.../gallery/ui/common/chat/ChatMessage.kt | 21 ++-
.../edge/gallery/ui/common/chat/ChatPanel.kt | 7 +-
.../gallery/ui/common/chat/ChatViewModel.kt | 1 +
.../ui/common/chat/MessageInputText.kt | 137 +++++++++++++++---
.../gallery/ui/common/chat/MessageSender.kt | 3 +
.../ai/edge/gallery/ui/home/HomeScreen.kt | 2 +-
.../gallery/ui/llmchat/LlmChatViewModel.kt | 12 +-
.../gallery/ui/llmsingleturn/ResponsePanel.kt | 22 ++-
.../edge/gallery/ui/modelmanager/ModelList.kt | 8 +-
.../ui/modelmanager/ModelManagerViewModel.kt | 2 +
.../ai/edge/gallery/worker/DownloadWorker.kt | 88 ++++++++++-
.../res/mipmap-anydpi-v26/ic_launcher.xml | 16 --
.../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 5530 -> 4257 bytes
.../mipmap-hdpi/ic_launcher_background.png | Bin 855 -> 852 bytes
.../mipmap-hdpi/ic_launcher_foreground.png | Bin 4458 -> 4640 bytes
.../mipmap-hdpi/ic_launcher_monochrome.png | Bin 4458 -> 4640 bytes
.../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 3354 -> 2729 bytes
.../mipmap-mdpi/ic_launcher_background.png | Bin 463 -> 459 bytes
.../mipmap-mdpi/ic_launcher_foreground.png | Bin 2922 -> 3066 bytes
.../mipmap-mdpi/ic_launcher_monochrome.png | Bin 2922 -> 3066 bytes
.../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 8056 -> 6044 bytes
.../mipmap-xhdpi/ic_launcher_background.png | Bin 1320 -> 1317 bytes
.../mipmap-xhdpi/ic_launcher_foreground.png | Bin 6191 -> 6611 bytes
.../mipmap-xhdpi/ic_launcher_monochrome.png | Bin 6191 -> 6611 bytes
.../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 13579 -> 9466 bytes
.../mipmap-xxhdpi/ic_launcher_background.png | Bin 2953 -> 2949 bytes
.../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 10537 -> 10658 bytes
.../mipmap-xxhdpi/ic_launcher_monochrome.png | Bin 10537 -> 10658 bytes
.../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 19006 -> 13207 bytes
.../mipmap-xxxhdpi/ic_launcher_background.png | Bin 4236 -> 4232 bytes
.../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 15036 -> 15070 bytes
.../mipmap-xxxhdpi/ic_launcher_monochrome.png | Bin 15036 -> 15070 bytes
36 files changed, 284 insertions(+), 69 deletions(-)
diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 1e42bd6fd..9d633252b 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -31,7 +31,7 @@ android {
minSdk = 26
targetSdk = 35
versionCode = 1
- versionName = "1.0.1"
+ versionName = "1.0.2"
// Needed for HuggingFace auth workflows.
manifestPlaceholders["appAuthRedirectScheme"] = "com.google.ai.edge.gallery.oauth"
diff --git a/Android/src/app/src/main/AndroidManifest.xml b/Android/src/app/src/main/AndroidManifest.xml
index acd3cb2fa..3d710538e 100644
--- a/Android/src/app/src/main/AndroidManifest.xml
+++ b/Android/src/app/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
-
-
+
+
@@ -83,11 +83,12 @@
android:resource="@xml/file_paths" />
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
index 57a32824b..4f6bb97a0 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/Consts.kt
@@ -18,6 +18,7 @@ package com.google.ai.edge.gallery.data
// Keys used to send/receive data to Work.
const val KEY_MODEL_URL = "KEY_MODEL_URL"
+const val KEY_MODEL_NAME = "KEY_MODEL_NAME"
const val KEY_MODEL_VERSION = "KEY_MODEL_VERSION"
const val KEY_MODEL_DOWNLOAD_MODEL_DIR = "KEY_MODEL_DOWNLOAD_MODEL_DIR"
const val KEY_MODEL_DOWNLOAD_FILE_NAME = "KEY_MODEL_DOWNLOAD_FILE_NAME"
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
index 8dcd8040f..065c472ac 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/data/DownloadRepository.kt
@@ -24,7 +24,6 @@ import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
-import android.os.Build
import android.util.Log
import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat
@@ -92,7 +91,8 @@ class DefaultDownloadRepository(
val builder = Data.Builder()
val totalBytes = model.totalBytes + model.extraDataFiles.sumOf { it.sizeInBytes }
val inputDataBuilder =
- builder.putString(KEY_MODEL_URL, model.url).putString(KEY_MODEL_VERSION, model.version)
+ builder.putString(KEY_MODEL_NAME, model.name).putString(KEY_MODEL_URL, model.url)
+ .putString(KEY_MODEL_VERSION, model.version)
.putString(KEY_MODEL_DOWNLOAD_MODEL_DIR, model.normalizedName)
.putString(KEY_MODEL_DOWNLOAD_FILE_NAME, model.downloadFileName)
.putBoolean(KEY_MODEL_IS_ZIP, model.isZip).putString(KEY_MODEL_UNZIPPED_DIR, model.unzipDir)
@@ -271,13 +271,11 @@ class DefaultDownloadRepository(
// Create the NotificationChannel, but only on API 26+ because
// the NotificationChannel class is new and not in the support library
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- val importance = NotificationManager.IMPORTANCE_HIGH
- val channel = NotificationChannel(channelId, channelName, importance)
- val notificationManager: NotificationManager =
- context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
- notificationManager.createNotificationChannel(channel)
- }
+ val importance = NotificationManager.IMPORTANCE_HIGH
+ val channel = NotificationChannel(channelId, channelName, importance)
+ val notificationManager: NotificationManager =
+ context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+ notificationManager.createNotificationChannel(channel)
// Create an Intent to open your app with a deep link.
val intent = Intent(
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt
index c33c46247..50cae0970 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatMessage.kt
@@ -44,7 +44,10 @@ data class Classification(val label: String, val score: Float, val color: Color)
/** Base class for a chat message. */
open class ChatMessage(
- open val type: ChatMessageType, open val side: ChatSide, open val latencyMs: Float = -1f
+ open val type: ChatMessageType,
+ open val side: ChatSide,
+ open val latencyMs: Float = -1f,
+ open val accelerator: String = "",
) {
open fun clone(): ChatMessage {
return ChatMessage(type = type, side = side, latencyMs = latencyMs)
@@ -52,7 +55,8 @@ open class ChatMessage(
}
/** Chat message for showing loading status. */
-class ChatMessageLoading : ChatMessage(type = ChatMessageType.LOADING, side = ChatSide.AGENT)
+class ChatMessageLoading(override val accelerator: String = "") :
+ ChatMessage(type = ChatMessageType.LOADING, side = ChatSide.AGENT, accelerator = accelerator)
/** Chat message for info (help). */
class ChatMessageInfo(val content: String) :
@@ -79,12 +83,19 @@ open class ChatMessageText(
// Benchmark result for LLM response.
var llmBenchmarkResult: ChatMessageBenchmarkLlmResult? = null,
-) : ChatMessage(type = ChatMessageType.TEXT, side = side, latencyMs = latencyMs) {
+ override val accelerator: String = "",
+) : ChatMessage(
+ type = ChatMessageType.TEXT,
+ side = side,
+ latencyMs = latencyMs,
+ accelerator = accelerator
+) {
override fun clone(): ChatMessageText {
return ChatMessageText(
content = content,
side = side,
latencyMs = latencyMs,
+ accelerator = accelerator,
isMarkdown = isMarkdown,
llmBenchmarkResult = llmBenchmarkResult,
)
@@ -168,10 +179,12 @@ class ChatMessageBenchmarkLlmResult(
val statValues: MutableMap,
val running: Boolean,
override val latencyMs: Float = 0f,
+ override val accelerator: String = "",
) : ChatMessage(
type = ChatMessageType.BENCHMARK_LLM_RESULT,
side = ChatSide.AGENT,
- latencyMs = latencyMs
+ latencyMs = latencyMs,
+ accelerator = accelerator,
)
data class Histogram(
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
index 85a9df14a..1e035eb01 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatPanel.kt
@@ -80,7 +80,6 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.google.ai.edge.gallery.R
-import com.google.ai.edge.gallery.data.ConfigKey
import com.google.ai.edge.gallery.data.Model
import com.google.ai.edge.gallery.data.Task
import com.google.ai.edge.gallery.data.TaskType
@@ -266,9 +265,13 @@ fun ChatPanel(
horizontalAlignment = hAlign,
) messageColumn@{
// Sender row.
+ var agentName = stringResource(task.agentNameRes)
+ if (message.accelerator.isNotEmpty()) {
+ agentName = "$agentName on ${message.accelerator}"
+ }
MessageSender(
message = message,
- agentName = stringResource(task.agentNameRes),
+ agentName = agentName,
imageHistoryCurIndex = imageHistoryCurIndex.intValue
)
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt
index 285506c09..7efdeef84 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/ChatViewModel.kt
@@ -141,6 +141,7 @@ open class ChatViewModel(val task: Task) : ViewModel() {
content = newContent,
side = lastMessage.side,
latencyMs = latencyMs,
+ accelerator = lastMessage.accelerator,
)
newMessages.removeAt(newMessages.size - 1)
newMessages.add(newLastMessage)
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
index 45b0940ce..73b171394 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageInputText.kt
@@ -23,7 +23,6 @@ import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.Matrix
import android.net.Uri
-import android.util.Log
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
@@ -31,9 +30,9 @@ import androidx.annotation.StringRes
import androidx.camera.core.CameraControl
import androidx.camera.core.CameraSelector
import androidx.camera.core.ImageCapture
+import androidx.camera.core.ImageProxy
import androidx.camera.lifecycle.ProcessCameraProvider
import androidx.camera.lifecycle.awaitInstance
-import androidx.camera.view.LifecycleCameraController
import androidx.camera.view.PreviewView
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@@ -57,12 +56,12 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.Send
import androidx.compose.material.icons.rounded.Add
import androidx.compose.material.icons.rounded.Close
+import androidx.compose.material.icons.rounded.FlipCameraAndroid
import androidx.compose.material.icons.rounded.History
import androidx.compose.material.icons.rounded.Photo
import androidx.compose.material.icons.rounded.PhotoCamera
import androidx.compose.material.icons.rounded.PostAdd
import androidx.compose.material.icons.rounded.Stop
-import androidx.compose.material3.Button
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -81,13 +80,13 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.focus.focusModifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.platform.LocalContext
@@ -96,13 +95,13 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.content.ContextCompat
-import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.compose.LocalLifecycleOwner
import com.google.ai.edge.gallery.R
import com.google.ai.edge.gallery.ui.common.createTempPictureUri
import com.google.ai.edge.gallery.ui.modelmanager.ModelManagerViewModel
import com.google.ai.edge.gallery.ui.preview.PreviewModelManagerViewModel
import com.google.ai.edge.gallery.ui.theme.GalleryTheme
+import kotlinx.coroutines.launch
import java.util.concurrent.Executors
/**
@@ -131,6 +130,7 @@ fun MessageInputText(
showStopButtonWhenInProgress: Boolean = false,
) {
val context = LocalContext.current
+ val scope = rememberCoroutineScope()
val modelManagerUiState by modelManagerViewModel.uiState.collectAsState()
var showAddContentMenu by remember { mutableStateOf(false) }
var showTextInputHistorySheet by remember { mutableStateOf(false) }
@@ -144,6 +144,11 @@ fun MessageInputText(
newPickedImages.add(bitmap)
pickedImages = newPickedImages.toList()
}
+ var hasFrontCamera by remember { mutableStateOf(false) }
+
+ LaunchedEffect(Unit) {
+ checkFrontCamera(context = context, callback = { hasFrontCamera = it })
+ }
// launches camera
val cameraLauncher =
@@ -167,8 +172,8 @@ fun MessageInputText(
if (permissionGranted) {
showAddContentMenu = false
tempPhotoUri = context.createTempPictureUri()
-// showCameraCaptureBottomSheet = true
- cameraLauncher.launch(tempPhotoUri)
+ showCameraCaptureBottomSheet = true
+// cameraLauncher.launch(tempPhotoUri)
}
}
@@ -264,8 +269,8 @@ fun MessageInputText(
) -> {
showAddContentMenu = false
tempPhotoUri = context.createTempPictureUri()
-// showCameraCaptureBottomSheet = true
- cameraLauncher.launch(tempPhotoUri)
+ showCameraCaptureBottomSheet = true
+// cameraLauncher.launch(tempPhotoUri)
}
// Otherwise, ask for permission
@@ -408,12 +413,14 @@ fun MessageInputText(
ModalBottomSheet(
sheetState = cameraCaptureSheetState,
onDismissRequest = { showCameraCaptureBottomSheet = false }) {
+
val lifecycleOwner = LocalLifecycleOwner.current
val previewUseCase = remember { androidx.camera.core.Preview.Builder().build() }
val imageCaptureUseCase = remember { ImageCapture.Builder().build() }
var cameraProvider by remember { mutableStateOf(null) }
var cameraControl by remember { mutableStateOf(null) }
val localContext = LocalContext.current
+ var cameraSide by remember { mutableStateOf(CameraSelector.LENS_FACING_BACK) }
val executor = remember { Executors.newSingleThreadExecutor() }
val capturedImageUri = remember { mutableStateOf(null) }
@@ -421,7 +428,7 @@ fun MessageInputText(
fun rebindCameraProvider() {
cameraProvider?.let { cameraProvider ->
val cameraSelector = CameraSelector.Builder()
- .requireLensFacing(CameraSelector.LENS_FACING_FRONT)
+ .requireLensFacing(cameraSide)
.build()
cameraProvider.unbindAll()
val camera = cameraProvider.bindToLifecycle(
@@ -439,6 +446,10 @@ fun MessageInputText(
rebindCameraProvider()
}
+ LaunchedEffect(cameraSide) {
+ rebindCameraProvider()
+ }
+
// val cameraController = remember {
// LifecycleCameraController(context).apply {
// bindToLifecycle(lifecycleOwner)
@@ -465,25 +476,92 @@ fun MessageInputText(
// cameraController.unbind() // Unbinds the camera to free up resources
// }
)
+
+ // Close button.
+ IconButton(
+ onClick = {
+ scope.launch {
+ cameraCaptureSheetState.hide()
+ showCameraCaptureBottomSheet = false
+ }
+ }, colors = IconButtonDefaults.iconButtonColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant,
+ ), modifier = Modifier
+ .offset(x = (-8).dp, y = 8.dp)
+ .align(Alignment.TopEnd)
+ ) {
+ Icon(
+ Icons.Rounded.Close,
+ contentDescription = "",
+ tint = MaterialTheme.colorScheme.primary
+ )
+ }
+
// Button that triggers the image capture process
IconButton(
colors = IconButtonDefaults.iconButtonColors(
- containerColor = MaterialTheme.colorScheme.tertiaryContainer,
+ containerColor = MaterialTheme.colorScheme.primary,
),
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(bottom = 32.dp)
- .size(64.dp),
+ .size(64.dp)
+ .border(2.dp, MaterialTheme.colorScheme.onPrimary, CircleShape),
onClick = {
+ scope.launch {
+ val callback = object : ImageCapture.OnImageCapturedCallback() {
+ override fun onCaptureSuccess(image: ImageProxy) {
+ var bitmap = image.toBitmap()
+ val rotation = image.imageInfo.rotationDegrees
+ bitmap = if (rotation != 0) {
+ val matrix = Matrix().apply {
+ postRotate(rotation.toFloat())
+ }
+ Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
+ } else bitmap
+ updatePickedImages(bitmap)
+ image.close()
+ }
+ }
+ imageCaptureUseCase.takePicture(executor, callback)
+ cameraCaptureSheetState.hide()
+ showCameraCaptureBottomSheet = false
+ }
},
) {
Icon(
Icons.Rounded.PhotoCamera,
contentDescription = "",
- tint = MaterialTheme.colorScheme.onTertiaryContainer,
+ tint = MaterialTheme.colorScheme.onPrimary,
modifier = Modifier.size(36.dp)
)
}
+
+ // Button that toggles the front and back camera.
+ if (hasFrontCamera) {
+ IconButton(
+ colors = IconButtonDefaults.iconButtonColors(
+ containerColor = MaterialTheme.colorScheme.secondaryContainer,
+ ),
+ modifier = Modifier
+ .align(Alignment.BottomEnd)
+ .padding(bottom = 40.dp, end = 32.dp)
+ .size(48.dp),
+ onClick = {
+ cameraSide = when (cameraSide) {
+ CameraSelector.LENS_FACING_BACK -> CameraSelector.LENS_FACING_FRONT
+ else -> CameraSelector.LENS_FACING_BACK
+ }
+ },
+ ) {
+ Icon(
+ Icons.Rounded.FlipCameraAndroid,
+ contentDescription = "",
+ tint = MaterialTheme.colorScheme.onSecondaryContainer,
+ modifier = Modifier.size(24.dp)
+ )
+ }
+ }
}
}
}
@@ -501,13 +579,7 @@ private fun handleImageSelected(
val bitmap: Bitmap? = try {
val inputStream = context.contentResolver.openInputStream(uri)
val tmpBitmap = BitmapFactory.decodeStream(inputStream)
- if (rotateForPortrait && tmpBitmap.width > tmpBitmap.height) {
- val matrix = Matrix()
- matrix.postRotate(90f)
- Bitmap.createBitmap(tmpBitmap, 0, 0, tmpBitmap.width, tmpBitmap.height, matrix, true)
- } else {
- tmpBitmap
- }
+ rotateImageIfNecessary(bitmap = tmpBitmap, rotateForPortrait = rotateForPortrait)
} catch (e: Exception) {
e.printStackTrace()
null
@@ -517,6 +589,31 @@ private fun handleImageSelected(
}
}
+private fun rotateImageIfNecessary(bitmap: Bitmap, rotateForPortrait: Boolean = false): Bitmap {
+ return if (rotateForPortrait && bitmap.width > bitmap.height) {
+ val matrix = Matrix()
+ matrix.postRotate(90f)
+ Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
+ } else {
+ bitmap
+ }
+}
+
+private fun checkFrontCamera(context: Context, callback: (Boolean) -> Unit) {
+ val cameraProviderFuture = ProcessCameraProvider.getInstance(context)
+ cameraProviderFuture.addListener(Runnable {
+ val cameraProvider = cameraProviderFuture.get()
+ try {
+ // Attempt to select the default front camera
+ val hasFront = cameraProvider.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA)
+ callback(hasFront)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ callback(false)
+ }
+ }, ContextCompat.getMainExecutor(context))
+}
+
private fun createMessagesToSend(pickedImages: List, text: String): List {
val messages: MutableList = mutableListOf()
if (pickedImages.isNotEmpty()) {
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
index 38d6860b2..ac1375ceb 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/common/chat/MessageSender.kt
@@ -180,6 +180,9 @@ private fun getMessageLayoutConfig(
horizontalArrangement = Arrangement.SpaceBetween
modifier = modifier.fillMaxWidth()
userLabel = "Stats"
+ if (message.accelerator.isNotEmpty()) {
+ userLabel = "${userLabel} on ${message.accelerator}"
+ }
}
is ChatMessageImageWithHistory -> {
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
index 37e48c3cd..5b124c1b2 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/home/HomeScreen.kt
@@ -388,7 +388,7 @@ private fun TaskList(
introText,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
- modifier = Modifier.padding(bottom = 20.dp)
+ modifier = Modifier.padding(bottom = 20.dp).padding(horizontal = 16.dp)
)
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt
index 9eff00aa9..b99cdc823 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt
@@ -20,6 +20,7 @@ import android.content.Context
import android.graphics.Bitmap
import android.util.Log
import androidx.lifecycle.viewModelScope
+import com.google.ai.edge.gallery.data.ConfigKey
import com.google.ai.edge.gallery.data.Model
import com.google.ai.edge.gallery.data.TASK_LLM_CHAT
import com.google.ai.edge.gallery.data.TASK_LLM_ASK_IMAGE
@@ -47,6 +48,7 @@ private val STATS = listOf(
open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task = curTask) {
fun generateResponse(model: Model, input: String, image: Bitmap? = null, onError: () -> Unit) {
+ val accelerator = model.getStringConfigValue(key = ConfigKey.ACCELERATOR, defaultValue = "")
viewModelScope.launch(Dispatchers.Default) {
setInProgress(true)
setPreparing(true)
@@ -54,7 +56,7 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
// Loading.
addMessage(
model = model,
- message = ChatMessageLoading(),
+ message = ChatMessageLoading(accelerator = accelerator),
)
// Wait for instance to be initialized.
@@ -103,7 +105,12 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
// Add an empty message that will receive streaming results.
addMessage(
- model = model, message = ChatMessageText(content = "", side = ChatSide.AGENT)
+ model = model,
+ message = ChatMessageText(
+ content = "",
+ side = ChatSide.AGENT,
+ accelerator = accelerator
+ )
)
}
@@ -133,6 +140,7 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task
),
running = false,
latencyMs = -1f,
+ accelerator = accelerator,
)
)
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt
index 43ece196e..28116a9e0 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/ResponsePanel.kt
@@ -28,6 +28,8 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.foundation.text.TextAutoSize
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.AutoAwesome
@@ -56,6 +58,8 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.google.ai.edge.gallery.data.ConfigKey
import com.google.ai.edge.gallery.data.Model
import com.google.ai.edge.gallery.data.TASK_LLM_PROMPT_LAB
import com.google.ai.edge.gallery.ui.common.chat.MarkdownText
@@ -88,6 +92,7 @@ fun ResponsePanel(
val pagerState = rememberPagerState(
initialPage = task.models.indexOf(model),
pageCount = { task.models.size })
+ val accelerator = model.getStringConfigValue(key = ConfigKey.ACCELERATOR, defaultValue = "")
// Select the "response" tab when prompt template changes.
LaunchedEffect(selectedPromptTemplateType) {
@@ -191,7 +196,22 @@ fun ResponsePanel(
.size(16.dp)
.alpha(0.7f)
)
- Text(text = title)
+ var curTitle = title
+ if (accelerator.isNotEmpty()) {
+ curTitle = "$curTitle on $accelerator"
+ }
+ val titleColor = MaterialTheme.colorScheme.primary
+ BasicText(
+ text = curTitle,
+ maxLines = 1,
+ color = { titleColor },
+ style = MaterialTheme.typography.bodyMedium,
+ autoSize = TextAutoSize.StepBased(
+ minFontSize = 9.sp,
+ maxFontSize = 14.sp,
+ stepSize = 1.sp
+ )
+ )
}
})
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
index ee8a295ba..806a6e69e 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelList.kt
@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Code
import androidx.compose.material.icons.outlined.Description
@@ -91,11 +92,14 @@ fun ModelList(
}
}
+ val listState = rememberLazyListState()
+
Box(contentAlignment = Alignment.BottomEnd) {
LazyColumn(
modifier = modifier.padding(top = 8.dp),
contentPadding = contentPadding,
verticalArrangement = Arrangement.spacedBy(8.dp),
+ state = listState,
) {
// Headline.
item(key = "headline") {
@@ -103,7 +107,9 @@ fun ModelList(
task.description,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp),
)
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt
index 2abad3c29..63b5db775 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/modelmanager/ModelManagerViewModel.kt
@@ -382,6 +382,8 @@ open class ModelManagerViewModel(
}
_uiState.update { _uiState.value.copy(textInputHistory = newHistory) }
dataStoreRepository.saveTextInputHistory(_uiState.value.textInputHistory)
+ } else {
+ promoteTextInputHistoryItem(text)
}
}
diff --git a/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt b/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
index c29453571..ed1a2d24d 100644
--- a/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
+++ b/Android/src/app/src/main/java/com/google/ai/edge/gallery/worker/DownloadWorker.kt
@@ -16,10 +16,16 @@
package com.google.ai.edge.gallery.worker
+import android.app.NotificationChannel
+import android.app.NotificationManager
import android.content.Context
+import android.content.pm.ServiceInfo
+import android.os.Build
import android.util.Log
+import androidx.core.app.NotificationCompat
import androidx.work.CoroutineWorker
import androidx.work.Data
+import androidx.work.ForegroundInfo
import androidx.work.WorkerParameters
import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_ACCESS_TOKEN
import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_APP_TS
@@ -32,6 +38,7 @@ import com.google.ai.edge.gallery.data.KEY_MODEL_DOWNLOAD_REMAINING_MS
import com.google.ai.edge.gallery.data.KEY_MODEL_EXTRA_DATA_DOWNLOAD_FILE_NAMES
import com.google.ai.edge.gallery.data.KEY_MODEL_EXTRA_DATA_URLS
import com.google.ai.edge.gallery.data.KEY_MODEL_IS_ZIP
+import com.google.ai.edge.gallery.data.KEY_MODEL_NAME
import com.google.ai.edge.gallery.data.KEY_MODEL_START_UNZIPPING
import com.google.ai.edge.gallery.data.KEY_MODEL_TOTAL_BYTES
import com.google.ai.edge.gallery.data.KEY_MODEL_UNZIPPED_DIR
@@ -57,14 +64,40 @@ data class UrlAndFileName(
val fileName: String,
)
+private const val FOREGROUND_NOTIFICATION_CHANNEL_ID = "model_download_channel_foreground"
+private var channelCreated = false
+
class DownloadWorker(context: Context, params: WorkerParameters) :
CoroutineWorker(context, params) {
private val externalFilesDir = context.getExternalFilesDir(null)
+ private val notificationManager =
+ context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+ // Unique notification id.
+ private val notificationId: Int = params.id.hashCode()
+
+ init {
+ if (!channelCreated) {
+ // Create a notification channel for showing notifications for model downloading progress.
+ val channel = NotificationChannel(
+ FOREGROUND_NOTIFICATION_CHANNEL_ID,
+ "Model Downloading",
+ // Make it silent.
+ NotificationManager.IMPORTANCE_LOW
+ ).apply {
+ description = "Notifications for model downloading"
+ }
+ notificationManager.createNotificationChannel(channel)
+ channelCreated = true
+ }
+ }
+
override suspend fun doWork(): Result {
val appTs = readLaunchInfo(context = applicationContext)?.ts ?: 0
val fileUrl = inputData.getString(KEY_MODEL_URL)
+ val modelName = inputData.getString(KEY_MODEL_NAME) ?: "Model"
val version = inputData.getString(KEY_MODEL_VERSION)!!
val fileName = inputData.getString(KEY_MODEL_DOWNLOAD_FILE_NAME)
val modelDir = inputData.getString(KEY_MODEL_DOWNLOAD_MODEL_DIR)!!
@@ -87,6 +120,9 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
Result.failure()
} else {
return@withContext try {
+ // Set the worker as a foreground service immediately.
+ setForeground(createForegroundInfo(progress = 0, modelName = modelName))
+
// Collect data for all files.
val allFiles: MutableList = mutableListOf()
allFiles.add(UrlAndFileName(url = fileUrl, fileName = fileName))
@@ -206,6 +242,11 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
KEY_MODEL_DOWNLOAD_REMAINING_MS, remainingMs.toLong()
).build()
)
+ setForeground(
+ createForegroundInfo(
+ progress = (downloadedBytes * 100 / totalBytes).toInt(), modelName = modelName
+ )
+ )
Log.d(TAG, "downloadedBytes: $downloadedBytes")
lastSetProgressTs = curTs
}
@@ -221,11 +262,10 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
setProgress(Data.Builder().putBoolean(KEY_MODEL_START_UNZIPPING, true).build())
// Prepare target dir.
- val destDir =
- File(
- externalFilesDir,
- listOf(modelDir, version, unzippedDir).joinToString(File.separator)
- )
+ val destDir = File(
+ externalFilesDir,
+ listOf(modelDir, version, unzippedDir).joinToString(File.separator)
+ )
if (!destDir.exists()) {
destDir.mkdirs()
}
@@ -276,4 +316,42 @@ class DownloadWorker(context: Context, params: WorkerParameters) :
}
}
}
+
+ override suspend fun getForegroundInfo(): ForegroundInfo {
+ // Initial progress is 0
+ return createForegroundInfo(0)
+ }
+
+ /**
+ * Creates a [ForegroundInfo] object for the download worker's ongoing notification.
+ * This notification is used to keep the worker running in the foreground, indicating
+ * to the user that an active download is in progress.
+ */
+ private fun createForegroundInfo(progress: Int, modelName: String? = null): ForegroundInfo {
+ // Create a notification for the foreground service
+ var title = "Downloading model"
+ if (modelName != null) {
+ title = "Downloading \"$modelName\""
+ }
+ val content = "Downloading in progress: $progress%"
+
+ val notification =
+ NotificationCompat.Builder(applicationContext, FOREGROUND_NOTIFICATION_CHANNEL_ID)
+ .setContentTitle(title).setContentText(content)
+ .setSmallIcon(android.R.drawable.ic_dialog_info)
+ .setOngoing(true) // Makes the notification non-dismissable
+ .setProgress(100, progress, false) // Show progress
+ .build()
+
+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ ForegroundInfo(
+ notificationId, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+ )
+ } else {
+ ForegroundInfo(
+ notificationId,
+ notification,
+ )
+ }
+ }
}
\ No newline at end of file
diff --git a/Android/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Android/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6942fb76c..345888d26 100644
--- a/Android/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/Android/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,20 +1,4 @@
-
-
diff --git a/Android/src/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Android/src/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 8f6b3fbc602e9f394ec968d2f14e38456f3eb53a..44f0938218b90bff513a60a1c41be96af38ba01e 100644
GIT binary patch
delta 4249
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
literal 5530
zcmV;L6=mv)P)Px~R7pfZRCr$PTzQZj)qVcDdwPzYotZt5kOC{MtVI_AB!Lv`V37nuvO!MSsR}NN
zs$fGA$Dxuq!6qpP!5kIh1LCUK2FH|>R4TYCiHkTg=5Rm+1V~5-Apu5GkdSt@=-PX(
zp6Pzc@4bH0uY0;@W>=ESe`Kn*=IHL%?|tw4eZS+qUJd{MYKVaLYlKg*FYMQ$Z@+4Q
zES!
z*v^>ts-|fS(46htUw9CJ4Zv|vrZdkg)6N$_vRxg3v3BjX8#FC;55Tl?xx&G)EDM!N
zg@Zxw9ylIIrfI@7V>Qsy=@dWTFpNiRyS#1Z&R1Si0P_$&hrBx107G3!0sGT(*@;wIQ8ugRbk3?AY<*IS1-o07PvNIOe)_
zo9-`_Dt8wO#X3-=uGBc;>P$F;>OqQPll;A{E#(4b1c5p$jXGO^IBV9d*>Ih%oA(w9
zh1CR(%7jKHG#$p&GtO^<5-7tUMs52m*Yrr#r}dgHKvHYW4I4Iny;!Vr){r>`J<)U-
zbGFPP)5~Vl-`KhHWdezWZ(1I2Isi$NO7!<{e!fsBtRZluc6fk9X^EflQ`MYi3{oeE
z#Js&d_1dmouWSTRR>Fgp*)&yv==|84HS0GTM)GH4V`Hw1_F|VHK#iDiwk&DI>&4?S
zWV1Qwx^u&>UE5!9O|E5KnhHQ1oYkw>U(cAnb!=?BPHTeNGc_%$cjrL>R6xU-qlp(}oMvZCJs$EMX>eI&;E#61x_O*I4BxSGtS$k&t7iJ`1RyHZQDkrBHH#qQrq^-Z`Q0CukYIR
z%5?xru5d>hS~GwMocOwR*FQKiGI^KCoq}FSv`u57yeS?}@LBe|dqMS}i4dd8S5R=Mf
zi?fQ@M8A`Gq_4cPf3#Svk8{);ClU!HlZl$v_-9Uj
zYei!`ZE1xuuJY6|lfW(%O1xqqorb4V9<#c-I^Ni~ZwJLlq(`!Z;$vPEK-{$Y`!_yx
z`t<0Z1wB)3$PAn{iG)cdh`QNU^+dfUYG6SV3}Z+%D86X{nJ#9rqlA;l{Lvxdt%PV5l%*
z4~MJ3e-#;a6jhM?S~EGBhhYuUP-S?w0Q@8`HBRBS+rt1~3s6>>xls_5{r!$fjH_
z6a1;x@msGwf$Nu!Ad{>j(?;=_Vp0sSsygx|4TnBX;px}A@y3A+2K3SoJecFp*(&bi7Wih2D9Se&K}|Ji2GkYxlTGZS6o1ASwW-
zmoLA1l&XPI%%I<6u^8Ih+XCh#nAU&k7{2_eAcTtw{Q0|YBH-b
zh$bqvV#T_LCMG8Sq?vh9j+IWQL%rAS1kh?1pg>3JQy($#o4&aagJ&p~Vwe*HzSk|g
zR_~>xA_^@M$KSPpzvTec$6I7#US#b*u9_K%_5S@kePXQwMCR4LY#F(BXdgOeS_7KD>XkE7m-bl>pJZ37}))!sRETwa4>jlnRiE1-%$`Zp(^c
zeDS&y=xV2E#czIf-(4qp(>E4ka5&Dz_@;IZHxoG{w8uT*HpNh8!1G1mdt>!+5#?rT
zEY~P*B5xKnGYJrxS7Ozw4G#|wkA5W_AXh__gH#}=MuQPAY0&SGi6sKwOKsRcN_^@2
z^YQM{HqM&^WKmzB$Tpkk5zTljZXi2YDrt;PD_}>2&gU4;|XKRhDQa
zKs0fwWy?PKa6VuDBQNd=i+_Z95h$cX1X3{DzI~$#P`LND03ol0D&%aJG{CKindnoxGAD?U(Ne3meyF2@x{rh*{3xIUSQ2}aS
zw(OG+<@4n`>n2(?6lJ^wR5F?5xmeAR7_fH982LO|Ias(B{lS%T&p4PM_Y%IRGi0iHx#pdNBpggQLz*=(*
zrzcFj`d$Xl@9D(5$J%&2M9k1Npf3j8k=3x+bb(Q>qdSpVQJV2gfnibv=rv8^P%$8%
z7c0Bsd%ZUdBSJEnc+(YXD!SJIqN&R*S+eq!*hmn3MSC*}7%3kUX6B#iu1p29IxKwl
zw}!E4`Eae#v3v|q@94s|{W+W&k6|=#z^;*5+>2&xrU6_U*RUqRu)qXz{}&$(RDc5&
z##4*qRiGg83jjcMAxbgmeJTKvrhfF%douxyQrbZbqCe_S*Cm%M{WuI&IU{NCI?Ydlg^Y_%W{NEx1`sib02&GdD7;NEb>!xWLDJm^J(_Hf
z${YsY<^xo!;EV}7H@XJo0p9o=p+g=(YK^)zkcNg1&UOK+NCt6$`uYeURdX79F}fY;
zP%4$=bzarP>OghDVHA4txZfMFpLs!V6g8-Nucfv_+EXl2!OWlT1hpuP5KRE`cf1*+
zVlfSEZRt=A;t_XJhnCWzUl<1xI*>Nt43yxUselz7qEd)yx`T%f&2US(b{WhOgVl_<
z5Pdxk$0BD_&n^NcpD*&26ZLhL09{ctF_})(o0s3K8Ac45j7VDjOaSyw6UJ2;#IBJ3
z+Uu%)!h*eL0@cGsu)HlQU{X`4V4vuK+0lns*8)H{P&xAfoWe;!GZE{U2N)(|nO+nR
zKL@*b0(No42ShWG4x4xmz6KmW9&TcteSMez4A8D@tYe->qsIINd+)Yd)<9x&H?*Ea
z=oU>XSJ2CTKM!l$DA~p%3BlUqQrVw_abzy`!)xbGr6v2;Cf5wMZh2^Zgau-$NJCHsQ!{xAT%WBT!W4k0-&%=POV9EGo2X3=&namIlV6s
zI)IxQElIZ`&eT>W)An}<4(z2|%$I8LWOdP^%ePn-{-qwv
zJvKCSa6W*Oa&v>P+yS6_{`|}SgE1_R_F|$r+PRU-<WuMDZWdji%=
zBOX9&AAp(j0P^w8m)J8{C*Q&Fwy*koq6|RRq?@tGH1WjIqX+ME^Dw^2Dp+#O_VzB=
zqG^eL@JG~M(~?i9>YTGJ{(iG*|Okt6@})3A~&^^xlkfD7i&zwF-~hb<37
zTmnI>0JQAGXExAzz1u{5OEiEn^!Ponbj2w2JCF-4;18g#6@+cPg8eSDV7
zzi=2hK{Yd5xbX7(%Vp^c)Boq_na*qU|4_0*%Aq6dA04I{|x0Jfc9XNnW%H*_D3|%`ofSm@kEM<0L!(F~;BeF3Ll1
zgqU?}8WfA+iDSnO-VcC6@>-=&1&A8w3x`yS>Fxc^1K~C+yC{nG@?jHoUL{DzqBP>y
z-{NAouch8%*_+H1+ZVzgV
z$0Vvrn|%9SbVX72Uj#DsosIh4HQG7^8=o)lM%lc#fhyX(8nK6)U&y6$5s|iTT+rKl
z=~IlcW$JnUoQ!sv#gR%S0{augIu+b~;cGRNO;NMoh!q4*sYDO#$t`%{05xMz6hQR5
z)S}$Q7tg!FFj7B^7CG9PN{K6N#Um!k1hv^rd&gkw)wE_#Gc0zahSzJT
z9dZN&y4VBRz!ibot8(UueTmU#MG~Rw?8$+FLyrJB9rRp5QI2XUU}}q>vTgWG&3_^F
zNbG`_gOb~Vg&5OuF$f8Yx+KF_N|hb-YTE=9Mef8XVk*_46i%U15&NyFI2K$y3>%zb
zV9&t7!JFNji`KuwRyg^kjTj_NjlyBdN@vWOvt(bhS*%I2%c@`pW$F>uP9wchLyh`2
z!%Aumb?0(7V<&KYZasKaGl1xP5*5lkJ7>?H^C{Cz|G+C%gn6X^uNpAJV^)aqHp`Zy
zEhzE`X{BwK?l^Jc=+E7VSw4yoX^^b|MCb5L<+L<3dv?zz(`^5~sPi`KWwUdlk2e$J
zW_PY*f~KKbE&jpDlgFNOO^b?0=j34)X^OP)MId#~p51djfh2ZqdEO{WLqun%8t+UM
zf+&*`sYIp1!J)^XDA%Hhv!!RoT49j9Gk+G|1*wC8nmc#lla8Y;m9u>|j5^nh;j=1S
z`P%~n2XAwMq4jnGhr;-l9`v0GKvJ{`B+?{GoY!^@&7XXL}iA
zZw(F}dfa6SfkGt<$(kvf)VVUTuy&-`5u+qfWPa%xGkR9VYR)ZR~
zD}f@9N1*`;y81`I(J^8ieI_$i`$GdI6Cr^mMi2<}nf~ar{2u&|R8yPMCTE{7fP!I!
z1dIQ-7#9$Fm*44gurFkY5+nja26yyXYKsi^nkGHdMeTe86s1-2zS1P4`k{KCAQk44ofy`glX=O&z|80A;uum9
z_x933UIqo8BL=(vUvN$0{A9o#@YH7a?&HA^iW?a}erDQN&+5RU7|3ws2u~lw#6}lJ
z0byecCKom#RtKLm4>$xQJwzA`4V#r6QWQoNjRwI`O$BgTe~
HDWM4f+o0SY
literal 855
zcmeAS@N?(olHy`uVBq!ia0vp^i$Iuz4M-mPBqj}{7>k44ofy`glX=O&z%1zL;uum9
z_x6$_FN1;ri{XSuhCkjdEW&3NOFS^Tz4Myg;ot|wjhv63v)26QYT$5M#L&?xDZ{A5
z+{vV%mR7*h!K1>}Fk{9+K?S1;8VpHEZ0-#w97Yw52EkBG1u+}%+~hZYymt#Qr!aWB
L`njxgN@xNA{7(4k
diff --git a/Android/src/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Android/src/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index ec172b70ff7faa4a402e0c4f8dc78ad469baae43..43b53a39616f2c8587581e8f8d0aae8a494508b2 100644
GIT binary patch
literal 4640
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
MsOqXzE89i?2iGcuu>b%7
literal 4458
zcmdT|)n5}1v>!cUFgk`fLS!@oB2oe)1V)EQ=TJJNW0cY*Il3Dp1xaO;fKp1%5dzY}
zmuP|gIH&*s0O+wM-0%j={u?0q&Hix80=WSqUqcNQ
zK+`AAT>yZd?=f82IMDjAFvQE!b_Ge_mQbze$L#oG2U}>VN!D*_^
zBo(`~D3Tf{&JyvGjT&BoLfDTaV}0;P8nTZM1gKOe08@)Rw_4v5FCijpTDDrkDiLi#
z?*7N#;Q=zzQx4~=*!=ISTLIUUQaeTX9vtrO0AA4y#VAw~NvuKwStKvca7nQIoO3MOFvZ#p5PXEL7rgPrD+MZNYg&B22d64lfeOd+0rqrvih}=j-J6
zqm&)V+x1b(^B+KNq|swEE~S9znpnspkUX7zT7`(*fLi7aJq?fK|MdrJl9U^#TN68J
zmn0;2zUme0@e2xSl}}Ag#n+xuE!m-muLCUutLIW`LwDl$E+2dd`r$~uK1^cqJS%2&C_65sBI7MAl9dRwAQ
zL&{M{)J6_|OWehVvY8>00IXC<$!P8-9xb)i8=Z7}w^bet-a-A509-ogBMgWcG!%lhF75uFDyDS?bykuoxQ-RnoTO3+Lc
zK!TZaOVY5cMW3_$luKnT+v`EQ!JX!#ASzyhc8$Mo;OO3m*gem|RtI>Bn<0tEiiBohwpaZXnN
z7obx8vKsIXQDU=wO|BA$xLauKziHe|v*mHJc-IPK?|!(n1GICa(9cK}s5S;|6nP#F
z6|~M%;ci>kj^u|pmwHZ*RWC|>&Zb&By%%ZJJIEupMi2PAA|7X9|7gNi7p|_rwRH9^
zq%nk3I*^LmS2`~85%z1S`nX~`2|=#+%Tj5m^x;W9z%;^DSIrn=G`Nn|iu
z^{VmKg#1ek%*0#h5*vOo>QJ@@cXAI7&yC%bzZ*;Ne~88jv<;qn*?94
zNRl-PlK{so4Ra`0y`R_@Z){6(f5)zS?O$5%p^uP0nJ&Ro9&T=DTo1tI${#NTvxN)f
z;&2fIymtYkLjTqq@h!U@-J0mli5yQpPV=2MiFl=7HNAJBq~VOTuRM$<8qGw_qPpCc
za&&e1GDyp2v+FEGub5m#7mssKnQnPrTY(N!JZV8UZrP*HQAPbx!D@Rka5W0Cc_B8%7$v+=ruSC8EOE-Zesi6wH&+i7Tc
zdn?-|5h;TJO1&B?tvZk;OsqH98=ZywD_cfb-4(UW{wA=AN|qW3#1BcA7!ZEIjii!;
zrk8V&c9X=ycb9NU_qDOKY#m+jY8auoCvq-grp#)-P83Rx&>5tijI`Q-$#{?
zy4&z;f&Hw3zuBUHE
zffZJ_a_*Sq^Xwn$;O0dV%*&mtXDM#yJVi(%c9L`!en(167UrC>YM=(_94Y9*3q6Fv
zEPS2p)}ingX*9u)E0$Kx31LLGQRqu*n&~V(>QBxgUGJU%#vc~dx42L8DXiIp8}IZ-
z)D>u7d{VnQ>C;wvq4R+RTf3V-qaA@0AnBKxFn|2^j5rl`Mo09Mq1b_|(_CMC(Q6>{
zw8<^??^#{nlP}X*BKfDswU4W+^3Xrh$De^ya|a&|XEDQC-t{S*HJoa@WX~)q;b7t2
zk4o%7(A!h~PoC9PdAhs;flU9<)@UIl2%s;WvGKZdXHr`s*TD(c0F@WCn)k!Dt3TJd
z
z$gnj;m}|YW;P7TJ2@GHU`jy>dvOgnjQ;G_#&-~p{H`XrW?WCGx7*oMZGH|g^ObwTNRRU|EA;z?DVoo`j@j+BsU-EDZhu<=m|h=*v5K=
z68)2_(8XbBv)NQgZBXZvy8z4AAZGNBs<4DR&xW6s@}XloNLDx6m_TyC
z86s`}Eba9@IHw*>xytzk`F6DmTcjU%n3qVsj
z5tU)x?Kb0mk21Il-tv)c`pVUxDvDR`p+Zk7Bhxa&5V2nDM#`wJKyRz81tAxiPqU$%
z`<+N^??12huQ%6>^fT_@sza=7K-0kZl#D!+@$C~ynhlR)v6=RebB~?QV!b&VM`bw1
zQe&!YlEmOB78%|`n9JRX4&o!iAo%`a>F{e{M^6UL2W>o(l#1K$Kk~()eba9^`U3Su
z!}#eIvm(j2hf2N3-`pP)QIws(CXQmrHl|ZNsC9a3YeMPeor>GIAW5B%_(#N41GNn-
zv1!t{2ZY-h42Z+S()&G~yV(O!9(#B9A%5=fF9bI@wyc>NYhrf%Aa@Hk7*5Q3(%g=t
zld3&vCNdKQS%wDuro6je;(xv9MZI?cI^&f0i$i@s$27kS*XjSJU@`r#*j@ANV8Ya7
zQv6L_qsV-LNcqu#7!Z8J;>!dyAsim{=6Aj?w_u{rsrJ3u#NQKE>~mb%ah9XP(Jfn{I(slcjTxwUH$z@NCUWY^hTllB0XnBn|2vuB>BQWN%v=(U_&}j!YwOFjt#Q}-NHz@mfl!V#(|~6|
z9AH%0*U-Np%^iJAVA$~NoT;t<-$Rra|0y~eTU*sFcU29D1@8~pogZoYiNx(TQ}z}l
ziyYrm3e7Qbo^ZZ8_le;An_3(Q|FUU=N~oe(gEh8VeG8-mqeyv(@jZ}jX(gWHAQ
z-#%Am<35S67BY5DSuDg4A*sN>rUxgEJ5@M1)>;9QV+mr3q=N6D@TsOj8Tqd>1ik<$@?Mm=+
znUkqd#$qY&Bl{*p7~MgkF}TNi0Cb|dS0AAA^N!BPYhRx7LhSvb*V_7_jgpL$yzYAa
zxL5CYjI>|yGD=VNzy9R6Ax-a!OIi%syWJ9izlNKs!{wkHTWSK`cHu`db$Y1z=_UuZ
zG)37MIhJ1FFSaM8XqJ>wze8k=ybNy
zk}EA$3RB|P>V>oL>?Y^D&UJY_6)!SU!>b0qxg4ePUK|rm2e$@ct||Cx6{9BQkn{;V
z3l^`cfP>%YY}nce5sr$%DW}8B#Z$p>+j+S|BKT_yF`w!H?-%fj8T|X`zEmxk)e4_1
zeg_tDlM9@C8|L$Z`J0(;c3UL+Jvz5qZ
zDa0mw4+*PTh^SNOym*pHs8X4Fk#V=S1+QbG9c|K#F~8TFg2t75V;xR(uG5%V$m35UC+fMqT{$7_Cn4P~Y>A_r@$1otOz8;UY_hTihz(kY
zBL}$d=2vBLD@Hur5E%AhCL)GxPAZkvia7FJ50P@fhT|Wo{>w4=3{ohqSBx`!<<|~k
z4jZdo!L$!}TzodQ6{DoKnhLn6SgCfo*8v~{+1DK}>Wfsm>1b5rP0*?d@_|Eq`y{`Ib7x`+P&
z=x3;=45%Jq-T?rp<~3B5jDv0V3Sj=Us_*;S+c9lY13XkzF@tM<;U(ah)kozV#P-Ig
zWFo-za`1k>b&vJ9xoZ|GI2^Q^vL$`p(e!5<^I^5_(@~wAvY0Fru9F%evq26O0S$R9
zlv@2&>u%H3G(U22opP9CX2n
zOQ2#qYp22hBFAm(hXcpyB^js)RJ!59Vs?ysOV4L7tToEC(0z6zKSOZ}041c@qv40vN^|090P~
z1A0%pLOA3p7ZB`5_9MRxvd%QL^jg#4Y}6{i>`?-{Mnn3TLs9O>ajK=mJNqOBuzps2
zhZk|-GNdi95s`T8yKX0mwJh2Kf}}`b-MPCsbB$dJ&f3W0s;ju={%>G5qyr!D_iXJ!
zzw@CBr`#~N%}!G#X7X&GcqMftsMtI1@VqZore*Z+0J!^-+Y{&
zzHR~a1vT+{CLP2!@szupTo@`Hy8?~@`MB&8Kmd|#c$T<}e#nY3jq!Y9_9{1(yX5Q3
z{+((qJsdeEh=tm|*9I!a7?%M!v~T%!KeCnjr_Z?u;aaCyKBI%DWK0>(_Ov?y8BiJ3
zA-sTJjU!i4@AsD$Rkv_q`SNB9!e5a$-_B34qCvg7_SfVfZ2WGc^PBQhP=VO4tcwL;
z#bH#??yp^PHN{qsf;w-YPUoB7F`{yv<CLn#J3wB{>w|*(GfYkj76E*%_rQNofLj+03jtw-z_`9LfuatCX`?*2V?oQ_6
zeAH|MubjSm1%!FamtZ<$rB`3+FU+fF$y`Kya3~14z2|$Y7SHvBugrYT*;7%&U4Dti
z>M1CMXT&eIDuOHZTsnaSU8%41LdDY8^ElxNZx^0RtbFx7;w4^a^la$Ly2QIeRQ>z?
zq$(CfrCP&BtByz8R5?4{huLObzuzxBPw7`rmiExxNTPW-i&qBY;7YzSF`hzwtM(?Y
z`ENu0KL1pXojSrDBD>!xr%SLy=GkYd~Yq~A!V7fO!i5A=C
z&1?Y0P8tHbSfR(ScjERRCORApvR$R%eVR$OHeY;WCOhszya*d)4N4SBpKFP}m<&b|
zot`kObg@3_5p;LVwbh_$<&EqwAX|I}u^ruY{mV^#KZj={{^5mJ)z%Tx5waJGp7nqY
z6)mgl{I=Q*uput5iw)q}kOs9T;vT*8y_W2
zy>L8yY*3I`!iMlb^$n%~#h6=jc)T6&ylpjIscG6140?u;3CjBuDqNf0jt7sKeT)2A
zB#KQuIa+i7FhHDjqRS{5%(1RX7{a2=cB=MGg4kDPAVySk_0wpcdmKA#`TlIHt#YH2
z4Jh?njpNf?cj`qaJ5%h;I%SS##}{j>@ITRqUwK}hXb8-Bp@Jt*pIG1ekZYUfn#S>w
ztX+46QI!u@(BfN`dO5OsuT|KVdaKVBUbHAR6xAe0$-W4H&`u4er3Y(np-i{J-Y~4Ku%nJJ<
zrYm0-l*$+=WOYu_7(;2Rw_7eqmf*wk5>cL-b52!j4&THIT3YVBi)Tmg__9afI<^RO
z|LLqpM5Qw}m=GPM(Rx<8c_u=kWE+cC*8;6OoWS!?cspV00l)Eet~Jgyb?pf4anNnx
ziA4c#W%{r=60eR&#tMft#%?miO;gg|#u{Zqxc^jw>x*~OLU5?_hEmNMfrKuSK(xGU
zr+fikUh)a}A{{6SFWcdt`yXcXZ|Hif7~2&&m);2e(q?}m;Zx?{LH)YE9MDB;;GvzF
zp1)217UOo$>TBkT#5r0^D;~0WGVN|v0>Ds8Ap2=JSJ-2M(mn{HFMbGY?_o5wTEhAb
zyc>8Qtey_wh|_7`BGziQ6C(W{+W_1FIwOq
zxM=Fqh^)i((w_(Qj@6ydL@K(JFi^)R>GzGrfe7E`c79&YEblImgqwR2R?%{Yf=}?t
z$V}6h@i4~0xLi3AQM
zH})}?=zyQ|1H$)5o`^I7Un0TpWGg-oSbHnhM49!OwXvZFAdrJHkq5qkXB_|YAvO`W
zkqE$`45+&SoGnm|E;6=8cHKS6=+)Z(L1PN9!h-?Kid7s+0(
zTWs)rKyEihGi+HDF9E1Nu3y7zr_VC02D?tn|7et6v=#vQz5gb}8Jd6sy9sr8RJ@xh
z-5)a^O$ji{l>cS1vdE9JT#c79kIHuISk2+I&~+MqoLAsI(suL&#fr~lXn2Y%qKF<+
zJmp`1Yd_`2bSh*iE;KIZ7~y+MN_KU`!D1~d+!}s+$|i>Hp}o(|Ii{p(tSQ}vZclPO
zFX41u=}lZ;g91JcV2s~+MIWAf@(FulXIG*xv5Hx6rV3blO>?PgEU!b$^+&Vy3LXQ@
z+343&&boPc`EssPEsS2YLP_&+a;TiJg_LtnZk}9ON?W84h4~pNyVaY@J}}kYOE<%t
z{dyU5ulH7YgWSO^mJdOMf^BW>Iz`Q7+9$FaYCV343jZZ?ExrcR(VlV2ZdCke7*oms
z#3Qwgs~23&RZKhHe@4^PxX|T^yH-oj_nuEMcXXwg#ub@Z5vF$#?@29~(Vu54MaVww
z7^-N;X;{N~kTonp2~`=@4F#$u`Auvb&clP}wEhTFgD^vRyDjOm%KkRGN+s%jr+p*5@kK9~FCf6*$H^;H<=xj#VZHBB*>s|^
zXN>a{rTKN%a34!p_wkJ7ZMfN@2>H-?5B*YEIf&i-*!ud)S-~dUGwhK1qL?0$%twLK
zGy2?EE$L%rnA^b1i0P>w47jB)0P!`H?!{7Cfjg=uy
zYVD1h!(!inQ1qUeGd6m=voSrZa{N+Mbx%}=Bcm}IvdqRE`68fH`8Z|z+$o3h&VQ(T
zzgc#xlsJoJo1$81{GgM&Ti&x
zfOXY_L%q}<2FumVV8%aFGak@J<*{$P0Jy>=!I0A&|B%gl9c$BxO#90oY;vdgYV9rW
zqoXVcGKpccCh2TqEpK=}s@!T+@X_GstXK0z;2Iz3Z}gv3*0B(A*;p34+~$87Z!MHm
ze)#5{>!i73hd%_%5#f>-IBAwb8EH0kex0$YxvSc_&8xJ0%F`;nkh97uSHsyHOInB?EJ%)tdW+|dLI0*oLl7Y;^3!m(0mJ-A!CK5+
z!_d{WY08{tP`HZi%Nvo)Q4Kq;*;_>EZC3akql94k1eAWpSt@#z
z5UuXeLbTF`mwB{oj(DsQtoQ@!RH7?ypR6cPfbNEIWBa{vLbW)!MAhawpwjAFF{z%@
zCim`kEX4zg@eARmV58-m`8&D<&IwJfnZPqww(Z8&s&~^fsxlLHQZA%{oT)uzKdbvX
zD}@D$OQsVkEize&i!*fzz8esr;SbA`!*Gj*{xO#SXa74%+}sl?JjvKUV3K6{_woT~
MsOqXzE89i?2iGcuu>b%7
literal 4458
zcmdT|)n5}1v>!cUFgk`fLS!@oB2oe)1V)EQ=TJJNW0cY*Il3Dp1xaO;fKp1%5dzY}
zmuP|gIH&*s0O+wM-0%j={u?0q&Hix80=WSqUqcNQ
zK+`AAT>yZd?=f82IMDjAFvQE!b_Ge_mQbze$L#oG2U}>VN!D*_^
zBo(`~D3Tf{&JyvGjT&BoLfDTaV}0;P8nTZM1gKOe08@)Rw_4v5FCijpTDDrkDiLi#
z?*7N#;Q=zzQx4~=*!=ISTLIUUQaeTX9vtrO0AA4y#VAw~NvuKwStKvca7nQIoO3MOFvZ#p5PXEL7rgPrD+MZNYg&B22d64lfeOd+0rqrvih}=j-J6
zqm&)V+x1b(^B+KNq|swEE~S9znpnspkUX7zT7`(*fLi7aJq?fK|MdrJl9U^#TN68J
zmn0;2zUme0@e2xSl}}Ag#n+xuE!m-muLCUutLIW`LwDl$E+2dd`r$~uK1^cqJS%2&C_65sBI7MAl9dRwAQ
zL&{M{)J6_|OWehVvY8>00IXC<$!P8-9xb)i8=Z7}w^bet-a-A509-ogBMgWcG!%lhF75uFDyDS?bykuoxQ-RnoTO3+Lc
zK!TZaOVY5cMW3_$luKnT+v`EQ!JX!#ASzyhc8$Mo;OO3m*gem|RtI>Bn<0tEiiBohwpaZXnN
z7obx8vKsIXQDU=wO|BA$xLauKziHe|v*mHJc-IPK?|!(n1GICa(9cK}s5S;|6nP#F
z6|~M%;ci>kj^u|pmwHZ*RWC|>&Zb&By%%ZJJIEupMi2PAA|7X9|7gNi7p|_rwRH9^
zq%nk3I*^LmS2`~85%z1S`nX~`2|=#+%Tj5m^x;W9z%;^DSIrn=G`Nn|iu
z^{VmKg#1ek%*0#h5*vOo>QJ@@cXAI7&yC%bzZ*;Ne~88jv<;qn*?94
zNRl-PlK{so4Ra`0y`R_@Z){6(f5)zS?O$5%p^uP0nJ&Ro9&T=DTo1tI${#NTvxN)f
z;&2fIymtYkLjTqq@h!U@-J0mli5yQpPV=2MiFl=7HNAJBq~VOTuRM$<8qGw_qPpCc
za&&e1GDyp2v+FEGub5m#7mssKnQnPrTY(N!JZV8UZrP*HQAPbx!D@Rka5W0Cc_B8%7$v+=ruSC8EOE-Zesi6wH&+i7Tc
zdn?-|5h;TJO1&B?tvZk;OsqH98=ZywD_cfb-4(UW{wA=AN|qW3#1BcA7!ZEIjii!;
zrk8V&c9X=ycb9NU_qDOKY#m+jY8auoCvq-grp#)-P83Rx&>5tijI`Q-$#{?
zy4&z;f&Hw3zuBUHE
zffZJ_a_*Sq^Xwn$;O0dV%*&mtXDM#yJVi(%c9L`!en(167UrC>YM=(_94Y9*3q6Fv
zEPS2p)}ingX*9u)E0$Kx31LLGQRqu*n&~V(>QBxgUGJU%#vc~dx42L8DXiIp8}IZ-
z)D>u7d{VnQ>C;wvq4R+RTf3V-qaA@0AnBKxFn|2^j5rl`Mo09Mq1b_|(_CMC(Q6>{
zw8<^??^#{nlP}X*BKfDswU4W+^3Xrh$De^ya|a&|XEDQC-t{S*HJoa@WX~)q;b7t2
zk4o%7(A!h~PoC9PdAhs;flU9<)@UIl2%s;WvGKZdXHr`s*TD(c0F@WCn)k!Dt3TJd
z
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
P00000NkvXXu0mjf!GR}M
delta 3339
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
delta 93
zcmV-j0HXiP1J47HF*u1yL_t(|UhUNZ2>>7v#ZWJX0qh@9!4?m83C70fX76)X#~7G`
zF|9sm!K_{d!+I60V44Apw;!>9HUW{X8W!#Yz&en%Vr3o?00000NkvXXu0mjf#6Kg;
diff --git a/Android/src/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Android/src/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 8b41ec7bb3769b6960dc89fd27163eef7ad4c248..26e24bada975b7e66a8f0939c7c1691612f04509 100644
GIT binary patch
literal 3066
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
literal 2922
zcmb`J=Q|sW8pcD77_qhHt1YEQ?W!6LvDK;&F+vbDwj?!MGqts)wUxKD@fHnLwM%TJ
zV$Tp&YLB8N)HproKRD+)AMWS=a$nE&T=$3P`XyOe7=c)YSOEY4$i!IR`j7kmTR^5i
z^QouZz#pT-S{p$CM6$>l0Kg_;qOWTc>bz9|@`Xw2S`VhMh319xm{_|Z^Jv@i~_HYNG7BwrHtI=IBTJgaP-^`%W(Ch?uk&EY=N
zGQ2!~%0$}AL4cu`S%RGH{@cHYoWKjF>@Z3V+Re%uBz=n*)IL1lZ`f(U?nE%yzP65j
zy$8F^#%NZp5JOLhHX%f#w#$G}k_1#oIm8w(jm(g~oZBSR&Zqd9@7Wgwzbk7Fiq&|T
zn5@WXrpzdTwKK?}m&~QlXehsGM)%x|?(?iI_kXuW?g4AP6H(-HgdkVnuxj;(??|qf
zkf}#oTOcn2W%Qpp5kOa-Bxc&;x&*y`u^upgaKmpihq#sNpPj|M96VpmUZu^RhynED
z0V%>vOn>uU7E8a+6-zw`7e378{=7wOW@pq{d|2A(tss9}mLUhGUNdFh^3ES>~BwCIuN9xsJe0gt)>RhT?N?v%QA{ER`9X!o1YFPgJVdJ
zIV-j|kKb1xXPkKEP&v7gpUJU^bGxlr*YwQ}GUN_RMpgwB5gvOxI)b%ORcEO-ANT|+
zr|?_~sl=%aj=;58*V(!=9@=3`NJ`-ANB$#f;rth;qh+LCDXZ+EM->C_08}|rPzM^#
zRKnxWG6PF1S@hTjnMjr)UPGpO%o-s0(axx%oIK)@;MAi)C60&{S0r4;jUEex-(sfi
zYO$V+BElggmvBah_?T@g2o}5>o?oaow!m&v%|5jXDdEsT7YBKG#8(~FT8zP54BKYY
zbINwYRu<;6oSLaQMOK9mL9{UWh4PYn{FQsm9i*Lb2Bt*@N7T4_)o__lt_O*>3