Rename package to com.volla.vollaboard

.github/workflows/build.yml

@@ -0,0 +1,59 @@
+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 \;
+
+    - name: Upload Apk to Nightly Repository
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      uses: wlixcc/[email protected]
+      with:
+        username: 'drone'
+        server: 'volla.tech'
+        port: 22
+        ssh_private_key: '${{ secrets.FDROID_DEPLOY_KEY }}'
+        local_path: './releases/*.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/[email protected]
+      with:
+        username: 'drone'
+        server: 'volla.tech'
+        port: 22
+        ssh_private_key: '${{ secrets.FDROID_DEPLOY_KEY }}'
+        local_path: './releases/*.apk'
+        remote_path: '/fdroid.volla.tech/builds/volla/vollaboard/'
+        args: '-o CheckHostIP=no -o StrictHostKeyChecking=no'

README.md

@@ -1,12 +1,6 @@
-<img align="left" width="80" height="80"
-src="app/src/main/ic_launcher-playstore.png" alt="App icon">
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on F-Droid"
-    height="80">](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).
 

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 {

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
         tools:targetApi="s">
 
         <service
-            android:name="com.elishaazaria.sayboard.ime.IME"
+            android:name="com.volla.vollaboard.ime.IME"
             android:exported="true"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_INPUT_METHOD">
@@ -33,7 +33,7 @@
         </service>
 
         <activity
-            android:name="com.elishaazaria.sayboard.SettingsActivity"
+            android:name="com.volla.vollaboard.SettingsActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -47,7 +47,7 @@
         </activity>
 
         <service
-            android:name="com.elishaazaria.sayboard.downloader.FileDownloadService"
+            android:name="com.volla.vollaboard.downloader.FileDownloadService"
             android:enabled="true" />
     </application>
 

app/src/main/java/com/elishaazaria/sayboard/AppCtx.kt → 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

app/src/main/java/com/elishaazaria/sayboard/AppPrefs.kt → 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
 

app/src/main/java/com/elishaazaria/sayboard/Constants.kt → 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

app/src/main/java/com/elishaazaria/sayboard/SayboardApplication.kt → 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
 

app/src/main/java/com/elishaazaria/sayboard/SettingsActivity.kt → 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() {
 

app/src/main/java/com/elishaazaria/sayboard/Tools.kt → 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

app/src/main/java/com/elishaazaria/sayboard/data/InstalledModelReference.kt → 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
 

app/src/main/java/com/elishaazaria/sayboard/data/ModelLink.kt → 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.*
 

app/src/main/java/com/elishaazaria/sayboard/data/ModelType.kt → 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
 

app/src/main/java/com/elishaazaria/sayboard/data/SimpleEnums.kt → 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 {

app/src/main/java/com/elishaazaria/sayboard/data/VoskLocalModel.kt → 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.*

app/src/main/java/com/elishaazaria/sayboard/data/VoskServerData.kt → 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

app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloadService.kt → 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

app/src/main/java/com/elishaazaria/sayboard/downloader/FileDownloader.kt → 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 {

app/src/main/java/com/elishaazaria/sayboard/downloader/ZipTools.kt → 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

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)

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)

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)

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadError.kt → 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)

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadProgress.kt → 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)

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/DownloadState.kt → 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)

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/ModelInfo.kt → 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.*
 

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/State.kt → 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

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/Status.kt → 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.*
 

app/src/main/java/com/volla/vollaboard/downloader/messages/StatusQuery.kt

@@ -0,0 +1,3 @@
+package com.volla.vollaboard.downloader.messages
+
+class StatusQuery

app/src/main/java/com/elishaazaria/sayboard/downloader/messages/UnzipProgress.kt → 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)