Fix Sounds, Added change alpha component, CMake, Some code cleanup, U…

…pdate Libs
DerTyp7214 · Jul 15, 2022 · 5d24ea6 · 5d24ea6
2 parents dacf6aa + 483c5f8
commit 5d24ea6
Show file tree

Hide file tree

Showing 28 changed files with 120 additions and 139 deletions.
diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
@@ -20,19 +20,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3.0.2
+        with:
+          submodules: recursive
+
+      - uses: nttld/setup-ndk@v1.0.6
+        with:
+          ndk-version: r24
 
       - name: Get Commit Message
         id: commitMessage
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         if: ${{ false }}
         with:
           path: |
@@ -43,7 +49,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -64,7 +70,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.2.0
+        uses: gradle/gradle-build-action@v2.2.1
         with:
           gradle-version: wrapper
           arguments: assembleDebug
@@ -143,19 +149,25 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3.0.2
+        with:
+          submodules: recursive
+
+      - uses: nttld/setup-ndk@v1.0.6
+        with:
+          ndk-version: r24
 
       - name: Get Commit Message
         id: commitMessage
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         if: ${{ false }}
         with:
           path: |
@@ -166,7 +178,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -187,7 +199,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.2.0
+        uses: gradle/gradle-build-action@v2.2.1
         with:
           gradle-version: wrapper
           arguments: assembleRelease

diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
@@ -10,13 +10,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3.0.2
+        with:
+          submodules: recursive
+
+      - uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23
 
       - name: Get Commit Message
         id: commitMessage
         run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17
@@ -32,7 +38,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -48,7 +54,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.2.0
+        uses: gradle/gradle-build-action@v2.2.1
         with:
           gradle-version: wrapper
           arguments: assemblePro

diff --git a/.github/workflows/createPullRequest.yml b/.github/workflows/createPullRequest.yml
@@ -12,6 +12,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3.0.2
         with:
+          submodules: recursive
           fetch-depth: 0
 
       - name: Download Pull Request template

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
@@ -17,15 +17,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3.0.2
+        with:
+          submodules: recursive
+
+      - uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         with:
           path: |
             ~/.gradle/caches
@@ -35,7 +41,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Cache build cache
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.5
         with:
           path: |
             ${{ github.workspace }}/.ccache
