From 102f14a2132b3bec1a0fa85876bbeec4724b4b79 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Fri, 27 Jun 2025 22:56:08 +0200
Subject: [PATCH 01/15] =?UTF-8?q?=F0=9F=AA=B2=20Debug=20Release=203.9.5=20?=
 =?UTF-8?q?(395002)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Bump versionCode to 395002 (3.9.5)
• Remove Sounds tab
• Remove Magisk Method
• Update Cmake to 4.0.2
• Update Dependencies
• Update Kotlin to 2.2.0
• Update Submodules
• Update Theme files
• Use the '@param:' annotation target
---
 .github/workflows/buildCi.yml                 |  6 +--
 .github/workflows/buildPro.yml                |  2 +-
 .github/workflows/buildRelease.yml            |  6 +--
 .github/workflows/deployToGoogle.yml          |  2 +-
 .github/workflows/pullRequest.yml             |  4 +-
 .idea/AndroidProjectSystem.xml                |  6 +++
 .idea/compiler.xml                            |  7 +--
 .idea/deviceManager.xml                       | 13 ++++++
 .idea/kotlinc.xml                             |  6 +--
 .idea/misc.xml                                |  2 +
 .idea/vcs.xml                                 |  3 --
 app/build.gradle.kts                          | 28 ++++++------
 .../components/NewsCards.kt                   |  2 +-
 .../rboardthememanager/data/MenuItem.kt       |  2 +-
 .../rboardthememanager/preferences/Flags.kt   | 12 ++---
 .../rboardthememanager/preferences/Props.kt   |  8 ++--
 .../preferences/Settings.kt                   | 11 +++--
 .../screens/MainActivity.kt                   | 27 +-----------
 .../rboardthememanager/utils/ThemeHelper.kt   |  2 +-
 app/src/main/res/layout/activity_main.xml     |  1 +
 .../main/res/layout/activity_preferences.xml  |  1 +
 .../main/res/layout/activity_share_flags.xml  |  1 +
 app/src/main/res/layout/bottom_bar.xml        |  1 +
 app/src/main/res/layout/loading_dialog.xml    |  1 +
 app/src/main/res/menu/navigation.xml          |  3 +-
 app/src/main/res/values/styles.xml            |  6 +--
 app/src/main/res/values/themes.xml            |  2 +-
 build.gradle.kts                              |  2 +-
 colorutilsc                                   |  2 +-
 gradle/libs.versions.toml                     | 44 +++++++++----------
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 mathc                                         |  2 +-
 rboardcomponents                              |  2 +-
 33 files changed, 110 insertions(+), 111 deletions(-)
 create mode 100644 .idea/AndroidProjectSystem.xml
 create mode 100644 .idea/deviceManager.xml

diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
index 6bca4936..aa85f736 100644
--- a/.github/workflows/buildCi.yml
+++ b/.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
@@ -33,7 +33,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -90,7 +90,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 }}
diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml
index 71d3c18d..b74b5ba9 100644
--- a/.github/workflows/buildPro.yml
+++ b/.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
diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
index f1d15de4..9eac8a2a 100644
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -25,7 +25,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
@@ -35,7 +35,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -94,7 +94,7 @@ jobs:
 
       - name: Sign artifact
         id: signArtifact
-        uses: ilharp/sign-android-release@v1
+        uses: ilharp/sign-android-release@v2
         with:
           releaseDir: app/build/outputs/apk/release
           keyAlias: ${{ secrets.KEYALIAS }}
diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml
index bc4ed3bb..f6075217 100644
--- a/.github/workflows/deployToGoogle.yml
+++ b/.github/workflows/deployToGoogle.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r28
+          ndk-version: r28b
 
       - name: Setup JDK
         uses: actions/setup-java@v4
diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index 0efd786b..1d00e279 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.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
diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 00000000..4a53bee8
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 94695869..d390bd5f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="22">
-      <module name="Rboard_Theme_Manager_V3.app" target="23" />
-      <module name="Rboard_Theme_Manager_V3.colorutilsc" target="23" />
-      <module name="Rboard_Theme_Manager_V3.mathc" target="23" />
-      <module name="Rboard_Theme_Manager_V3.rboardcomponents" target="23" />
-    </bytecodeTargetLevel>
+    <bytecodeTargetLevel target="23" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
new file mode 100644
index 00000000..91f95584
--- /dev/null
+++ b/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index b504339d..7338ebd7 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -7,10 +7,10 @@
     <option name="jvmTarget" value="23" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="2.1" />
