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] 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 97e49fe..412a1eb 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 f26352a..0000000 --- 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 1f7f37e..62b91d1 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 02c0138..53e5ec9 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 49a7122..942bf5e 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 fde845b..3d76eb8 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 5512a8e..1356d12 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 6a6dbcf..f139896 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 c95d079..57a905d 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 4ebde26..4106d7d 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 e73edb1..ef3e5ae 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 4082be3..75eb4e4 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 3046580..82749e9 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 96dc1f0..131f36d 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 508e9f3..ee5f10a 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 02b97c1..ffb8211 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 64ce7a5..41a2314 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 cf22471..8a257dd 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 737bcbb..11e30e0 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 b2871db..9924da1 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 b9bebd1..ee5641e 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 8986bf1..64e0861 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 c27f74d..3e85a63 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 160d454..ea1e2fa 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 02a5854..0ae662e 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 50a2d27..64df7ec 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 79931ad..14ebc6f 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 9260435..c33c462 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 055b75d..dfe1783 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 c580572..d623fd3 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 b186305..285506c 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 9450383..34952c5 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 57e6c4e..bf1163f 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 8099e45..3d31836 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 265d93a..8044c77 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 35ab9d7..1bf59fc 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 b21fb4c..7c8f568 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 dc87652..b26b2cd 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 6508a45..52999fc 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 b05af41..c51b15d 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 e69f24c..a4d7d4d 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 9a6c162..2200943 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 844dce6..1092993 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 705625f..d89fb55 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 1a81f2b..777d6a4 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 ed4c58f..f31797f 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 b2039c1..af29e40 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 26d523c..85ca175 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 29a95fd..8e2a99f 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 7359457..4a1e87d 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 c387a77..9253765 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 3bf4106..46ad5b8 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 37777ce..6105ebd 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 155974c..cca917e 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 b4eaa34..4b5439f 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 eea3cdf..d6e3ad7 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 46b059c..060b4c2 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 50629f2..c864ff1 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 7212c57..c3d05f6 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 9286131..5143896 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 3738be2..fe5ed42 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 d852d8a..cf14bd5 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 53115bd..7735f87 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 9c775a8..2ba284b 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 90186d6..62fa540 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 7708d19..a1fd263 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 05978dc..b4a61d8 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 e5becbe..c0cae8f 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 85b391f..3908611 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 0e05b07..6d13d56 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 98290bb..0b616d6 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 769f549..e00839d 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 019930c..f8284bb 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 ffa0227..704867a 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 1715dc4..efa4312 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 0d9c06f..7fd1308 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 aa2fb78..2e9062b 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 2080ad7..6cebc53 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 91d6892..9eff00a 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 99bf312..94d1c66 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 75e4d13..64ce612 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 efc9d60..3b4e815 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 ce55efd..fd02b64 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 d458f42..43ece19 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 b665000..76d3747 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 13c7321..c91bcb5 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 d7657c7..8d2a368 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 49994e8..f6eb4f0 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 5414c6b..2abad3c 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 2486aba..fa58868 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 cdc6ec7..6db68e7 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 b756c8e..8a5455a 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 a37fe20..072ab98 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 792c116..d3a7e57 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 f874381..63da529 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 80e6010..6555d7e 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 3a3ab01..358d734 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 f31394c..38e3a00 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 41684bf..b2326cb 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 145e8a5..a952079 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 6e9e02b..5d8cd0e 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 333ce41..2978016 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 8630f05..1fee396 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 69f73eb..377741b 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 1e8d62b..0000000 --- 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