@@ -51,7 +57,7 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/gradle-build-action@v2.2.0
+        uses: gradle/gradle-build-action@v2.2.1
         with:
           gradle-version: wrapper
           wrapper-cache-enabled: true

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "colorutilsc"]
+	path = colorutilsc
+	url = git@github.com:DerTyp7214/ColorUtilsC.git
+[submodule "mathc"]
+	path = mathc
+	url = git@github.com:DerTyp7214/MathC.git
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,11 +1,8 @@
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
-//import com.google.protobuf.gradle.*
-
 plugins {
     id("com.android.application")
     id("com.google.gms.google-services")
-    //id("com.google.protobuf")
     id("kotlin-android-extensions")
     kotlin("android")
     kotlin("kapt")
@@ -14,6 +11,7 @@ plugins {
 val libsuVersion = "5.0.2"
 val kotlinVersion: String = project.getKotlinPluginVersion()
 
+@Suppress("UnstableApiUsage")
 android {
     compileSdk = 33
     buildToolsVersion = "33.0.0"
@@ -24,8 +22,8 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 23
         targetSdk = 33
-        versionCode = 353000
-        versionName = "3.5.3"
+        versionCode = 354000
+        versionName = "3.5.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -45,6 +43,7 @@ android {
         create("pro") {
             initWith(getByName("release"))
             applicationIdSuffix = ".pro"
+            matchingFallbacks += listOf("")
         }
     }
     compileOptions {
@@ -64,38 +63,17 @@ android {
     namespace = "de.dertyp7214.rboardthememanager"
 }
 
-/*protobuf {
-    protoc {
-        artifact = "com.google.protobuf:protoc:4.0.0-rc-2"
-    }
-
-    plugins {
-        id("javalite") {
-            artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
-        }
-        id("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.45.0"
-        }
-    }
-
-    generateProtoTasks {
-        all().forEach {
-            it.plugins {
-                id("javalite")
-                id("grpc")
-            }
-        }
-    }
-}*/
-
 dependencies {
-    implementation(platform("com.google.firebase:firebase-bom:30.1.0"))
-    implementation("com.google.firebase:firebase-messaging-ktx:23.0.5")
+    implementation(project(":colorutilsc"))
+    implementation(project(":mathc"))
+
+    implementation(platform("com.google.firebase:firebase-bom:30.2.0"))
+    implementation("com.google.firebase:firebase-messaging-ktx:23.0.6")
     implementation("com.google.firebase:firebase-analytics-ktx:21.0.0")
 
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.0-rc02")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.0-rc02")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.5.0")
+    implementation("androidx.navigation:navigation-ui-ktx:2.5.0")
     implementation("org.apache.commons:commons-text:1.9")
 
     implementation("com.github.topjohnwu.libsu:core:$libsuVersion")
@@ -104,41 +82,29 @@ dependencies {
     implementation("dev.chrisbanes.insetter:insetter:0.6.1")
     implementation("androidx.core:core-ktx:1.9.0-alpha05")
     //noinspection DifferentStdlibGradleVersion
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10")
     implementation("androidx.core:core:1.9.0-alpha05")
-    implementation("com.google.android.material:material:1.7.0-alpha02")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha02")
+    implementation("com.google.android.material:material:1.7.0-alpha03")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha03")
     implementation("androidx.preference:preference-ktx:1.2.0")
     implementation("androidx.activity:activity-ktx:1.6.0-alpha05")
-    implementation("androidx.fragment:fragment-ktx:1.5.0-rc01")
+    implementation("androidx.fragment:fragment-ktx:1.5.0")
     implementation("com.jaredrummler:android-shell:1.0.0")
     implementation("com.google.firebase:firebase-analytics:21.0.0")
-    implementation("com.google.firebase:firebase-messaging:23.0.5")
+    implementation("com.google.firebase:firebase-messaging:23.0.6")
     implementation("com.google.code.gson:gson:2.9.0")
     implementation("com.bignerdranch.android:simple-item-decoration:1.0.0")
     implementation("de.dertyp7214:PRDownloader:v0.6.0")
-    implementation("com.github.skydoves:balloon:1.4.6-SNAPSHOT")
+    implementation("com.github.skydoves:balloon:1.4.7-SNAPSHOT")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.4-alpha07")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0-alpha07")
     implementation("androidx.browser:browser:1.4.0")
     implementation("com.github.bumptech.glide:glide:4.13.2")
     kapt("com.github.bumptech.glide:compiler:4.13.2")
-    implementation("de.dertyp7214:PreferencesPlus:1.1")
     implementation("com.github.murgupluoglu:flagkit-android:1.0.2")
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
-    debugImplementation("androidx.compose.ui:ui-tooling:1.2.0-rc01")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.0")
-
-    /*var grpc_version = "1.45.0"
-    implementation("io.grpc:grpc-android:$grpc_version")
-    implementation("io.grpc:grpc-okhttp:$grpc_version")
-    implementation("io.grpc:grpc-protobuf-lite:$grpc_version")
-    implementation("io.grpc:grpc-stub:$grpc_version")
-
-    var javax_annotation_version = "1.3.2"
-    implementation("javax.annotation:javax.annotation-api:$javax_annotation_version")
-
-    implementation("com.google.protobuf:protobuf-kotlin:3.20.0-rc-1")*/
+    debugImplementation("androidx.compose.ui:ui-tooling:1.3.0-alpha01")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.10")
 }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
@@ -13,6 +13,7 @@ import androidx.preference.PreferenceManager
 import com.dertyp7214.logs.helpers.Logger
 import com.downloader.PRDownloader
 import com.topjohnwu.superuser.Shell
+import de.dertyp7214.colorutilsc.ColorUtilsC
 import de.dertyp7214.rboardthememanager.core.hasRoot
 import de.dertyp7214.rboardthememanager.core.isReachable
 import de.dertyp7214.rboardthememanager.utils.GboardUtils
@@ -22,6 +23,10 @@ import java.net.URL
 
 class Application : Application() {
 
+    init {
+        ColorUtilsC.init()
+    }
+
     companion object {
         var context: Application? = null
             private set