🚀 Release 3.9.5 (395005)

.github/workflows/buildCi.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.6'
+          cmake-version: '4.0.2'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -34,7 +34,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -92,7 +92,7 @@ jobs:
 
       - name: Sign artifact
         id: signArtifact
-        uses: ilharp/sign-android-release@v1.0.4
+        uses: ilharp/sign-android-release@v2
         with:
           releaseDir: app/build/outputs/apk/debug
           keyAlias: ${{ secrets.KEYALIAS }}
@@ -161,7 +161,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.6'
+          cmake-version: '4.0.2'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -171,7 +171,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -233,7 +233,7 @@ jobs:
 
       - name: Sign artifact
         id: signArtifact
-        uses: ilharp/sign-android-release@v1.0.4
+        uses: ilharp/sign-android-release@v2
         with:
           releaseDir: app/build/outputs/apk/release
           keyAlias: ${{ secrets.KEYALIAS }}
@@ -304,7 +304,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.6'
+          cmake-version: '4.0.2'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -314,7 +314,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -377,7 +377,7 @@ jobs:
 
       - name: Sign artifact
         id: signArtifact
-        uses: ilharp/sign-android-release@v1.0.4
+        uses: ilharp/sign-android-release@v2
         with:
           releaseDir: app/build/outputs/apk/debug
           keyAlias: ${{ secrets.KEYALIAS }}

.github/workflows/buildPro.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.6'
+          cmake-version: '4.0.2'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -26,7 +26,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -84,7 +84,7 @@ jobs:
 
       - name: Sign artifact
         id: signArtifact
-        uses: ilharp/sign-android-release@v1.0.4
+        uses: ilharp/sign-android-release@v2
         with:
           releaseDir: app/build/outputs/apk/debug
           keyAlias: ${{ secrets.KEYALIAS }}

.github/workflows/pullRequest.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.6'
+          cmake-version: '4.0.2'
 
       - name: Setup Ninja
         run: sudo apt-get install ninja-build
@@ -34,7 +34,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Setup JDK
         uses: actions/setup-java@v4

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("com.google.gms.google-services")
@@ -10,21 +12,20 @@ android {
     compileSdk = 36
     buildToolsVersion = "36.0.0"
     buildFeatures.dataBinding = true
-
+    ndkVersion = "28.1.13356709"
     buildFeatures.viewBinding = true
     buildFeatures.buildConfig = true
 
     defaultConfig {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 23
         targetSdk = 36
-        versionCode = 395000
+        versionCode = 395005
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    @Suppress("UnstableApiUsage")
-    androidResources {
+    @Suppress("UnstableApiUsage") androidResources {
         localeFilters += listOf(
             "ar", "cs", "da", "de",
             "el", "en", "es", "fi",
@@ -39,29 +40,31 @@ android {
         getByName("release") {
             isMinifyEnabled = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
         }
         getByName("debug") {
             isDebuggable = true
             applicationIdSuffix = ".debug"
         }
     }
+
+    kotlin {
+        compilerOptions {
+            freeCompilerArgs = freeCompilerArgs.get() + listOf(
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
+                "-Xsuppress-version-warnings"
+            )
+            jvmToolchain(23)
+            jvmTarget.set(JvmTarget.JVM_23)
+        }
+    }
+
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.current()
-        targetCompatibility = JavaVersion.current()
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.current().toString()
-        freeCompilerArgs += listOf(
-            "-P",
-            "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
-            "-Xsuppress-version-warnings"
-        )
-    }
     packaging {
         jniLibs {
             useLegacyPackaging = true

app/src/main/java/de/dertyp7214/rboardthememanager/components/NewsCards.kt

@@ -61,7 +61,7 @@ class NewsCards(context: Context, attrs: AttributeSet? = null) : LinearLayout(co
 
     private fun fetchNewsFeed(): List<CardElement> {
         return try {
-            Gson().fromJson<List<CardElement>?>(
+            Gson().fromJson<List<CardElement>>(
                 URL(newsFeedUrl).readText(),
                 TypeTokens<List<CardElement>>()
             ).filter {

app/src/main/java/de/dertyp7214/rboardthememanager/data/MenuItem.kt

@@ -4,8 +4,8 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 
 data class MenuItem(
-    @DrawableRes val icon: Int,
-    @StringRes val title: Int,
+    @param:DrawableRes val icon: Int,
+    @param:StringRes val title: Int,
     val visible: Boolean = true,
     val onClick: () -> Unit
 )

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

@@ -66,9 +66,9 @@ class Flags(val activity: Activity, private val args: SafeJSON) : AbstractPrefer
 
     enum class FLAGS(
         val key: String,
-        @StringRes val title: Int,
-        @StringRes val summary: Int,
-        @DrawableRes val icon: Int,
+        @param:StringRes val title: Int,
+        @param:StringRes val summary: Int,
+        @param:DrawableRes val icon: Int,
         val defaultValue: Any,
         val type: TYPE,
         val file: FILES = FILES.NONE,
@@ -142,9 +142,9 @@ class Flags(val activity: Activity, private val args: SafeJSON) : AbstractPrefer
 
     data class FlagItem(
         val key: String,
-        @StringRes val title: Int,
-        @StringRes val summary: Int,
-        @DrawableRes val icon: Int,
+        @param:StringRes val title: Int,
+        @param:StringRes val summary: Int,
+        @param:DrawableRes val icon: Int,
         val defaultValue: Any,
         val type: TYPE,
         val file: FILES = FILES.NONE,

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

@@ -248,18 +248,19 @@ class Preferences(
                 titleRes = R.string.theme_path
                 summary = infoData[key] as String
                 iconRes = R.drawable.ic_folder_open
-                onClick {
-                    Intent(ACTION_GET_CONTENT).apply {
-                        setDataAndType(Uri.fromFile(File(infoData[key] as String)), "application/*")
-                        activity.startActivity(this)
-                    }
-                    true
-                }
             }
             pref("installation_method") {
                 titleRes = R.string.installation_method
                 summaryRes = infoData[key] as Int
                 iconRes = R.drawable.ic_download
+                if (!Config.useMagisk){
+                    onClick {
+                        activity.packageManager.getLaunchIntentForPackage(
+                            Config.GBOARD_PACKAGE_NAME
+                        )?.let(activity::startActivity)
+                        false
+                    }
+                }
             }
             pref("rboard_app_version") {
                 titleRes = R.string.rboard_app_version

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

@@ -49,8 +49,8 @@ class Props(private val activity: AppCompatActivity, private val args: SafeJSON)
     enum class PROPS(
         val key: String,
         val title: String,
-        @StringRes val summary: Int,
-        @DrawableRes val icon: Int,
+        @param:StringRes val summary: Int,
+        @param:DrawableRes val icon: Int,
         val defaultValue: Any,
         val type: TYPE,
         val visible: Boolean = true,
@@ -60,8 +60,8 @@ class Props(private val activity: AppCompatActivity, private val args: SafeJSON)
     data class PropItem(
         val key: String,
         val title: String,
-        @StringRes val summary: Int,
-        @DrawableRes val icon: Int,
+        @param:StringRes val summary: Int,
+        @param:DrawableRes val icon: Int,
         val defaultValue: Any,
         val type: TYPE,
         val visible: Boolean = true,