-    <option name="languageVersion" value="2.1" />
+    <option name="apiVersion" value="2.2" />
+    <option name="languageVersion" value="2.2" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.1.20" />
+    <option name="version" value="2.2.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 81210029..ed70d0db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -181,6 +182,7 @@
       </map>
     </option>
   </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 44998c5d..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,8 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/colorutilsc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/mathc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/rboardcomponents" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 787501d4..39454426 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,8 @@
 @file:Suppress("SpellCheckingInspection", "UnstableApiUsage")
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -12,6 +15,7 @@ plugins {
 android {
     compileSdk = 36
     buildToolsVersion = "36.0.0"
+    ndkVersion = "28.1.13356709"
     buildFeatures.dataBinding = true
     buildFeatures.viewBinding = true
     buildFeatures.buildConfig = true
@@ -22,7 +26,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 36
-        versionCode = 395000
+        versionCode = 395002
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -53,18 +57,16 @@ android {
             applicationIdSuffix = ".debug"
         }
     }
-    compileOptions {
-        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"
-        )
+    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)
+        }
     }
     packaging {
         jniLibs {
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/components/NewsCards.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/components/NewsCards.kt
index 434b31ea..fb3c876d 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/components/NewsCards.kt
+++ b/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 {
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/data/MenuItem.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/data/MenuItem.kt
index eaa16cd8..983f646d 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/data/MenuItem.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/data/MenuItem.kt
@@ -3,4 +3,4 @@ package de.dertyp7214.rboardthememanager.data
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 
-data class MenuItem(@DrawableRes val icon: Int, @StringRes val title: Int, val onClick: () -> Unit)
\ No newline at end of file
+data class MenuItem(@param:DrawableRes val icon: Int, @param:StringRes val title: Int, val onClick: () -> Unit)
\ No newline at end of file
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt
index c895a2ad..20895158 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Flags.kt
+++ b/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,
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt
index a6447a5d..0f3acc7b 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Props.kt
+++ b/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,
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
index 8771b9c2..ffc67e40 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
@@ -72,9 +72,9 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
 
     enum class SETTINGS(
         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 items: List<SelectionItem> = listOf(),
@@ -316,7 +316,10 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
     }
 
     override fun preferences(builder: PreferenceScreen.Builder) {
-        SETTINGS.entries.filter { it.visible }.forEach { item ->
+        SETTINGS.entries.filter { it.visible }
+            .filter {
+            it != SETTINGS.USE_MAGISK && it != SETTINGS.UNINSTALL
+            }.forEach { item ->
             val pref: Preference = when (item.type) {
                 TYPE.BOOLEAN -> builder.switch(item.key) {
                     defaultValue = item.defaultValue as Boolean
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
index ab5fa47e..0e78356a 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -775,32 +775,7 @@ class MainActivity : AppCompatActivity() {
 
         val preferenceManager = PreferenceManager.getDefaultSharedPreferences(this)
 
-        if (!preferenceManager.getBoolean("usageSet", false)) {
-            UsageDialog.open(this, onGboard = {
-                it.dismiss()
-                preferenceManager.edit {
-                    putBoolean("useMagisk", false)
-                    putBoolean("usageSet", true)
-                }
-                Config.useMagisk = false
-                ThemeUtils::loadThemes asyncInto mainViewModel::setThemes
-            }, onMagisk = { dialogFragment ->
-                dialogFragment.dismiss()
-                preferenceManager.edit {
-                    putBoolean("useMagisk", true)
-                    putBoolean("usageSet", true)
-                }
-                Config.useMagisk = true
-                ThemeUtils::loadThemes asyncInto mainViewModel::setThemes
-                if (ThemeUtils.checkForExistingThemes()) openDialog(
-                    R.string.install_module,
-                    R.string.module
-                ) {
-                    it.dismiss()
-                    MagiskUtils.installModule(this)
-                } else MagiskUtils.installModule(this)
-            })
-        } else if (intent.getBooleanExtra(
+        if (intent.getBooleanExtra(
                 "update",
                 this@MainActivity.intent.getBooleanExtra("update", false)
             )
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/ThemeHelper.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/ThemeHelper.kt
index 87281094..6cdda632 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/ThemeHelper.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/ThemeHelper.kt
@@ -228,7 +228,7 @@ object ThemeUtils {
                             pack
                         }.let(packs::addAll)
                     } else packs.addAll(
-                        Gson().fromJson<Collection<ThemePack>?>(
+                        Gson().fromJson<Collection<ThemePack>>(
                             URL(repo).readText(),
                             TypeTokens<List<ThemePack>>()
                         ).map {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d8d8d2e7..8ef30ae1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -33,6 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:translationZ="2dp"
+            style="@style/Widget.Material3Expressive.SearchBar"
             app:layout_constraintBottom_toTopOf="@+id/fragmentContainerView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index be3c63ce..bf755bdf 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -22,6 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
             android:fitsSystemWindows="true"
+            style="@style/Widget.Material3Expressive.CollapsingToolbar"
             app:expandedTitleTextAppearance="@style/Theme.RboardThemeManagerV3.TextAppearanceHeadlineMedium"
             app:collapsedTitleTextAppearance="@style/Theme.RboardThemeManagerV3.TextAppearanceHeadlineSmall"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
diff --git a/app/src/main/res/layout/activity_share_flags.xml b/app/src/main/res/layout/activity_share_flags.xml
index 1202b2a4..90f33c08 100644
--- a/app/src/main/res/layout/activity_share_flags.xml
+++ b/app/src/main/res/layout/activity_share_flags.xml
@@ -43,6 +43,7 @@
         android:id="@+id/searchBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="@style/Widget.Material3Expressive.SearchBar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/bottom_bar.xml b/app/src/main/res/layout/bottom_bar.xml
index b6ac4c51..3d46819b 100644
--- a/app/src/main/res/layout/bottom_bar.xml
+++ b/app/src/main/res/layout/bottom_bar.xml
@@ -37,6 +37,7 @@
                 android:alpha="1"
                 android:background="@android:color/transparent"
                 app:elevation="0dp"
+                style="@style/Widget.Material3Expressive.BottomNavigationView"
                 app:itemRippleColor="@android:color/transparent"
                 app:labelVisibilityMode="selected"
                 app:menu="@menu/navigation">
diff --git a/app/src/main/res/layout/loading_dialog.xml b/app/src/main/res/layout/loading_dialog.xml
index 2688850b..91ba4911 100644
--- a/app/src/main/res/layout/loading_dialog.xml
+++ b/app/src/main/res/layout/loading_dialog.xml
@@ -16,6 +16,7 @@
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progressBar"
+        style="@style/Widget.Material3Expressive.CircularProgressIndicator.Wavy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true" />
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
index c5331b72..faddad7a 100644
--- a/app/src/main/res/menu/navigation.xml
+++ b/app/src/main/res/menu/navigation.xml
@@ -14,6 +14,7 @@
     <item
         android:id="@+id/navigation_sounds"
         android:icon="@drawable/ic_sounds_state"
-        android:title="@string/title_sounds" />
+        android:title="@string/title_sounds"
+        android:visible="false"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cfd08ca2..86ef5edd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:windowIsFloating">false</item>
     </style>
 
-    <style name="Widget.CollapsingToolbar" parent="Widget.Material3.CollapsingToolbar">
+    <style name="Widget.CollapsingToolbar" parent="Widget.Material3Expressive.CollapsingToolbar">
         <item name="contentScrim">@drawable/color_surface_overlay_background</item>
     </style>
 
@@ -19,7 +19,7 @@
         <item name="android:textColor">?attr/colorOnSecondaryContainer</item>
     </style>
 
-    <style name="Widget.App.SnackbarButton" parent="Widget.Material3.Button.TextButton.Snackbar">
+    <style name="Widget.App.SnackbarButton" parent="Widget.Material3Expressive.Button.TextButton.Snackbar">
         <item name="android:textAllCaps">true</item>
         <item name="android:textColor">?attr/colorAccent</item>
     </style>
@@ -36,7 +36,7 @@
         <item name="android:clipToOutline">true</item>
     </style>
 
-    <style name="Dialog.RboardThemeManagerV3.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
+    <style name="Dialog.RboardThemeManagerV3.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog">
         <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MyApp.Dialog.Rounded
         </item>
         <item name="android:background">@drawable/color_surface_overlay_background</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 61209238..3eb35f96 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="Theme.RboardThemeManagerV3" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RboardThemeManagerV3" parent="Theme.Material3Expressive.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
         <item name="fontFamily">@font/google_sans_text_400</item>
diff --git a/build.gradle.kts b/build.gradle.kts
index 7d3243a0..78e27834 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     dependencies {
         classpath(libs.gradle)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "2.1.20"))
+        classpath(kotlin("gradle-plugin", version = "2.2.0"))
         classpath(libs.google.services)
     }
 }
diff --git a/colorutilsc b/colorutilsc
index ba0610bb..bda25ab9 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit ba0610bb41b4bb48bd69e4b16940c98fb8f87abc
+Subproject commit bda25ab9fde131ec27a188970f0709f2714bb0bb
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8ebf2563..6cf627ee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,46 +4,46 @@ de-PRDownloader = "v0.6.0"
 google-core = "2.1.0"
 google-core-ktx = "2.1.0"
 junit-junit = "4.13.2"
-kotlinReflect = "2.1.20"
+kotlinReflect = "2.2.0"
 ksp = "4.16.0"
 libsuVersion = "6.0.0"
 insetter = "0.6.1"
 
-kotlin-stdlib = "2.1.20"
-appcompat = "1.7.0"
+kotlin-stdlib = "2.2.0"
+appcompat = "1.7.1"
 constraintlayout = "2.2.1"
 preference-ktx = "1.2.1"
 activity-ktx = "1.10.1"
-fragment-ktx = "1.8.6"
-lifecycle-viewmodel-ktx = "2.8.7"
+fragment-ktx = "1.8.8"
+lifecycle-viewmodel-ktx = "2.9.1"
 browser = "1.8.0"
 glide = "4.16.0"
 flagkit = "1.0.3"
-firebase-bom = "33.11.0"
-firebase-messaging-ktx = "24.1.1"
-firebase-analytics-ktx = "22.4.0"
+firebase-bom = "33.16.0"
+firebase-messaging-ktx = "24.1.2"
+firebase-analytics-ktx = "22.5.0"
 legacy-support-v4 = "1.0.0"
-navigation-fragment-ktx = "2.8.9"
-navigation-ui-ktx = "2.8.9"
-commons-text = "1.13.0"
-core-ktx = "1.15.0"
-core = "1.15.0"
-material = "1.12.0"
+navigation-fragment-ktx = "2.9.0"
+navigation-ui-ktx = "2.9.0"
+commons-text = "1.13.1"
+core-ktx = "1.16.0"
+core = "1.16.0"
+material = "1.14.0-alpha02"
 espresso-core = "3.6.1"
 android-shell = "1.0.0"
-firebase-analytics = "22.4.0"
-firebase-messaging = "24.1.1"
-gson = "2.12.1"
+firebase-analytics = "22.5.0"
+firebase-messaging = "24.1.2"
+gson = "2.13.1"
 protobufDynamic = "1.0.1"
 simple-item-decoration = "1.0.0"
 balloon = "1.6.12"
-kspPlugin = "2.1.20-1.0.31"
+kspPlugin = "2.2.0-2.0.2"
 dotsIndicator = "5.1.0"
 
-googleServices = "4.4.2"
-gradle = "8.11.0-alpha02"
-uiTooling = "1.7.8"
-kotlin = "2.1.20"
+googleServices = "4.4.3"
+gradle = "8.12.0-alpha07"
+uiTooling = "1.8.3"
+kotlin = "2.2.0"
 
 [libraries]
 prDownloader = { module = "de.dertyp7214:PRDownloader", version.ref = "de-PRDownloader" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 88476292..c789701d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Wed Mar 19 21:10:30 CET 2025
+#Fri Jun 27 22:36:12 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mathc b/mathc
index d24abfb2..e841ee88 160000
--- a/mathc
+++ b/mathc
@@ -1 +1 @@
-Subproject commit d24abfb29465b73ffb602278951fad971cca28c1
+Subproject commit e841ee88bc812a0caa51cc83435ba34b7a053de8
diff --git a/rboardcomponents b/rboardcomponents
index 8cc16202..74704822 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 8cc162021b9c855408748338662ec40f6b30bab4
+Subproject commit 747048229dfea9305bfbe2458c42535a484b655a

From cdd0fcb6cfbb57752e453e42ad7c2bc2c97cc869 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Fri, 27 Jun 2025 22:59:10 +0200
Subject: [PATCH 02/15] Update Submodule

---
 rboardcomponents | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rboardcomponents b/rboardcomponents
index 74704822..016ca739 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 747048229dfea9305bfbe2458c42535a484b655a
+Subproject commit 016ca739d2f0b0c444002d764ad46ee9cbb29db5

From 44617aa7897d573319b01486c76b2ba823c1c973 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Fri, 27 Jun 2025 23:13:04 +0200
Subject: [PATCH 03/15] Fix Build Error

---
 .../main/java/de/dertyp7214/rboardthememanager/Application.kt | 4 ++--
 .../de/dertyp7214/rboardthememanager/adapter/ThemeAdapter.kt  | 2 +-
 .../rboardthememanager/fragments/ThemeListFragment.kt         | 4 ++--
 .../de/dertyp7214/rboardthememanager/screens/MainActivity.kt  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
index 30847b90..33ba5e02 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/Application.kt
@@ -59,8 +59,8 @@ class Application : Application() {
             .edit { putString("logMode", if (BuildConfig.DEBUG) "VERBOSE" else "ERROR") }
         Logger.init(
             this,
-            getAttr(com.google.android.material.R.attr.colorPrimary),
-            getAttr(com.google.android.material.R.attr.colorAccent)
+            getAttr(R.attr.colorPrimary),
+            getAttr(R.attr.colorAccent)
         )
         Logger.extraData = {
             StringBuilder("Rooted: ")
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemeAdapter.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemeAdapter.kt
index 06330e94..b82676b5 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemeAdapter.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemeAdapter.kt
@@ -53,7 +53,7 @@ class ThemeAdapter(
         )!!.toBitmap()
     }
     private val selectedBackground by lazy {
-        context.getAttr(com.google.android.material.R.attr.colorBackgroundFloating).toDrawable().apply {
+        context.getAttr(R.attr.colorBackgroundFloating).toDrawable().apply {
             alpha = 187
         }
     }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/ThemeListFragment.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/ThemeListFragment.kt
index ae24bfb6..b5f6b791 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/ThemeListFragment.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/fragments/ThemeListFragment.kt
@@ -108,9 +108,9 @@ class ThemeListFragment : Fragment() {
             0,
             5.dpToPx(requireContext()).toInt()
         )
-        refreshLayout.setProgressBackgroundColorSchemeColor(requireActivity().getAttr(com.google.android.material.R.attr.colorBackgroundFloating))
+        refreshLayout.setProgressBackgroundColorSchemeColor(requireActivity().getAttr(R.attr.colorBackgroundFloating))
         refreshLayout.setColorSchemeColors(
-            requireActivity().getAttr(com.google.android.material.R.attr.colorPrimary),
+            requireActivity().getAttr(R.attr.colorPrimary),
             requireActivity().getAttr(
                 com.google.android.material.R.attr.colorTertiary
             )
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
index 0e78356a..5d9cae63 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -256,9 +256,9 @@ class MainActivity : AppCompatActivity() {
                         setArrowOrientation(ArrowOrientation.BOTTOM)
                         setCornerRadius(resources.getDimension(R.dimen.roundCornersInner))
                         setText(getString(R.string.menu_moved))
-                        setTextColor(getAttr(com.google.android.material.R.attr.colorBackgroundFloating))
+                        setTextColor(getAttr(R.attr.colorBackgroundFloating))
                         setTextSize(12f)
-                        setBackgroundColor(getAttr(com.google.android.material.R.attr.colorPrimary))
+                        setBackgroundColor(getAttr(R.attr.colorPrimary))
                         setBalloonAnimation(BalloonAnimation.FADE)
                         setDismissWhenClicked(true)
                         setOnBalloonDismissListener {

From 74e2f46288943fb0b60b20b637e14d6906b56304 Mon Sep 17 00:00:00 2001
From: Akos Paha <131550765+AkosPaha01@users.noreply.github.com>
Date: Fri, 27 Jun 2025 23:22:30 +0200
Subject: [PATCH 04/15] Update vcs

---
 .idea/vcs.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..8c5778e9 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/colorutilsc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/mathc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/rboardcomponents" vcs="Git" />
   </component>
-</project>
\ No newline at end of file
+</project>

From 2487281200bfc36f8eb0c52419523747a33e25bd Mon Sep 17 00:00:00 2001
From: Akos Paha <131550765+AkosPaha01@users.noreply.github.com>
Date: Fri, 27 Jun 2025 23:24:28 +0200
Subject: [PATCH 05/15] Update build.gradle.kts

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 39454426..34bb8b6e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 36
-        versionCode = 395002
+        versionCode = 395003
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

From a0364e8d13b93447be073ecf33362563bb9d0fd4 Mon Sep 17 00:00:00 2001
From: Akos Paha <131550765+AkosPaha01@users.noreply.github.com>
Date: Fri, 27 Jun 2025 23:31:48 +0200
Subject: [PATCH 06/15] Revert "Update vcs"

---
 .idea/vcs.xml        | 5 +----
 app/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8c5778e9..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,8 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/colorutilsc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/mathc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/rboardcomponents" vcs="Git" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 34bb8b6e..39454426 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 36
-        versionCode = 395003
+        versionCode = 395002
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

From ef619d0232f9163042d4bc966f6282aa401fa32c Mon Sep 17 00:00:00 2001
From: Akos Paha <131550765+AkosPaha01@users.noreply.github.com>
Date: Fri, 27 Jun 2025 23:40:16 +0200
Subject: [PATCH 07/15] Update vcs.xml

---
 .idea/vcs.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..8c5778e9 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/colorutilsc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/mathc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/rboardcomponents" vcs="Git" />
   </component>
-</project>
\ No newline at end of file
+</project>

From f7689c2696b8c8e56488634e4c96141da065e4bb Mon Sep 17 00:00:00 2001
From: Akos Paha <131550765+AkosPaha01@users.noreply.github.com>
Date: Fri, 27 Jun 2025 23:40:51 +0200
Subject: [PATCH 08/15] Update build.gradle.kts

---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 39454426..34bb8b6e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 36
-        versionCode = 395002
+        versionCode = 395003
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

From be6b0e7270668ffe1b6759b2954cf10cd4019eaf Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Sat, 28 Jun 2025 00:28:34 +0200
Subject: [PATCH 09/15] Fix useMagisk check

---
 app/build.gradle.kts                                         | 2 +-
 .../de/dertyp7214/rboardthememanager/utils/AppStartUp.kt     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 34bb8b6e..44c9d007 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 36
-        versionCode = 395003
+        versionCode = 395004
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt
index 8d1f66c7..8105fcaa 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt
@@ -150,6 +150,11 @@ class AppStartUp(private val activity: AppCompatActivity) {
             }, Config::newGboard::set)
 
             doInBackground {
+                if (Config.useMagisk){
+                    preferences.edit { putBoolean("useMagisk", false) }
+                    finish();
+                    startActivity(intent);
+                }
                 AppWidgetManager.getInstance(this).let { appWidgetManager ->
                     appWidgetManager.getAppWidgetIds(
                         ComponentName(this, FlagsWidget::class.java)

From 4f37b5702e41ae35cd60ca66c3789171a911b3e8 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Wed, 2 Jul 2025 10:09:52 +0200
Subject: [PATCH 10/15] Fix app opening if the useMagisk preferences are
 changed in the background

---
 app/build.gradle.kts                                         | 2 +-
 .../de/dertyp7214/rboardthememanager/screens/MainActivity.kt | 4 ++++
 .../de/dertyp7214/rboardthememanager/utils/AppStartUp.kt     | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 44c9d007..bef164da 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         applicationId = "de.dertyp7214.rboardthememanager"
         minSdk = 31
         targetSdk = 36
-        versionCode = 395004
+        versionCode = 395005
         versionName = "3.9.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
index 5d9cae63..e9ed328c 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -716,6 +716,10 @@ class MainActivity : AppCompatActivity() {
                     navigation.selectedItemId = id
                 }
             }
+            if (Config.useMagisk){
+                preferences.edit { putBoolean("useMagisk", false) }
+                recreate();
+            }
         }
     }
 
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt
index 8105fcaa..8d1f66c7 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt
@@ -150,11 +150,6 @@ class AppStartUp(private val activity: AppCompatActivity) {
             }, Config::newGboard::set)
 
             doInBackground {
-                if (Config.useMagisk){
-                    preferences.edit { putBoolean("useMagisk", false) }
-                    finish();
-                    startActivity(intent);
-                }
                 AppWidgetManager.getInstance(this).let { appWidgetManager ->
                     appWidgetManager.getAppWidgetIds(
                         ComponentName(this, FlagsWidget::class.java)

From a40b4c9b9807998325efd2dff88e75f1c71ca7cf Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Wed, 2 Jul 2025 23:23:49 +0200
Subject: [PATCH 11/15] Update Flags

---
 app/src/main/res/raw/flags.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/raw/flags.json b/app/src/main/res/raw/flags.json
index a76872bf..5f0e96b0 100644
--- a/app/src/main/res/raw/flags.json
+++ b/app/src/main/res/raw/flags.json
@@ -1,5 +1,5 @@
 {
-  "time": "1727767527651",
+  "time": "1751491379904",
   "flags": [
     {
       "key": "general",
@@ -403,6 +403,16 @@
       "type": "BOOLEAN",
       "file": "FLAGS"
     },
+    {
+      "key": "enable_text_preview",
+      "title": "enable_text_preview",
+      "minSdk": 26,
+      "summary": "enable_text_preview_details",
+      "icon": "ic_text_preview",
+      "defaultValue": false,
+      "type": "BOOLEAN",
+      "file": "FLAGS"
+    },
     {
       "key": "keyboard_height_ratio",
       "title": "keyboard_height_ratio",

From a9bc874dbdcc795bd0731cb69a9bb06733728c86 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Wed, 2 Jul 2025 23:30:47 +0200
Subject: [PATCH 12/15] =?UTF-8?q?=F0=9F=AA=B2=20Debug=20Release=203.9.5=20?=
 =?UTF-8?q?(395005)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Add Repo URL copy option
• Bump versionCode to 395005 (3.9.5)
• Update Dependencies
---
 .idea/vcs.xml                                 |   5 +-
 .../preferences/Preferences.kt                |  15 +-
 .../rboardthememanager/screens/ManageRepo.kt  |  12 +-
 app/src/main/res/drawable/ic_repo_copy.xml    |  11 ++
 app/src/main/res/drawable/ic_text_preview.xml |  11 ++
 app/src/main/res/drawable/ripple.xml          |  10 +
 .../main/res/layout/activity_manage_repo.xml  | 172 +++++++++++-------
 app/src/main/res/values-hu/strings.xml        |   3 +
 app/src/main/res/values/strings.xml           |   3 +
 gradle/libs.versions.toml                     |   4 +-
 10 files changed, 162 insertions(+), 84 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_repo_copy.xml
 create mode 100644 app/src/main/res/drawable/ic_text_preview.xml
 create mode 100644 app/src/main/res/drawable/ripple.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8c5778e9..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,8 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/colorutilsc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/mathc" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/rboardcomponents" vcs="Git" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Preferences.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Preferences.kt
index 274bfa56..f435d73d 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Preferences.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Preferences.kt
@@ -245,18 +245,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
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
index 3b638926..8d29dd55 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
@@ -11,7 +11,9 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.google.android.material.snackbar.Snackbar
 import com.google.gson.Gson
+import de.dertyp7214.rboardthememanager.core.showMaterial
 import de.dertyp7214.rboardcomponents.utils.doAsync
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.adapter.ManageRepoThemePackAdapter
@@ -58,11 +60,19 @@ class ManageRepo : AppCompatActivity() {
 
         val toolbar = binding.toolbar
         val recyclerView = binding.recyclerView
+        val copy = binding.copy
 
         val items = ArrayList<ThemePack>()
 
         val adapter = ManageRepoThemePackAdapter(items)
-
+        copy.setOnClickListener {
+            val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
+            clipboard.setText(binding.address.getText())
+            Snackbar.make(
+                findViewById(android.R.id.content),
+                R.string.succesful_copied,
+                Snackbar.LENGTH_LONG).showMaterial()
+        }
         recyclerView.layoutManager = LayoutManager(this)
         recyclerView.adapter = adapter
         recyclerView.setHasFixedSize(true)
diff --git a/app/src/main/res/drawable/ic_repo_copy.xml b/app/src/main/res/drawable/ic_repo_copy.xml
new file mode 100644
index 00000000..a210675f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repo_copy.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha=".7"
+        android:fillColor="#fff"
+        android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_text_preview.xml b/app/src/main/res/drawable/ic_text_preview.xml
new file mode 100644
index 00000000..02103d4d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_text_preview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h14c0.55 0 1.02 0.2 1.41 0.59C20.81 3.98 21 4.45 21 5v14c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5Zm0-2h14V7H5v12Zm7-2c-1.37 0-2.59-0.37-3.66-1.11C7.26 15.15 6.48 14.19 6 13c0.48-1.18 1.26-2.15 2.34-2.89C9.4 9.37 10.64 9 12 9c1.37 0 2.59 0.37 3.66 1.11 1.08 0.74 1.86 1.7 2.34 2.89-0.48 1.18-1.26 2.15-2.34 2.89C14.6 16.63 13.36 17 12 17Zm0-1.5c0.93 0 1.78-0.22 2.55-0.66 0.77-0.44 1.37-1.06 1.8-1.84-0.43-0.78-1.03-1.4-1.8-1.84-0.77-0.44-1.62-0.66-2.55-0.66-0.93 0-1.78 0.22-2.55 0.66-0.77 0.44-1.37 1.06-1.8 1.84 0.43 0.78 1.03 1.4 1.8 1.84 0.77 0.44 1.62 0.66 2.55 0.66Zm0-1c0.42 0 0.77-0.15 1.06-0.44 0.3-0.29 0.44-0.64 0.44-1.06 0-0.42-0.15-0.77-0.44-1.06-0.29-0.3-0.64-0.44-1.06-0.44-0.42 0-0.77 0.15-1.06 0.44-0.3 0.29-0.44 0.64-0.44 1.06 0 0.42 0.15 0.77 0.44 1.06 0.29 0.3 0.64 0.44 1.06 0.44Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple.xml b/app/src/main/res/drawable/ripple.xml
new file mode 100644
index 00000000..524301b4
--- /dev/null
+++ b/app/src/main/res/drawable/ripple.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorSurfaceVariant">
+    <item android:id="@android:id/mask">
+        <shape android:shape="oval">
+            <solid android:color="?android:colorPrimary"/>
+        </shape>
+        <color android:color="?attr/colorSurfaceVariant"/>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_manage_repo.xml b/app/src/main/res/layout/activity_manage_repo.xml
index 28e0c66e..356c0326 100644
--- a/app/src/main/res/layout/activity_manage_repo.xml
+++ b/app/src/main/res/layout/activity_manage_repo.xml
@@ -38,81 +38,113 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
         tools:context="de.dertyp7214.rboardthememanager.screens.ManageRepo">
-    <LinearLayout
-        android:id="@+id/linearLayout3"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/address"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorSecondary"
-            android:textSize="12sp"
-            tools:ignore="TextContrastCheck" />
-
-        <TextView
-            android:id="@+id/address"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:id="@+id/linearLayout3"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:singleLine="false"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="?attr/colorOnSurface"
-            tools:text="This is a very long text to test the multiline capability of this textView" />
+            android:orientation="vertical"
+            android:padding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.legacy.widget.Space
-            android:layout_width="match_parent"
-            android:layout_height="8dp" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/address"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?attr/colorSecondary"
+                android:textSize="12sp"
+                tools:ignore="TextContrastCheck" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/theme_pack_count"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorSecondary"
-            android:textSize="12sp"
-            tools:ignore="TextContrastCheck" />
-
-        <TextView
-            android:id="@+id/theme_pack_count"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="?attr/colorOnSurface"
-            tools:text="20" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-        <androidx.legacy.widget.Space
-            android:layout_width="match_parent"
-            android:layout_height="8dp" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/theme_packs"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?attr/colorSecondary"
-            android:textSize="12sp" />
-
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:requiresFadingEdge="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3"
-        tools:ignore="SpeakableTextPresentCheck"
-        tools:listitem="@layout/manage_repo_theme_pack">
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:layout_gravity="start"
+                        android:gravity="start"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/address"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:singleLine="false"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                            android:textColor="?attr/colorOnSurface"
+                            tools:text="This is a very long text to test the multiline capability of this textView" />
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/copy"
+                        android:layout_width="40dp"
+                        android:layout_height="match_parent"
+                        android:focusable="true"
+                        android:padding="7dp"
+                        android:clickable="true"
+                        app:srcCompat="@drawable/ic_repo_copy"
+                        app:tint="?android:attr/textColorPrimary"
+                        android:background="@drawable/ripple"
+                        tools:ignore="ContentDescription,RtlSymmetry" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <androidx.legacy.widget.Space
+                android:layout_width="match_parent"
+                android:layout_height="8dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/theme_pack_count"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?attr/colorSecondary"
+                android:textSize="12sp"
+                tools:ignore="TextContrastCheck" />
+
+            <TextView
+                android:id="@+id/theme_pack_count"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textColor="?attr/colorOnSurface"
+                tools:text="20" />
+
+            <androidx.legacy.widget.Space
+                android:layout_width="match_parent"
+                android:layout_height="8dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/theme_packs"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?attr/colorSecondary"
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:requiresFadingEdge="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/linearLayout3"
+            tools:ignore="SpeakableTextPresentCheck"
+            tools:listitem="@layout/manage_repo_theme_pack">
 
-    </androidx.recyclerview.widget.RecyclerView>
+        </androidx.recyclerview.widget.RecyclerView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6f4a4e6a..048d518c 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -328,4 +328,7 @@
     <string name="gboard_cache_clear_question">Törli a Gboard gyorsítótárat</string>
     <string name="gboard_cache_clear_long_question">Szeretné törölni a gyorsítótárat és kényszeríteni a Gboard bezárását?</string>
     <string name="newTag">Új</string>
+    <string name="succesful_copied">Sikeresen másolva</string>
+    <string name="enable_text_preview">Szöveges előnézet</string>
+    <string name="enable_text_preview_details">A szöveg előnézetének megjelenítése a billentyűzet felett</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 75c8f9ff..394e02f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -324,4 +324,7 @@
     <string name="system_automatic_reset_question">Reset system automatic theme</string>
     <string name="system_automatic_reset_long_question">Do you want to reset the system automatic theme and force stop Gboard?</string>
     <string name="newTag">New</string>
+    <string name="succesful_copied">Successfully copied</string>
+    <string name="enable_text_preview">Text preview</string>
+    <string name="enable_text_preview_details">Show a preview of the text above the keyboard</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6cf627ee..6552a25b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,8 +23,8 @@ firebase-bom = "33.16.0"
 firebase-messaging-ktx = "24.1.2"
 firebase-analytics-ktx = "22.5.0"
 legacy-support-v4 = "1.0.0"
-navigation-fragment-ktx = "2.9.0"
-navigation-ui-ktx = "2.9.0"
+navigation-fragment-ktx = "2.9.1"
+navigation-ui-ktx = "2.9.1"
 commons-text = "1.13.1"
 core-ktx = "1.16.0"
 core = "1.16.0"

From bf4141c1d7a545c70c0ceac7a6311bab366bc4ed Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Wed, 2 Jul 2025 23:32:38 +0200
Subject: [PATCH 13/15] Update VCS

---
 .idea/vcs.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..44998c5d 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/colorutilsc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/mathc" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/rboardcomponents" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

From 507cbf2aab2e5e3cfc4b150d57bf4cf32e94e4b5 Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Wed, 2 Jul 2025 23:38:35 +0200
Subject: [PATCH 14/15] Fix Build Error

---
 .../java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
index 8d29dd55..cff1469a 100644
--- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
+++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
@@ -3,6 +3,7 @@
 package de.dertyp7214.rboardthememanager.screens
 
 import android.annotation.SuppressLint
+import android.content.ClipboardManager
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle

From 74b03ba8eb6b98a4541e762c143585d56b994ec3 Mon Sep 17 00:00:00 2001
From: Akos Paha <131550765+AkosPaha01@users.noreply.github.com>
Date: Thu, 3 Jul 2025 16:00:57 +0200
Subject: [PATCH 15/15] Update Gradle

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6552a25b..4fb5761c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -41,7 +41,7 @@ kspPlugin = "2.2.0-2.0.2"
 dotsIndicator = "5.1.0"
 
 googleServices = "4.4.3"
-gradle = "8.12.0-alpha07"
+gradle = "8.12.0-alpha08"
 uiTooling = "1.8.3"
 kotlin = "2.2.0"
 
@@ -102,4 +102,4 @@ gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 
 [plugins]
 ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" }
-kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
\ No newline at end of file
+kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }