diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0dbb556..cd58a78 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
- uses: nttld/setup-ndk@v1
with:
- ndk-version: r27c
+ ndk-version: r28
- name: Get Commit Message
id: commitMessage
@@ -67,12 +67,13 @@ jobs:
- name: Accept Preview SDK License
run: echo -n -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > /usr/local/lib/android/sdk/licenses/android-sdk-preview-license
- - name: Build apk
+ - name: Build Bundle
id: buildAllApks
- uses: gradle/actions/setup-gradle@v3
+ uses: gradle/actions/setup-gradle@v4
with:
- gradle-version: wrapper
- arguments: assembleRelease
+ gradle-version: wrapper
+ - name: bundleRelease the project
+ run: ./gradlew bundleRelease
- name: Get JSON
id: metadataJson
@@ -92,7 +93,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
- buildToolsVersion: '36.0.0-rc1'
+ buildToolsVersion: '36.0.0'
- name: List files
diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml
index 9add981..c3828c4 100644
--- a/.github/workflows/playstore.yml
+++ b/.github/workflows/playstore.yml
@@ -23,7 +23,7 @@ jobs:
- uses: nttld/setup-ndk@v1
with:
- ndk-version: r27c
+ ndk-version: r28
- name: Setup JDK
uses: actions/setup-java@v4
@@ -73,7 +73,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
- buildToolsVersion: '36.0.0-rc1'
+ buildToolsVersion: '36.0.0'
- name: Upload Artifact
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 17f68e0..c66c05a 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -11,6 +11,6 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ee9451e..660b47e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,17 +7,17 @@ plugins {
android {
namespace = "de.dertyp7214.rboardthemecreator"
- compileSdkPreview = "Baklava"
+ compileSdk = 36
- buildToolsVersion = "36.0.0 rc1"
+ buildToolsVersion = "36.0.0"
buildFeatures.buildConfig = true
defaultConfig {
applicationId = "de.dertyp7214.rboardthemecreator"
minSdk = 26
- targetSdk = 35
- versionCode = 132003
- versionName = "1.3.2"
+ targetSdk = 36
+ versionCode = 133000
+ versionName = "1.3.3"
vectorDrawables.useSupportLibrary = true
}
diff --git a/app/src/main/java/de/dertyp7214/rboardthemecreator/components/HexColorAdapter.kt b/app/src/main/java/de/dertyp7214/rboardthemecreator/components/HexColorAdapter.kt
index b31e532..06f2955 100644
--- a/app/src/main/java/de/dertyp7214/rboardthemecreator/components/HexColorAdapter.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthemecreator/components/HexColorAdapter.kt
@@ -18,6 +18,7 @@ import de.dertyp7214.rboardthemecreator.core.openDialog
import de.dertyp7214.rboardthemecreator.core.toHex
import java.util.Locale
import java.util.regex.Pattern
+import androidx.core.graphics.toColorInt
class HexColorAdapter(
private val activity: Activity,
@@ -106,9 +107,9 @@ class HexColorAdapter(
private fun parseColor(string: String): Int {
return try {
- Color.parseColor(string.let {
+ string.let {
if (it.startsWith("#")) it else "#$it"
- })
+ }.toColorInt()
} catch (_: Exception) {
Color.RED
}
diff --git a/app/src/main/java/de/dertyp7214/rboardthemecreator/core/Activity.kt b/app/src/main/java/de/dertyp7214/rboardthemecreator/core/Activity.kt
index f517bc1..e3848ba 100644
--- a/app/src/main/java/de/dertyp7214/rboardthemecreator/core/Activity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthemecreator/core/Activity.kt
@@ -22,6 +22,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.preference.PreferenceManager
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import de.dertyp7214.rboardthemecreator.R
+import androidx.core.net.toUri
val Activity.preferences: SharedPreferences
get() = PreferenceManager.getDefaultSharedPreferences(this)
@@ -48,7 +49,7 @@ fun Activity.openUrl(url: String) {
.build()
)
.build()
- .launchUrl(this, Uri.parse(url))
+ .launchUrl(this, url.toUri())
}
fun Activity.openDialog(
diff --git a/app/src/main/java/de/dertyp7214/rboardthemecreator/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthemecreator/screens/MainActivity.kt
index a2a830d..11b5880 100644
--- a/app/src/main/java/de/dertyp7214/rboardthemecreator/screens/MainActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthemecreator/screens/MainActivity.kt
@@ -36,6 +36,7 @@ import de.dertyp7214.rboardthemecreator.utils.AppStartUp
import de.dertyp7214.rboardthemecreator.utils.RepoHelper
import de.dertyp7214.rboardthemecreator.utils.ThemeUtils
import de.dertyp7214.rboardthemecreator.utils.doInBackground
+import androidx.core.view.isVisible
@SuppressLint("NotifyDataSetChanged")
class MainActivity : AppCompatActivity() {
@@ -359,9 +360,9 @@ class MainActivity : AppCompatActivity() {
if (usingHex) return themeColors.apply { this.template = this@MainActivity.template }
val dBool = darkMode.isChecked
- val mBool = monet.visibility == View.VISIBLE && monet.isChecked
- val tBool = mBool && tertiary.visibility == View.VISIBLE && tertiary.isChecked
- val aBool = amoled.visibility == View.VISIBLE && dBool && amoled.isChecked
+ val mBool = monet.isVisible && monet.isChecked
+ val tBool = mBool && tertiary.isVisible && tertiary.isChecked
+ val aBool = amoled.isVisible && dBool && amoled.isChecked
return ThemeUtils.buildColorSets(
this, getColor(),
diff --git a/build.gradle.kts b/build.gradle.kts
index 2631731..52658e2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ buildscript {
classpath(libs.gradle)
classpath(libs.r8)
//noinspection DifferentKotlinGradleVersion
- classpath(kotlin("gradle-plugin", version = "2.1.0-RC2"))
+ classpath(kotlin("gradle-plugin", version = "2.1.10"))
classpath(libs.kotlin.gradle.plugin)
}
}
diff --git a/colorutilsc b/colorutilsc
index e09008d..ba0610b 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit e09008dfe95a440f378fc213ff20815396d296e7
+Subproject commit ba0610bb41b4bb48bd69e4b16940c98fb8f87abc
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a011d30..5fddc0e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,38 +1,38 @@
[versions]
-activity-ktx = "1.10.0-beta01"
+activity-ktx = "1.10.1"
android-shell = "1.0.0"
appcompat = "1.7.0"
-browser = "1.8.0"
-commons-text = "1.12.0"
-constraintlayout = "2.2.0"
-core = "1.15.0"
-core-ktx = "1.15.0"
-desugar_jdk_libs_nio = "2.1.3"
+browser = "1.9.0-alpha01"
+commons-text = "1.13.0"
+constraintlayout = "2.2.1"
+core = "1.16.0-beta01"
+core-ktx = "1.16.0-beta01"
+desugar_jdk_libs_nio = "2.1.5"
espresso-core = "3.6.1"
-firebase-bom = "33.6.0"
-firebase-analytics-ktx = "22.1.2"
+firebase-bom = "33.10.0"
+firebase-analytics-ktx = "22.3.0"
firebase-messaging-ktx = "24.1.0"
-fragment-ktx = "1.8.5"
+fragment-ktx = "1.8.6"
github-ksp = "5.0.0-SNAPSHOT"
-gradle = "8.9.0-alpha03"
-gson = "2.11.0"
+gradle = "8.11.0-alpha01"
+gson = "2.12.1"
insetter = "0.6.1"
junit = "1.2.1"
junit-junit = "4.13.2"
-kotlin-gradle-plugin = "2.1.0-RC2"
-kotlin-reflect = "2.1.0-RC2"
-material = "1.12.0"
-navigation-ui-ktx = "2.9.0-alpha03"
-navigation-fragment-ktx = "2.9.0-alpha03"
+kotlin-gradle-plugin = "2.1.10"
+kotlin-reflect = "2.1.10"
+material = "1.13.0-alpha11"
+navigation-ui-ktx = "2.9.0-alpha08"
+navigation-fragment-ktx = "2.9.0-alpha08"
legacy-support-v4 = "1.0.0"
pikolo = "2.0.2"
prdownloader = "v0.6.0"
preference-ktx = "1.2.1"
-r8 = "8.8.19"
+r8 = "8.10.13"
simple-item-decoration = "1.0.0"
vectorchildfinder = "1.0.0"
-webkit = "1.13.0-alpha01"
-kspPlugin = "2.1.0-RC2-1.0.28"
+webkit = "1.13.0"
+kspPlugin = "2.1.10-1.0.31"
[libraries]
android-shell = { module = "com.jaredrummler:android-shell", version.ref = "android-shell" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e6acca1..61876fc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 20 13:12:21 CET 2024
+#Thu Feb 27 14:10:19 CET 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/rboardcomponents b/rboardcomponents
index f23f83d..3bebc8f 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit f23f83da287e34b6f75f90639e1e115de44141fb
+Subproject commit 3bebc8f5fe658fba77bc30d41c2ad67741390c74