Update Libs, Kotlin 2.x.y, Bump VersionCode to 391007, Fix In-App Theme

New dependencies changes:
• Update androidx.activity:activity-ktx to 1.8.1
• Update androidx.browser:browser to 1.8.0-alpha01
• Update androidx.compose.ui:ui-tooling to 1.6.0-beta01
• Update androidx.lifecycle:lifecycle-viewmodel-ktx to 2.7.0-rc01
• Update androidx.navigation:navigation-ui-ktx to 2.7.5
• Update androidx.navigation:navigation-fragment-ktx to 2.7.5
• Update com.android.tools.build:gradle to 8.3.0-alpha14
• Update com.android.tools:desugar_jdk_libs_nio to 2.0.4
• Update com.github.skydoves:balloon to 1.6.3-SNAPSHOT
• Update com.google.firebase:firebase-bom to 32.5.0
• Update com.google.android.material:material to 1.12.0-alpha01
• Update com.google.devtools.ksp to 2.0.0-Beta1-1.0.14
• Update org.jetbrains.kotlin:kotlin-gradle-plugin to 2.0.0-Beta1
• Update org.jetbrains.kotlin:kotlin-reflect to 2.0.0-Beta1
• Update org.jetbrains.kotlin:kotlin-stdlib to 2.0.0-Beta1

Others Changes:
• Update versionCode to 391007
• Update gradle-plugin to 2.0.0-Beta1
• Update Kotlin to 2.0.0-Beta1

app/build.gradle.kts

@@ -21,7 +21,7 @@ android {
         // Update the minSdk if old Android Versions are no longer supported on the Gboard side.
         minSdk = 23
         targetSdk = 34
-        versionCode = 391006
+        versionCode = 391007
         versionName = "3.9.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt

@@ -400,9 +400,9 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
                         when (item.key) {
                             "app_style" -> {
                                 summaryRes = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
-                                    de.dertyp7214.rboardthememanager.screens.ThemeChangerActivity.Companion.APP_THEMES.toList()
+                                    de.dertyp7214.rboardthememanager.screens.ThemeChangerActivity.Companion.APP_THEMES_Q.toList()
                                         .first {
-                                            it.second == ThemeUtils.getStyleName(activity)
+                                            it.second == de.dertyp7214.rboardthememanager.screens.ThemeChangerActivity.Companion.getStyleName(activity)
                                         }.first
                                 } else {
                                     ThemeUtils.APP_THEMES.toList()

app/src/main/java/de/dertyp7214/rboardthememanager/screens/ThemeChangerActivity.kt

@@ -14,9 +14,9 @@ import androidx.viewpager.widget.ViewPager
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.color.DynamicColors
 import de.dertyp7214.rboardcomponents.core.applyThemeOverlay
+import de.dertyp7214.rboardcomponents.core.preferences
 import de.dertyp7214.rboardcomponents.utils.THEMES
 import de.dertyp7214.rboardcomponents.utils.ThemeUtils
-import de.dertyp7214.rboardcomponents.utils.ThemeUtils.getStyleName
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.core.applyTheme
 import de.dertyp7214.rboardthememanager.core.capitalize
@@ -43,7 +43,7 @@ class ThemeChangerActivity : AppCompatActivity() {
         val dotsIndicator = binding.wormDotsIndicator
 
         val themes = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
-            APP_THEMES.toList()
+            APP_THEMES_Q.toList()
         }
         else{
             ThemeUtils.APP_THEMES.toList()
@@ -116,7 +116,16 @@ class ThemeChangerActivity : AppCompatActivity() {
                 }) else it
             }
         }
-        val APP_THEMES =
+        fun getStyleName(context: Context): String {
+            return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
+                context.preferences.getString("app_style", "default_style")
+                    ?: "default_style"
+            } else{
+                context.preferences.getString("app_style", THEMES.DEFAULT.name)
+                    ?: THEMES.DEFAULT.name
+            }
+        }
+        val APP_THEMES_Q =
             mapOf(
                 de.dertyp7214.rboardcomponents.R.string.style_amoled to "amoled_style",
                 de.dertyp7214.rboardcomponents.R.string.style_apocyan to "apocyan_style",

build.gradle.kts

@@ -16,7 +16,7 @@ buildscript {
     dependencies {
         classpath(libs.gradle)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "1.9.20"))
+        classpath(kotlin("gradle-plugin", version = "2.0.0-Beta1"))
         classpath(libs.google.services)
     }
 }

gradle.properties

@@ -22,4 +22,5 @@ kotlin.code.style=official
 android.injected.testOnly=false
 org.gradle.caching=false
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonFinalResIds=false
+kapt.use.k2=true

gradle/libs.versions.toml

@@ -1,44 +1,44 @@
 [versions]
-activity-ktx = "1.8.0"
+activity-ktx = "1.8.1"
 android-shell = "1.0.0"
 androidx-junit = "1.2.0-alpha01"
 appcompat = "1.7.0-alpha03"
-balloon = "1.6.2-SNAPSHOT"
-browser = "1.7.0-beta01"
+balloon = "1.6.3-SNAPSHOT"
+browser = "1.8.0-alpha01"
 commons-text = "1.11.0"
 constraintlayout = "2.2.0-alpha13"
 core = "1.13.0-alpha01"
 core-ktx = "1.13.0-alpha01"
-desugar_jdk_libs_nio = "2.0.3"
+desugar_jdk_libs_nio = "2.0.4"
 dotsIndicator = "5.0"
 espresso-core = "3.6.0-alpha01"
-firebase-bom = "32.4.1"
+firebase-bom = "32.5.0"
 firebase-analytics = "21.5.0"
 firebase-analytics-ktx = "21.5.0"
 firebase-messaging = "23.3.1"
 firebase-messaging-ktx = "23.3.1"
 flagkit-android = "1.0.2"
 fragment-ktx = "1.7.0-alpha06"
 googleServices = "4.4.0"
-gradle = "8.3.0-alpha11"
+gradle = "8.3.0-alpha14"
 gson = "2.10.1"
 insetter = "0.6.1"
 junit = "4.13.2"
-kotlin-reflect = "1.9.20"
+kotlin-reflect = "2.0.0-Beta1"
 ksp = "5.0.0-SNAPSHOT"
-kspPlugin = "1.9.20-1.0.13"
+kspPlugin = "2.0.0-Beta1-1.0.14"
 legacy-support-v4 = "1.0.0"
 libsuVersion = "5.2.1"
-lifecycle-viewmodel-ktx = "2.7.0-alpha03"
-material = "1.11.0-beta01"
-navigation-fragment-ktx = "2.7.4"
-navigation-ui-ktx = "2.7.4"
+lifecycle-viewmodel-ktx = "2.7.0-rc01"
+material = "1.12.0-alpha01"
+navigation-fragment-ktx = "2.7.5"
+navigation-ui-ktx = "2.7.5"
 prdownloader = "v0.6.0"
 preference-ktx = "1.2.1"
 preferencesplus = "1.1"
 protobuf-dynamic = "1.0.1"
 simple-item-decoration = "1.0.0"
-ui-tooling = "1.6.0-alpha08"
+ui-tooling = "1.6.0-beta01"
 
 [libraries]
 android-shell = { module = "com.jaredrummler:android-shell", version.ref = "android-shell" }