From cb06dc56896bb388f81175d51406e8197705ec23 Mon Sep 17 00:00:00 2001 From: Dinesh Manajipet Date: Mon, 11 Dec 2023 04:09:01 +0530 Subject: [PATCH] Rename package to com.volla.vollaboard --- .github/workflows/build.yml | 70 +++++++++++++++++++ README.md | 10 +-- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 6 +- .../downloader/messages/CancelCurrent.kt | 3 - .../downloader/messages/CancelFinished.kt | 3 - .../downloader/messages/CancelPending.kt | 3 - .../downloader/messages/StatusQuery.kt | 3 - .../sayboard => volla/vollaboard}/AppCtx.kt | 2 +- .../sayboard => volla/vollaboard}/AppPrefs.kt | 14 ++-- .../vollaboard}/Constants.kt | 2 +- .../vollaboard}/SayboardApplication.kt | 4 +- .../vollaboard}/SettingsActivity.kt | 19 +++-- .../sayboard => volla/vollaboard}/Tools.kt | 9 +-- .../data/InstalledModelReference.kt | 2 +- .../vollaboard}/data/ModelLink.kt | 2 +- .../vollaboard}/data/ModelType.kt | 2 +- .../vollaboard}/data/SimpleEnums.kt | 4 +- .../vollaboard}/data/VoskLocalModel.kt | 2 +- .../vollaboard}/data/VoskServerData.kt | 2 +- .../downloader/FileDownloadService.kt | 16 ++--- .../vollaboard}/downloader/FileDownloader.kt | 7 +- .../vollaboard}/downloader/ZipTools.kt | 7 +- .../downloader/messages/CancelCurrent.kt | 3 + .../downloader/messages/CancelFinished.kt | 3 + .../downloader/messages/CancelPending.kt | 3 + .../downloader/messages/DownloadError.kt | 2 +- .../downloader/messages/DownloadProgress.kt | 2 +- .../downloader/messages/DownloadState.kt | 2 +- .../downloader/messages/ModelInfo.kt | 2 +- .../vollaboard}/downloader/messages/State.kt | 2 +- .../vollaboard}/downloader/messages/Status.kt | 2 +- .../downloader/messages/StatusQuery.kt | 3 + .../downloader/messages/UnzipProgress.kt | 2 +- .../vollaboard}/ime/ActionManager.kt | 6 +- .../sayboard => volla/vollaboard}/ime/IME.kt | 10 +-- .../vollaboard}/ime/IMELifecycleOwner.kt | 2 +- .../vollaboard}/ime/ModelManager.kt | 12 ++-- .../vollaboard}/ime/MySpeechService.kt | 4 +- .../vollaboard}/ime/TextManager.kt | 4 +- .../vollaboard}/ime/ViewManager.kt | 22 +++--- .../vollaboard}/ime/recognizers/Recognizer.kt | 2 +- .../ime/recognizers/RecognizerSource.kt | 3 +- .../ime/recognizers/RecognizerState.kt | 2 +- .../vollaboard}/ime/recognizers/VoskLocal.kt | 4 +- .../vollaboard}/ime/recognizers/VoskServer.kt | 4 +- .../ime/recognizers/providers/Providers.kt | 10 +-- .../providers/RecognizerSourceProvider.kt | 6 +- .../providers/VoskLocalProvider.kt | 14 ++-- .../providers/VoskServerProvider.kt | 6 +- .../vollaboard}/theme/Color.kt | 2 +- .../vollaboard}/theme/Shape.kt | 2 +- .../vollaboard}/theme/Theme.kt | 2 +- .../vollaboard}/ui/ColorPickerPreference.kt | 5 +- .../vollaboard}/ui/GrantPermissionsUi.kt | 4 +- .../vollaboard}/ui/KeyboardSettingsUi.kt | 11 ++- .../vollaboard}/ui/LogicSettingsUi.kt | 8 +-- .../vollaboard}/ui/ModelsSettingsUi.kt | 38 +++++----- .../vollaboard}/ui/UISettingsUi.kt | 6 +- .../vollaboard}/ui/utils/MyIconButton.kt | 5 +- .../vollaboard}/ui/utils/MyTextButton.kt | 2 +- .../vollaboard}/utils/KeysListPreference.kt | 2 +- .../vollaboard}/utils/ModelListPreference.kt | 4 +- 63 files changed, 233 insertions(+), 191 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelCurrent.kt delete mode 100644 app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelFinished.kt delete mode 100644 app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelPending.kt delete mode 100644 app/src/main/java/com/elishaazaria/sayboard/downloader/messages/StatusQuery.kt rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/AppCtx.kt (96%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/AppPrefs.kt (88%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/Constants.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/SayboardApplication.kt (90%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/SettingsActivity.kt (92%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/Tools.kt (92%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/data/InstalledModelReference.kt (79%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/data/ModelLink.kt (98%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/data/ModelType.kt (71%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/data/SimpleEnums.kt (91%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/data/VoskLocalModel.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/data/VoskServerData.kt (96%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/FileDownloadService.kt (96%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/FileDownloader.kt (91%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/ZipTools.kt (96%) create mode 100644 app/src/main/java/com/volla/vollaboard/downloader/messages/CancelCurrent.kt create mode 100644 app/src/main/java/com/volla/vollaboard/downloader/messages/CancelFinished.kt create mode 100644 app/src/main/java/com/volla/vollaboard/downloader/messages/CancelPending.kt rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/DownloadError.kt (55%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/DownloadProgress.kt (56%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/DownloadState.kt (54%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/ModelInfo.kt (86%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/State.kt (71%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/Status.kt (77%) create mode 100644 app/src/main/java/com/volla/vollaboard/downloader/messages/StatusQuery.kt rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/downloader/messages/UnzipProgress.kt (55%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/ActionManager.kt (96%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/IME.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/IMELifecycleOwner.kt (98%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/ModelManager.kt (94%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/MySpeechService.kt (98%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/TextManager.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/ViewManager.kt (95%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/Recognizer.kt (91%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/RecognizerSource.kt (87%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/RecognizerState.kt (61%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/VoskLocal.kt (96%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/VoskServer.kt (98%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/providers/Providers.kt (76%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/providers/RecognizerSourceProvider.kt (51%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/providers/VoskLocalProvider.kt (76%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ime/recognizers/providers/VoskServerProvider.kt (62%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/theme/Color.kt (81%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/theme/Shape.kt (87%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/theme/Theme.kt (96%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/ColorPickerPreference.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/GrantPermissionsUi.kt (94%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/KeyboardSettingsUi.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/LogicSettingsUi.kt (89%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/ModelsSettingsUi.kt (95%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/UISettingsUi.kt (93%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/utils/MyIconButton.kt (93%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/ui/utils/MyTextButton.kt (97%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/utils/KeysListPreference.kt (95%) rename app/src/main/java/com/{elishaazaria/sayboard => volla/vollaboard}/utils/ModelListPreference.kt (85%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b99fb4d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,70 @@ +name: Android CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: gradle + - uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build && mkdir -p releases && find app/build/ -type f -name \*\.apk -exec mv {} releases/com.volla.vollaboard_$GITHUB_RUN_ID.apk \; && ls -l releases + + - uses: r0adkll/sign-android-release@v1 + name: Sign app APK + with: + releaseDirectory: ./releases + signingKeyBase64: ${{ secrets.ANDROID_KEYSTORE_FILE_CONTENTS }} + output: ./releases/signed + alias: ${{ secrets.ANDROID_KEYSTORE_ALIAS }} + keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASS }} + keyPassword: ${{ secrets.ANDROID_KEYSTORE_PASS }} + + + - name: Upload Apk to Nightly Repository + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + uses: wlixcc/SFTP-Deploy-Action@v1.0 + with: + username: 'drone' + server: 'volla.tech' + port: 22 + ssh_private_key: '${{ secrets.FDROID_DEPLOY_KEY }}' + local_path: './releases/signed/*.apk' + remote_path: '/fdroid-nightly.volla.tech/builds/volla/vollaboard/' + args: '-o CheckHostIP=no -o StrictHostKeyChecking=no' + + - name: Upload Apk to Release Repository + if: ${{ startsWith(github.ref, 'refs/tags/v') }} + uses: wlixcc/SFTP-Deploy-Action@v1.0 + with: + username: 'drone' + server: 'volla.tech' + port: 22 + ssh_private_key: '${{ secrets.FDROID_DEPLOY_KEY }}' + local_path: './releases/signed/*.apk' + remote_path: '/fdroid.volla.tech/builds/volla/vollaboard/' + args: '-o CheckHostIP=no -o StrictHostKeyChecking=no' diff --git a/README.md b/README.md index f4750e1..1a45f0f 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,6 @@ -App icon -[Get it on F-Droid](https://f-droid.org/en/packages/com.elishaazaria.sayboard/) - - -# Sayboard +# Vollaboard +This project is a fork of https://github.com/ElishaAz/Sayboard . This project provides a voice keyboard using [Vosk](https://alphacephei.com/vosk/android). It is based on [https://github.com/Felicis/vosk-android-demo](https://github.com/Felicis/vosk-android-demo). diff --git a/app/build.gradle b/app/build.gradle index 596ea0d..fa06320 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'org.jetbrains.kotlin.plugin.serialization' android { compileSdk 34 defaultConfig { - applicationId "com.elishaazaria.sayboard" + applicationId "com.volla.vollaboard" minSdkVersion 23 targetSdkVersion 33 versionCode 401010 @@ -52,7 +52,7 @@ android { kotlinCompilerExtensionVersion = "1.5.3" } - namespace 'com.elishaazaria.sayboard' + namespace 'com.volla.vollaboard' packagingOptions { resources { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e1a2b70..c8a6ffd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ tools:targetApi="s"> @@ -33,7 +33,7 @@ @@ -47,7 +47,7 @@ diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelCurrent.kt b/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelCurrent.kt deleted file mode 100644 index 424b279..0000000 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelCurrent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.elishaazaria.sayboard.downloader.messages - -data class CancelCurrent(val info: ModelInfo) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelFinished.kt b/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelFinished.kt deleted file mode 100644 index f32c553..0000000 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelFinished.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.elishaazaria.sayboard.downloader.messages - -data class CancelFinished(val info: ModelInfo) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelPending.kt b/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelPending.kt deleted file mode 100644 index 993db5d..0000000 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/CancelPending.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.elishaazaria.sayboard.downloader.messages - -data class CancelPending(val info: ModelInfo) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/StatusQuery.kt b/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/StatusQuery.kt deleted file mode 100644 index 0317584..0000000 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/StatusQuery.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.elishaazaria.sayboard.downloader.messages - -class StatusQuery \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/AppCtx.kt b/app/src/main/java/com/volla/vollaboard/AppCtx.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/AppCtx.kt rename to app/src/main/java/com/volla/vollaboard/AppCtx.kt index ce07ef5..50ee959 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/AppCtx.kt +++ b/app/src/main/java/com/volla/vollaboard/AppCtx.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard +package com.volla.vollaboard import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/elishaazaria/sayboard/AppPrefs.kt b/app/src/main/java/com/volla/vollaboard/AppPrefs.kt similarity index 88% rename from app/src/main/java/com/elishaazaria/sayboard/AppPrefs.kt rename to app/src/main/java/com/volla/vollaboard/AppPrefs.kt index 777ad74..b5063dd 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/AppPrefs.kt +++ b/app/src/main/java/com/volla/vollaboard/AppPrefs.kt @@ -1,13 +1,13 @@ -package com.elishaazaria.sayboard +package com.volla.vollaboard import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import com.elishaazaria.sayboard.data.KeepScreenAwakeMode -import com.elishaazaria.sayboard.utils.KeysListSerializer -import com.elishaazaria.sayboard.utils.ModelListSerializer -import com.elishaazaria.sayboard.utils.leftDefaultKeysList -import com.elishaazaria.sayboard.utils.rightDefaultKeysList -import com.elishaazaria.sayboard.utils.topDefaultKeysList +import com.volla.vollaboard.data.KeepScreenAwakeMode +import com.volla.vollaboard.utils.KeysListSerializer +import com.volla.vollaboard.utils.ModelListSerializer +import com.volla.vollaboard.utils.leftDefaultKeysList +import com.volla.vollaboard.utils.rightDefaultKeysList +import com.volla.vollaboard.utils.topDefaultKeysList import dev.patrickgold.jetpref.datastore.JetPref import dev.patrickgold.jetpref.datastore.model.PreferenceModel diff --git a/app/src/main/java/com/elishaazaria/sayboard/Constants.kt b/app/src/main/java/com/volla/vollaboard/Constants.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/Constants.kt rename to app/src/main/java/com/volla/vollaboard/Constants.kt index 2d0e232..4d22e4b 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/Constants.kt +++ b/app/src/main/java/com/volla/vollaboard/Constants.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard +package com.volla.vollaboard import android.content.Context import android.os.Environment diff --git a/app/src/main/java/com/elishaazaria/sayboard/SayboardApplication.kt b/app/src/main/java/com/volla/vollaboard/SayboardApplication.kt similarity index 90% rename from app/src/main/java/com/elishaazaria/sayboard/SayboardApplication.kt rename to app/src/main/java/com/volla/vollaboard/SayboardApplication.kt index f5c217a..35afde7 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/SayboardApplication.kt +++ b/app/src/main/java/com/volla/vollaboard/SayboardApplication.kt @@ -1,7 +1,7 @@ -package com.elishaazaria.sayboard +package com.volla.vollaboard import android.app.Application -import com.elishaazaria.sayboard.AppCtx.setAppCtx +import com.volla.vollaboard.AppCtx.setAppCtx import dev.patrickgold.jetpref.datastore.JetPref import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/elishaazaria/sayboard/SettingsActivity.kt b/app/src/main/java/com/volla/vollaboard/SettingsActivity.kt similarity index 92% rename from app/src/main/java/com/elishaazaria/sayboard/SettingsActivity.kt rename to app/src/main/java/com/volla/vollaboard/SettingsActivity.kt index c860afc..cf7fe03 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/SettingsActivity.kt +++ b/app/src/main/java/com/volla/vollaboard/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard +package com.volla.vollaboard import android.Manifest import android.app.Activity @@ -27,19 +27,16 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.app.ActivityCompat import androidx.lifecycle.MutableLiveData -import com.elishaazaria.sayboard.data.VoskLocalModel -import com.elishaazaria.sayboard.downloader.FileDownloader -import com.elishaazaria.sayboard.theme.AppTheme -import com.elishaazaria.sayboard.ui.GrantPermissionUi -import com.elishaazaria.sayboard.ui.KeyboardSettingsUi -import com.elishaazaria.sayboard.ui.LogicSettingsUi -import com.elishaazaria.sayboard.ui.ModelsSettingsUi -import com.elishaazaria.sayboard.ui.UISettingsUi -import java.util.Locale +import com.volla.vollaboard.downloader.FileDownloader +import com.volla.vollaboard.theme.AppTheme +import com.volla.vollaboard.ui.GrantPermissionUi +import com.volla.vollaboard.ui.KeyboardSettingsUi +import com.volla.vollaboard.ui.LogicSettingsUi +import com.volla.vollaboard.ui.ModelsSettingsUi +import com.volla.vollaboard.ui.UISettingsUi class SettingsActivity : ComponentActivity() { diff --git a/app/src/main/java/com/elishaazaria/sayboard/Tools.kt b/app/src/main/java/com/volla/vollaboard/Tools.kt similarity index 92% rename from app/src/main/java/com/elishaazaria/sayboard/Tools.kt rename to app/src/main/java/com/volla/vollaboard/Tools.kt index c8d5dd2..420dc3c 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/Tools.kt +++ b/app/src/main/java/com/volla/vollaboard/Tools.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard +package com.volla.vollaboard import android.Manifest import android.app.Activity @@ -9,11 +9,8 @@ import android.content.pm.PackageManager import android.os.Build import android.view.inputmethod.InputMethodManager import androidx.core.content.ContextCompat -import com.elishaazaria.sayboard.Constants.getModelsDirectory -import com.elishaazaria.sayboard.data.InstalledModelReference -import com.elishaazaria.sayboard.data.VoskLocalModel -import com.elishaazaria.sayboard.data.ModelLink -import com.elishaazaria.sayboard.data.ModelType +import com.volla.vollaboard.data.InstalledModelReference +import com.volla.vollaboard.data.VoskLocalModel import java.io.File import java.io.FileOutputStream import java.io.InputStream diff --git a/app/src/main/java/com/elishaazaria/sayboard/data/InstalledModelReference.kt b/app/src/main/java/com/volla/vollaboard/data/InstalledModelReference.kt similarity index 79% rename from app/src/main/java/com/elishaazaria/sayboard/data/InstalledModelReference.kt rename to app/src/main/java/com/volla/vollaboard/data/InstalledModelReference.kt index 8dbe44b..d2e106d 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/data/InstalledModelReference.kt +++ b/app/src/main/java/com/volla/vollaboard/data/InstalledModelReference.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.data +package com.volla.vollaboard.data import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/elishaazaria/sayboard/data/ModelLink.kt b/app/src/main/java/com/volla/vollaboard/data/ModelLink.kt similarity index 98% rename from app/src/main/java/com/elishaazaria/sayboard/data/ModelLink.kt rename to app/src/main/java/com/volla/vollaboard/data/ModelLink.kt index 1707608..b9b5b88 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/data/ModelLink.kt +++ b/app/src/main/java/com/volla/vollaboard/data/ModelLink.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.data +package com.volla.vollaboard.data import java.util.* diff --git a/app/src/main/java/com/elishaazaria/sayboard/data/ModelType.kt b/app/src/main/java/com/volla/vollaboard/data/ModelType.kt similarity index 71% rename from app/src/main/java/com/elishaazaria/sayboard/data/ModelType.kt rename to app/src/main/java/com/volla/vollaboard/data/ModelType.kt index 7c997bd..ceb4182 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/data/ModelType.kt +++ b/app/src/main/java/com/volla/vollaboard/data/ModelType.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.data +package com.volla.vollaboard.data import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/elishaazaria/sayboard/data/SimpleEnums.kt b/app/src/main/java/com/volla/vollaboard/data/SimpleEnums.kt similarity index 91% rename from app/src/main/java/com/elishaazaria/sayboard/data/SimpleEnums.kt rename to app/src/main/java/com/volla/vollaboard/data/SimpleEnums.kt index e7fe087..6f0322b 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/data/SimpleEnums.kt +++ b/app/src/main/java/com/volla/vollaboard/data/SimpleEnums.kt @@ -1,8 +1,8 @@ -package com.elishaazaria.sayboard.data +package com.volla.vollaboard.data import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import com.elishaazaria.sayboard.R +import com.volla.vollaboard.R import dev.patrickgold.jetpref.datastore.ui.listPrefEntries enum class KeepScreenAwakeMode { diff --git a/app/src/main/java/com/elishaazaria/sayboard/data/VoskLocalModel.kt b/app/src/main/java/com/volla/vollaboard/data/VoskLocalModel.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/data/VoskLocalModel.kt rename to app/src/main/java/com/volla/vollaboard/data/VoskLocalModel.kt index 6df3dd4..2ca0030 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/data/VoskLocalModel.kt +++ b/app/src/main/java/com/volla/vollaboard/data/VoskLocalModel.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.data +package com.volla.vollaboard.data import java.io.Serializable import java.util.* diff --git a/app/src/main/java/com/elishaazaria/sayboard/data/VoskServerData.kt b/app/src/main/java/com/volla/vollaboard/data/VoskServerData.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/data/VoskServerData.kt rename to app/src/main/java/com/volla/vollaboard/data/VoskServerData.kt index 3fd1e76..5c5427e 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/data/VoskServerData.kt +++ b/app/src/main/java/com/volla/vollaboard/data/VoskServerData.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.data +package com.volla.vollaboard.data import java.io.Serializable import java.net.URI diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloadService.kt b/app/src/main/java/com/volla/vollaboard/downloader/FileDownloadService.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloadService.kt rename to app/src/main/java/com/volla/vollaboard/downloader/FileDownloadService.kt index a824f39..e3c1208 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloadService.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/FileDownloadService.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.downloader +package com.volla.vollaboard.downloader import android.Manifest import android.app.Service @@ -11,14 +11,12 @@ import android.util.Log import androidx.core.app.ActivityCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import androidx.core.net.toFile -import com.elishaazaria.sayboard.Constants -import com.elishaazaria.sayboard.Constants.getDirectoryForModel -import com.elishaazaria.sayboard.Constants.getTemporaryDownloadLocation -import com.elishaazaria.sayboard.Constants.getTemporaryUnzipLocation -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.Tools -import com.elishaazaria.sayboard.downloader.messages.* +import com.volla.vollaboard.Constants +import com.volla.vollaboard.Constants.getTemporaryDownloadLocation +import com.volla.vollaboard.Constants.getTemporaryUnzipLocation +import com.volla.vollaboard.R +import com.volla.vollaboard.Tools +import com.volla.vollaboard.downloader.messages.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloader.kt b/app/src/main/java/com/volla/vollaboard/downloader/FileDownloader.kt similarity index 91% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloader.kt rename to app/src/main/java/com/volla/vollaboard/downloader/FileDownloader.kt index 16f5708..43d2ec6 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloader.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/FileDownloader.kt @@ -1,12 +1,11 @@ -package com.elishaazaria.sayboard.downloader +package com.volla.vollaboard.downloader import android.content.Context import android.content.Intent import android.net.Uri import android.os.Build -import com.elishaazaria.sayboard.data.ModelLink -import com.elishaazaria.sayboard.downloader.FileDownloadService -import com.elishaazaria.sayboard.downloader.messages.ModelInfo +import com.volla.vollaboard.data.ModelLink +import com.volla.vollaboard.downloader.messages.ModelInfo import java.util.* object FileDownloader { diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/ZipTools.kt b/app/src/main/java/com/volla/vollaboard/downloader/ZipTools.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/ZipTools.kt rename to app/src/main/java/com/volla/vollaboard/downloader/ZipTools.kt index d5cffff..e212a19 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/ZipTools.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/ZipTools.kt @@ -1,11 +1,10 @@ -package com.elishaazaria.sayboard.downloader +package com.volla.vollaboard.downloader import android.content.Context import android.util.Log -import android.widget.Toast import androidx.lifecycle.Observer -import com.elishaazaria.sayboard.Constants -import com.elishaazaria.sayboard.Tools.deleteRecursive +import com.volla.vollaboard.Constants +import com.volla.vollaboard.Tools.deleteRecursive import java.io.* import java.util.Locale import java.util.regex.Pattern diff --git a/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelCurrent.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelCurrent.kt new file mode 100644 index 0000000..f907b7e --- /dev/null +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelCurrent.kt @@ -0,0 +1,3 @@ +package com.volla.vollaboard.downloader.messages + +data class CancelCurrent(val info: ModelInfo) \ No newline at end of file diff --git a/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelFinished.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelFinished.kt new file mode 100644 index 0000000..46b9ce9 --- /dev/null +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelFinished.kt @@ -0,0 +1,3 @@ +package com.volla.vollaboard.downloader.messages + +data class CancelFinished(val info: ModelInfo) \ No newline at end of file diff --git a/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelPending.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelPending.kt new file mode 100644 index 0000000..2eefaa1 --- /dev/null +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/CancelPending.kt @@ -0,0 +1,3 @@ +package com.volla.vollaboard.downloader.messages + +data class CancelPending(val info: ModelInfo) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadError.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadError.kt similarity index 55% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadError.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadError.kt index b8544fa..352da4b 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadError.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadError.kt @@ -1,3 +1,3 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages data class DownloadError(val info: ModelInfo, val message: String) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadProgress.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadProgress.kt similarity index 56% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadProgress.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadProgress.kt index f33eb5a..8811c41 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadProgress.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadProgress.kt @@ -1,3 +1,3 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages data class DownloadProgress(val info: ModelInfo, val progress: Float) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadState.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadState.kt similarity index 54% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadState.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadState.kt index bdbc27f..a81d942 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadState.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/DownloadState.kt @@ -1,3 +1,3 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages data class DownloadState(val info: ModelInfo, val state: State) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/ModelInfo.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/ModelInfo.kt similarity index 86% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/ModelInfo.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/ModelInfo.kt index 28f48f1..100980a 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/ModelInfo.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/ModelInfo.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages import java.util.* diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/State.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/State.kt similarity index 71% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/State.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/State.kt index 1fd2546..4b544d3 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/State.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/State.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages enum class State { NONE, QUEUED, DOWNLOAD_STARTED, DOWNLOAD_FINISHED, UNZIP_STARTED, UNZIP_FINISHED, FINISHED, ERROR, CANCELED diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/Status.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/Status.kt similarity index 77% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/Status.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/Status.kt index 34547a7..0d76579 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/Status.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/Status.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages import java.util.* diff --git a/app/src/main/java/com/volla/vollaboard/downloader/messages/StatusQuery.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/StatusQuery.kt new file mode 100644 index 0000000..7b4959f --- /dev/null +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/StatusQuery.kt @@ -0,0 +1,3 @@ +package com.volla.vollaboard.downloader.messages + +class StatusQuery \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/UnzipProgress.kt b/app/src/main/java/com/volla/vollaboard/downloader/messages/UnzipProgress.kt similarity index 55% rename from app/src/main/java/com/elishaazaria/sayboard/downloader/messages/UnzipProgress.kt rename to app/src/main/java/com/volla/vollaboard/downloader/messages/UnzipProgress.kt index c4fba7b..82a855b 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/downloader/messages/UnzipProgress.kt +++ b/app/src/main/java/com/volla/vollaboard/downloader/messages/UnzipProgress.kt @@ -1,3 +1,3 @@ -package com.elishaazaria.sayboard.downloader.messages +package com.volla.vollaboard.downloader.messages data class UnzipProgress(val info: ModelInfo, val progress: Float) \ No newline at end of file diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/ActionManager.kt b/app/src/main/java/com/volla/vollaboard/ime/ActionManager.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/ime/ActionManager.kt rename to app/src/main/java/com/volla/vollaboard/ime/ActionManager.kt index f933aa2..4c6ce34 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/ActionManager.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/ActionManager.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime import android.content.Context import android.content.Intent @@ -8,8 +8,8 @@ import android.view.inputmethod.EditorInfo import android.view.inputmethod.ExtractedTextRequest import android.view.inputmethod.InputMethodManager import android.widget.Toast -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.SettingsActivity +import com.volla.vollaboard.R +import com.volla.vollaboard.SettingsActivity class ActionManager(private val ime: IME, private val viewManager: ViewManager) { private val mInputMethodManager: InputMethodManager = diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/IME.kt b/app/src/main/java/com/volla/vollaboard/ime/IME.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/ime/IME.kt rename to app/src/main/java/com/volla/vollaboard/ime/IME.kt index 7766616..c9d6798 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/IME.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/IME.kt @@ -11,7 +11,7 @@ // 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.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime import android.Manifest import android.content.pm.PackageManager @@ -27,10 +27,10 @@ import android.view.inputmethod.InputMethodManager import androidx.compose.ui.geometry.Offset import androidx.compose.ui.input.pointer.PointerInputChange import androidx.core.app.ActivityCompat -import com.elishaazaria.sayboard.BuildConfig -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.data.KeepScreenAwakeMode -import com.elishaazaria.sayboard.sayboardPreferenceModel +import com.volla.vollaboard.BuildConfig +import com.volla.vollaboard.R +import com.volla.vollaboard.data.KeepScreenAwakeMode +import com.volla.vollaboard.sayboardPreferenceModel import org.vosk.LibVosk import org.vosk.LogLevel import org.vosk.android.RecognitionListener diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/IMELifecycleOwner.kt b/app/src/main/java/com/volla/vollaboard/ime/IMELifecycleOwner.kt similarity index 98% rename from app/src/main/java/com/elishaazaria/sayboard/ime/IMELifecycleOwner.kt rename to app/src/main/java/com/volla/vollaboard/ime/IMELifecycleOwner.kt index 3c63d8d..2a376f1 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/IMELifecycleOwner.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/IMELifecycleOwner.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime /** * Based on: https://stackoverflow.com/a/66958772 diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/ModelManager.kt b/app/src/main/java/com/volla/vollaboard/ime/ModelManager.kt similarity index 94% rename from app/src/main/java/com/elishaazaria/sayboard/ime/ModelManager.kt rename to app/src/main/java/com/volla/vollaboard/ime/ModelManager.kt index b17883b..ce310bb 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/ModelManager.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/ModelManager.kt @@ -1,15 +1,15 @@ -package com.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime import android.Manifest import android.content.pm.PackageManager import android.util.Log import androidx.core.app.ActivityCompat import androidx.lifecycle.Observer -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.data.InstalledModelReference -import com.elishaazaria.sayboard.ime.recognizers.RecognizerSource -import com.elishaazaria.sayboard.ime.recognizers.providers.Providers -import com.elishaazaria.sayboard.sayboardPreferenceModel +import com.volla.vollaboard.R +import com.volla.vollaboard.data.InstalledModelReference +import com.volla.vollaboard.ime.recognizers.RecognizerSource +import com.volla.vollaboard.ime.recognizers.providers.Providers +import com.volla.vollaboard.sayboardPreferenceModel import java.io.IOException import java.util.concurrent.Executor import java.util.concurrent.Executors diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/MySpeechService.kt b/app/src/main/java/com/volla/vollaboard/ime/MySpeechService.kt similarity index 98% rename from app/src/main/java/com/elishaazaria/sayboard/ime/MySpeechService.kt rename to app/src/main/java/com/volla/vollaboard/ime/MySpeechService.kt index 86c5ec4..dc01ca1 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/MySpeechService.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/MySpeechService.kt @@ -1,7 +1,7 @@ /* * org.vosk.SpeechService, extended to support other recognizers. */ -package com.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime import android.Manifest import android.media.AudioRecord @@ -9,7 +9,7 @@ import android.media.MediaRecorder import android.os.Handler import android.os.Looper import androidx.annotation.RequiresPermission -import com.elishaazaria.sayboard.ime.recognizers.Recognizer +import com.volla.vollaboard.ime.recognizers.Recognizer import org.vosk.android.RecognitionListener import java.io.IOException diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/TextManager.kt b/app/src/main/java/com/volla/vollaboard/ime/TextManager.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/ime/TextManager.kt rename to app/src/main/java/com/volla/vollaboard/ime/TextManager.kt index 77bcade..bb6ce41 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/TextManager.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/TextManager.kt @@ -1,7 +1,7 @@ -package com.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime import android.util.Log -import com.elishaazaria.sayboard.sayboardPreferenceModel +import com.volla.vollaboard.sayboardPreferenceModel class TextManager(private val ime: IME, private val modelManager: ModelManager) { private val prefs by sayboardPreferenceModel() diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/ViewManager.kt b/app/src/main/java/com/volla/vollaboard/ime/ViewManager.kt similarity index 95% rename from app/src/main/java/com/elishaazaria/sayboard/ime/ViewManager.kt rename to app/src/main/java/com/volla/vollaboard/ime/ViewManager.kt index e2bf5fa..d4506f1 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/ViewManager.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/ViewManager.kt @@ -1,11 +1,10 @@ -package com.elishaazaria.sayboard.ime +package com.volla.vollaboard.ime import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.view.inputmethod.EditorInfo import androidx.compose.foundation.background -import androidx.compose.foundation.gestures.detectDragGestures import androidx.compose.foundation.gestures.detectHorizontalDragGestures import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.isSystemInDarkTheme @@ -27,7 +26,6 @@ import androidx.compose.material.LocalContentAlpha import androidx.compose.material.LocalContentColor import androidx.compose.material.MaterialTheme import androidx.compose.material.Text -import androidx.compose.material.TextButton import androidx.compose.material.darkColors import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack @@ -63,17 +61,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer -import com.elishaazaria.sayboard.AppPrefs -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.ime.recognizers.RecognizerState -import com.elishaazaria.sayboard.sayboardPreferenceModel -import com.elishaazaria.sayboard.theme.Green500 -import com.elishaazaria.sayboard.theme.Green700 -import com.elishaazaria.sayboard.theme.Orange700 -import com.elishaazaria.sayboard.theme.Orange900 -import com.elishaazaria.sayboard.theme.Shapes -import com.elishaazaria.sayboard.ui.utils.MyIconButton -import com.elishaazaria.sayboard.ui.utils.MyTextButton +import com.volla.vollaboard.AppPrefs +import com.volla.vollaboard.R +import com.volla.vollaboard.ime.recognizers.RecognizerState +import com.volla.vollaboard.sayboardPreferenceModel +import com.volla.vollaboard.theme.Shapes +import com.volla.vollaboard.ui.utils.MyIconButton +import com.volla.vollaboard.ui.utils.MyTextButton import dev.patrickgold.jetpref.datastore.model.observeAsState @SuppressLint("ViewConstructor") diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/Recognizer.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/Recognizer.kt similarity index 91% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/Recognizer.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/Recognizer.kt index 4418a92..fa0c4a0 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/Recognizer.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/Recognizer.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ime.recognizers +package com.volla.vollaboard.ime.recognizers import java.util.Locale interface Recognizer { diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/RecognizerSource.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/RecognizerSource.kt similarity index 87% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/RecognizerSource.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/RecognizerSource.kt index 672b0a3..45b47bf 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/RecognizerSource.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/RecognizerSource.kt @@ -1,10 +1,9 @@ -package com.elishaazaria.sayboard.ime.recognizers +package com.volla.vollaboard.ime.recognizers import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import java.util.concurrent.Executor -import java.util.* interface RecognizerSource { fun initialize(executor: Executor, onLoaded: Observer) diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/RecognizerState.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/RecognizerState.kt similarity index 61% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/RecognizerState.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/RecognizerState.kt index 8bac01a..b21ca04 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/RecognizerState.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/RecognizerState.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ime.recognizers +package com.volla.vollaboard.ime.recognizers enum class RecognizerState { NONE, LOADING, READY, IN_RAM, CLOSED, ERROR diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/VoskLocal.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/VoskLocal.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/VoskLocal.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/VoskLocal.kt index 696e199..959d73b 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/VoskLocal.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/VoskLocal.kt @@ -1,11 +1,11 @@ -package com.elishaazaria.sayboard.ime.recognizers +package com.volla.vollaboard.ime.recognizers import android.os.Handler import android.os.Looper import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer -import com.elishaazaria.sayboard.data.VoskLocalModel +import com.volla.vollaboard.data.VoskLocalModel import org.json.JSONException import org.json.JSONObject import org.vosk.Model diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/VoskServer.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/VoskServer.kt similarity index 98% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/VoskServer.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/VoskServer.kt index 025c8a3..d6984fc 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/VoskServer.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/VoskServer.kt @@ -1,6 +1,6 @@ -package com.elishaazaria.sayboard.ime.recognizers +package com.volla.vollaboard.ime.recognizers -import com.elishaazaria.sayboard.data.VoskServerData +import com.volla.vollaboard.data.VoskServerData import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import android.util.Log diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/Providers.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/Providers.kt similarity index 76% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/Providers.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/Providers.kt index a4651a0..d06b712 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/Providers.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/Providers.kt @@ -1,10 +1,10 @@ -package com.elishaazaria.sayboard.ime.recognizers.providers +package com.volla.vollaboard.ime.recognizers.providers import android.content.Context -import com.elishaazaria.sayboard.Tools -import com.elishaazaria.sayboard.data.InstalledModelReference -import com.elishaazaria.sayboard.data.ModelType -import com.elishaazaria.sayboard.ime.recognizers.RecognizerSource +import com.volla.vollaboard.Tools +import com.volla.vollaboard.data.InstalledModelReference +import com.volla.vollaboard.data.ModelType +import com.volla.vollaboard.ime.recognizers.RecognizerSource class Providers(context: Context) { private val voskLocalProvider: VoskLocalProvider diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/RecognizerSourceProvider.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/RecognizerSourceProvider.kt similarity index 51% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/RecognizerSourceProvider.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/RecognizerSourceProvider.kt index cb6dbf6..4132bf0 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/RecognizerSourceProvider.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/RecognizerSourceProvider.kt @@ -1,7 +1,7 @@ -package com.elishaazaria.sayboard.ime.recognizers.providers +package com.volla.vollaboard.ime.recognizers.providers -import com.elishaazaria.sayboard.data.InstalledModelReference -import com.elishaazaria.sayboard.ime.recognizers.RecognizerSource +import com.volla.vollaboard.data.InstalledModelReference +import com.volla.vollaboard.ime.recognizers.RecognizerSource interface RecognizerSourceProvider { fun getInstalledModels(): Collection diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/VoskLocalProvider.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/VoskLocalProvider.kt similarity index 76% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/VoskLocalProvider.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/VoskLocalProvider.kt index 7df55ca..4760a3e 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/VoskLocalProvider.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/VoskLocalProvider.kt @@ -1,12 +1,12 @@ -package com.elishaazaria.sayboard.ime.recognizers.providers +package com.volla.vollaboard.ime.recognizers.providers import android.content.Context -import com.elishaazaria.sayboard.Constants -import com.elishaazaria.sayboard.Tools -import com.elishaazaria.sayboard.data.InstalledModelReference -import com.elishaazaria.sayboard.data.ModelType -import com.elishaazaria.sayboard.ime.recognizers.RecognizerSource -import com.elishaazaria.sayboard.ime.recognizers.VoskLocal +import com.volla.vollaboard.Constants +import com.volla.vollaboard.Tools +import com.volla.vollaboard.data.InstalledModelReference +import com.volla.vollaboard.data.ModelType +import com.volla.vollaboard.ime.recognizers.RecognizerSource +import com.volla.vollaboard.ime.recognizers.VoskLocal import java.util.Locale class VoskLocalProvider(private val context: Context) : RecognizerSourceProvider { diff --git a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/VoskServerProvider.kt b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/VoskServerProvider.kt similarity index 62% rename from app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/VoskServerProvider.kt rename to app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/VoskServerProvider.kt index c68e502..74f5dc9 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ime/recognizers/providers/VoskServerProvider.kt +++ b/app/src/main/java/com/volla/vollaboard/ime/recognizers/providers/VoskServerProvider.kt @@ -1,7 +1,7 @@ -package com.elishaazaria.sayboard.ime.recognizers.providers +package com.volla.vollaboard.ime.recognizers.providers -import com.elishaazaria.sayboard.data.InstalledModelReference -import com.elishaazaria.sayboard.ime.recognizers.RecognizerSource +import com.volla.vollaboard.data.InstalledModelReference +import com.volla.vollaboard.ime.recognizers.RecognizerSource class VoskServerProvider : RecognizerSourceProvider { override fun getInstalledModels(): List { diff --git a/app/src/main/java/com/elishaazaria/sayboard/theme/Color.kt b/app/src/main/java/com/volla/vollaboard/theme/Color.kt similarity index 81% rename from app/src/main/java/com/elishaazaria/sayboard/theme/Color.kt rename to app/src/main/java/com/volla/vollaboard/theme/Color.kt index f9093c2..c386d8f 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/theme/Color.kt +++ b/app/src/main/java/com/volla/vollaboard/theme/Color.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.theme +package com.volla.vollaboard.theme import androidx.compose.ui.graphics.Color val Green500 = Color(0xFF4CAF50) diff --git a/app/src/main/java/com/elishaazaria/sayboard/theme/Shape.kt b/app/src/main/java/com/volla/vollaboard/theme/Shape.kt similarity index 87% rename from app/src/main/java/com/elishaazaria/sayboard/theme/Shape.kt rename to app/src/main/java/com/volla/vollaboard/theme/Shape.kt index afcbb68..fe9cd5f 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/theme/Shape.kt +++ b/app/src/main/java/com/volla/vollaboard/theme/Shape.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.theme +package com.volla.vollaboard.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Shapes diff --git a/app/src/main/java/com/elishaazaria/sayboard/theme/Theme.kt b/app/src/main/java/com/volla/vollaboard/theme/Theme.kt similarity index 96% rename from app/src/main/java/com/elishaazaria/sayboard/theme/Theme.kt rename to app/src/main/java/com/volla/vollaboard/theme/Theme.kt index 595cf2d..3aa3889 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/theme/Theme.kt +++ b/app/src/main/java/com/volla/vollaboard/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.theme +package com.volla.vollaboard.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material.MaterialTheme diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/ColorPickerPreference.kt b/app/src/main/java/com/volla/vollaboard/ui/ColorPickerPreference.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/ui/ColorPickerPreference.kt rename to app/src/main/java/com/volla/vollaboard/ui/ColorPickerPreference.kt index eac3efe..6f53bef 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/ColorPickerPreference.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/ColorPickerPreference.kt @@ -1,9 +1,8 @@ -package com.elishaazaria.sayboard.ui +package com.volla.vollaboard.ui import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding @@ -23,7 +22,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.elishaazaria.sayboard.R +import com.volla.vollaboard.R import dev.patrickgold.jetpref.datastore.model.PreferenceData import dev.patrickgold.jetpref.datastore.model.PreferenceModel import dev.patrickgold.jetpref.datastore.ui.PreferenceUiScope diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/GrantPermissionsUi.kt b/app/src/main/java/com/volla/vollaboard/ui/GrantPermissionsUi.kt similarity index 94% rename from app/src/main/java/com/elishaazaria/sayboard/ui/GrantPermissionsUi.kt rename to app/src/main/java/com/volla/vollaboard/ui/GrantPermissionsUi.kt index 48eadfb..e7277b8 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/GrantPermissionsUi.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/GrantPermissionsUi.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ui +package com.volla.vollaboard.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -10,7 +10,7 @@ import androidx.compose.runtime.State import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import com.elishaazaria.sayboard.R +import com.volla.vollaboard.R @Composable public fun GrantPermissionUi( diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/KeyboardSettingsUi.kt b/app/src/main/java/com/volla/vollaboard/ui/KeyboardSettingsUi.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/ui/KeyboardSettingsUi.kt rename to app/src/main/java/com/volla/vollaboard/ui/KeyboardSettingsUi.kt index 4a1752a..5cd4a76 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/KeyboardSettingsUi.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/KeyboardSettingsUi.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ui +package com.volla.vollaboard.ui import android.util.Log import androidx.compose.animation.core.animateDpAsState @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width @@ -33,10 +32,10 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.elishaazaria.sayboard.AppPrefs -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.sayboardPreferenceModel -import com.elishaazaria.sayboard.utils.Key +import com.volla.vollaboard.AppPrefs +import com.volla.vollaboard.R +import com.volla.vollaboard.sayboardPreferenceModel +import com.volla.vollaboard.utils.Key import dev.patrickgold.jetpref.datastore.model.PreferenceData import dev.patrickgold.jetpref.datastore.model.observeAsState import dev.patrickgold.jetpref.datastore.ui.DialogSliderPreference diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/LogicSettingsUi.kt b/app/src/main/java/com/volla/vollaboard/ui/LogicSettingsUi.kt similarity index 89% rename from app/src/main/java/com/elishaazaria/sayboard/ui/LogicSettingsUi.kt rename to app/src/main/java/com/volla/vollaboard/ui/LogicSettingsUi.kt index a376541..f7abb12 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/LogicSettingsUi.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/LogicSettingsUi.kt @@ -1,10 +1,10 @@ -package com.elishaazaria.sayboard.ui +package com.volla.vollaboard.ui import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.data.KeepScreenAwakeMode -import com.elishaazaria.sayboard.sayboardPreferenceModel +import com.volla.vollaboard.R +import com.volla.vollaboard.data.KeepScreenAwakeMode +import com.volla.vollaboard.sayboardPreferenceModel import dev.patrickgold.jetpref.datastore.ui.ListPreference import dev.patrickgold.jetpref.datastore.ui.ScrollablePreferenceLayout import dev.patrickgold.jetpref.datastore.ui.SwitchPreference diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/ModelsSettingsUi.kt b/app/src/main/java/com/volla/vollaboard/ui/ModelsSettingsUi.kt similarity index 95% rename from app/src/main/java/com/elishaazaria/sayboard/ui/ModelsSettingsUi.kt rename to app/src/main/java/com/volla/vollaboard/ui/ModelsSettingsUi.kt index 222d09d..f23e1de 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/ModelsSettingsUi.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/ModelsSettingsUi.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ui +package com.volla.vollaboard.ui import android.Manifest import android.content.Intent @@ -57,24 +57,24 @@ import androidx.compose.ui.window.DialogProperties import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.lifecycle.MutableLiveData -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.SettingsActivity -import com.elishaazaria.sayboard.Tools -import com.elishaazaria.sayboard.data.ModelLink -import com.elishaazaria.sayboard.downloader.FileDownloader -import com.elishaazaria.sayboard.downloader.messages.CancelCurrent -import com.elishaazaria.sayboard.downloader.messages.CancelFinished -import com.elishaazaria.sayboard.downloader.messages.CancelPending -import com.elishaazaria.sayboard.downloader.messages.DownloadError -import com.elishaazaria.sayboard.downloader.messages.DownloadProgress -import com.elishaazaria.sayboard.downloader.messages.DownloadState -import com.elishaazaria.sayboard.downloader.messages.ModelInfo -import com.elishaazaria.sayboard.downloader.messages.State -import com.elishaazaria.sayboard.downloader.messages.Status -import com.elishaazaria.sayboard.downloader.messages.StatusQuery -import com.elishaazaria.sayboard.downloader.messages.UnzipProgress -import com.elishaazaria.sayboard.ime.recognizers.providers.Providers -import com.elishaazaria.sayboard.sayboardPreferenceModel +import com.volla.vollaboard.R +import com.volla.vollaboard.SettingsActivity +import com.volla.vollaboard.Tools +import com.volla.vollaboard.data.ModelLink +import com.volla.vollaboard.downloader.FileDownloader +import com.volla.vollaboard.downloader.messages.CancelCurrent +import com.volla.vollaboard.downloader.messages.CancelFinished +import com.volla.vollaboard.downloader.messages.CancelPending +import com.volla.vollaboard.downloader.messages.DownloadError +import com.volla.vollaboard.downloader.messages.DownloadProgress +import com.volla.vollaboard.downloader.messages.DownloadState +import com.volla.vollaboard.downloader.messages.ModelInfo +import com.volla.vollaboard.downloader.messages.State +import com.volla.vollaboard.downloader.messages.Status +import com.volla.vollaboard.downloader.messages.StatusQuery +import com.volla.vollaboard.downloader.messages.UnzipProgress +import com.volla.vollaboard.ime.recognizers.providers.Providers +import com.volla.vollaboard.sayboardPreferenceModel import dev.patrickgold.jetpref.datastore.model.observeAsState import dev.patrickgold.jetpref.material.ui.JetPrefAlertDialog import org.burnoutcrew.reorderable.ReorderableItem diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/UISettingsUi.kt b/app/src/main/java/com/volla/vollaboard/ui/UISettingsUi.kt similarity index 93% rename from app/src/main/java/com/elishaazaria/sayboard/ui/UISettingsUi.kt rename to app/src/main/java/com/volla/vollaboard/ui/UISettingsUi.kt index 0739511..56a2f04 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/UISettingsUi.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/UISettingsUi.kt @@ -1,9 +1,9 @@ -package com.elishaazaria.sayboard.ui +package com.volla.vollaboard.ui import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import com.elishaazaria.sayboard.R -import com.elishaazaria.sayboard.sayboardPreferenceModel +import com.volla.vollaboard.R +import com.volla.vollaboard.sayboardPreferenceModel import dev.patrickgold.jetpref.datastore.model.observeAsState import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup import dev.patrickgold.jetpref.datastore.ui.ScrollablePreferenceLayout diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/utils/MyIconButton.kt b/app/src/main/java/com/volla/vollaboard/ui/utils/MyIconButton.kt similarity index 93% rename from app/src/main/java/com/elishaazaria/sayboard/ui/utils/MyIconButton.kt rename to app/src/main/java/com/volla/vollaboard/ui/utils/MyIconButton.kt index d94b96e..9375836 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/utils/MyIconButton.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/utils/MyIconButton.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ui.utils +package com.volla.vollaboard.ui.utils import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -6,14 +6,12 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.material.ContentAlpha import androidx.compose.material.LocalContentAlpha -import androidx.compose.material.MaterialTheme import androidx.compose.material.minimumInteractiveComponentSize import androidx.compose.material.ripple.rememberRipple import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -21,7 +19,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.semantics.Role -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/elishaazaria/sayboard/ui/utils/MyTextButton.kt b/app/src/main/java/com/volla/vollaboard/ui/utils/MyTextButton.kt similarity index 97% rename from app/src/main/java/com/elishaazaria/sayboard/ui/utils/MyTextButton.kt rename to app/src/main/java/com/volla/vollaboard/ui/utils/MyTextButton.kt index b112df3..546059f 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/ui/utils/MyTextButton.kt +++ b/app/src/main/java/com/volla/vollaboard/ui/utils/MyTextButton.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.ui.utils +package com.volla.vollaboard.ui.utils import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/app/src/main/java/com/elishaazaria/sayboard/utils/KeysListPreference.kt b/app/src/main/java/com/volla/vollaboard/utils/KeysListPreference.kt similarity index 95% rename from app/src/main/java/com/elishaazaria/sayboard/utils/KeysListPreference.kt rename to app/src/main/java/com/volla/vollaboard/utils/KeysListPreference.kt index 83d91a5..dbff41b 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/utils/KeysListPreference.kt +++ b/app/src/main/java/com/volla/vollaboard/utils/KeysListPreference.kt @@ -1,4 +1,4 @@ -package com.elishaazaria.sayboard.utils +package com.volla.vollaboard.utils import dev.patrickgold.jetpref.datastore.model.PreferenceSerializer import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/elishaazaria/sayboard/utils/ModelListPreference.kt b/app/src/main/java/com/volla/vollaboard/utils/ModelListPreference.kt similarity index 85% rename from app/src/main/java/com/elishaazaria/sayboard/utils/ModelListPreference.kt rename to app/src/main/java/com/volla/vollaboard/utils/ModelListPreference.kt index 1770762..aad6c46 100644 --- a/app/src/main/java/com/elishaazaria/sayboard/utils/ModelListPreference.kt +++ b/app/src/main/java/com/volla/vollaboard/utils/ModelListPreference.kt @@ -1,6 +1,6 @@ -package com.elishaazaria.sayboard.utils +package com.volla.vollaboard.utils -import com.elishaazaria.sayboard.data.InstalledModelReference +import com.volla.vollaboard.data.InstalledModelReference import dev.patrickgold.jetpref.datastore.model.PreferenceSerializer import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.json.Json