🚀 Release 3.4 (3405)

.github/workflows/ci.yml

@@ -23,9 +23,20 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '4.0.2'
+
+      - name: Setup Ninja
+        run: sudo apt-get install ninja-build
+
+      - name: Ninja Version
+        run: ninja --version
+
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27c
+          ndk-version: r28b
 
       - name: Get Commit Message
         id: commitMessage
@@ -69,10 +80,11 @@ jobs:
 
       - name: Build apk
         id: buildAllApks
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          arguments: assembleRelease
+            gradle-version: wrapper
+      - name: AssembleRelease the project
+        run: ./gradlew assembleRelease
 
       - name: Get JSON
         id: metadataJson

.github/workflows/playstore.yml

@@ -21,9 +21,20 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '4.0.2'
+
+      - name: Setup Ninja
+        run: sudo apt-get install ninja-build
+
+      - name: Ninja Version
+        run: ninja --version
+
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27c
+          ndk-version: r28b
 
       - name: Setup JDK
         uses: actions/setup-java@v4
@@ -58,10 +69,11 @@ jobs:
 
       - name: Build Bundle
         id: buildBundle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: wrapper
-          arguments: bundleRelease
+            gradle-version: wrapper
+      - name: AssembleRelease the project
+        run: ./gradlew assembleRelease
 
       - name: Sign artifact
         id: signArtifact

app/build.gradle.kts

@@ -16,7 +16,7 @@ android {
         applicationId = "de.dertyp7214.rboardpatcher"
         minSdk = 23
         targetSdk = 36
-        versionCode = 3401
+        versionCode = 3405
         versionName = "3.4"
 
         testInstrumentationRunner  = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt

@@ -25,7 +25,7 @@ import java.io.File
 
 class LoadThemeActivity : AppCompatActivity() {
 
-    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerview) }
+    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerview2) }
     private val themes = arrayListOf<ThemeDataClass>()
     private val adapter by lazy {
         ThemeAdapter(this, themes, this::openPatchActivity)

app/src/main/java/de/dertyp7214/rboardpatcher/screens/MainActivity.kt

@@ -5,6 +5,7 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.ViewGroup
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.core.content.FileProvider
@@ -56,7 +57,7 @@ class MainActivity : BaseActivity() {
         }
     }
     private val adapter by lazy { MainOptionAdapter(this, list) }
-    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerview) }
+    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerview2) }
 
     private val sourceCode by lazy { findViewById<View>(R.id.sourceCode) }
     private val patchesRepo by lazy { findViewById<View>(R.id.patchesRepo) }
@@ -80,7 +81,6 @@ class MainActivity : BaseActivity() {
         }
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
         storage.filePickerCallback = object : FilePickerCallback {
             override fun onStoragePermissionDenied(requestCode: Int, files: List<DocumentFile>?) {}
             override fun onCanceledByUser(requestCode: Int) {}
@@ -118,6 +118,7 @@ class MainActivity : BaseActivity() {
         recyclerView.layoutManager = LinearLayoutManager(this)
         recyclerView.setHasFixedSize(true)
         recyclerView.adapter = adapter
+        recyclerView.setFocusable(false);
 
         sourceCode.setOnClickListener { openUrl(getString(R.string.sourceCodeUrl)) }
         patchesRepo.setOnClickListener { openUrl(getString(R.string.patchesRepoUrl)) }

app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt

@@ -66,6 +66,7 @@ import kotlin.collections.set
 import kotlin.math.roundToInt
 
 @SuppressLint("NotifyDataSetChanged", "SetTextI18n")
+@SuppressWarnings("InvalidSetHasFixedSize")
 class PatchActivity : BaseActivity() {
 
     private val mutableLiveBitmap = MutableLiveData<Bitmap?>()
@@ -93,7 +94,7 @@ class PatchActivity : BaseActivity() {
     private val shareTheme by lazy { findViewById<MaterialButton>(R.id.shareButton) }
     private val searchBar by lazy { findViewById<SearchBar>(R.id.searchBar) }
     private val chipContainer by lazy { findViewById<ChipContainer>(R.id.chipContainer) }
-    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerview) }
+    private val recyclerView by lazy { findViewById<RecyclerView>(R.id.recyclerview2) }
     private val adapter by lazy {
         PatchAdapter(this, list, unfiltered, { patchMeta ->
             openDialog(R.layout.patch_info_popup, true) { dialog ->

app/src/main/res/layout/activity_load_theme.xml

@@ -8,7 +8,7 @@
     android:fitsSystemWindows="true">
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerview"
+        android:id="@+id/recyclerview2"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"