From 0f44d2b2d47ff05ffb6de3578b65e3556971b954 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Wed, 11 Jun 2025 21:59:45 +0200 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=9A=80=20Release=203.4=20(3402)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ⚠️ Warning: • Last Android 6 and 7 update, the next version is only supported from Android 8 and above. • Update Dependencies • Update Submodules --- .github/workflows/ci.yml | 9 ++++---- .github/workflows/playstore.yml | 9 ++++---- .idea/AndroidProjectSystem.xml | 6 +++++ .idea/deploymentTargetSelector.xml | 10 +++++++++ .idea/git_toolbox_blame.xml | 6 +++++ .idea/git_toolbox_prj.xml | 15 +++++++++++++ .idea/kotlinc.xml | 6 +---- .idea/material_theme_project_new.xml | 18 +++++++++++++++ app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- colorutilsc | 2 +- gradle/libs.versions.toml | 28 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- rboardcomponents | 2 +- 14 files changed, 86 insertions(+), 33 deletions(-) create mode 100644 .idea/AndroidProjectSystem.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/git_toolbox_blame.xml create mode 100644 .idea/git_toolbox_prj.xml create mode 100644 .idea/material_theme_project_new.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00939bf..54675c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r27c + ndk-version: r28b - name: Get Commit Message id: commitMessage @@ -69,10 +69,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 diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml index 5d69b21..dec7933 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: r28b - name: Setup JDK uses: actions/setup-java@v4 @@ -58,10 +58,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 diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml new file mode 100644 index 0000000..7dc1249 --- /dev/null +++ b/.idea/git_toolbox_blame.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml new file mode 100644 index 0000000..02b915b --- /dev/null +++ b/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index b504339..cd2b502 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -6,11 +6,7 @@ - - - \ No newline at end of file diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml new file mode 100644 index 0000000..20b97ff --- /dev/null +++ b/.idea/material_theme_project_new.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 996912f..a1a6293 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ android { applicationId = "de.dertyp7214.rboardpatcher" minSdk = 23 targetSdk = 36 - versionCode = 3401 + versionCode = 3402 versionName = "3.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/build.gradle.kts b/build.gradle.kts index 91ea4ab..44dbf37 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { dependencies { classpath(libs.gradle) //noinspection DifferentKotlinGradleVersion - classpath(kotlin("gradle-plugin", version = "2.1.20")) + classpath(kotlin("gradle-plugin", version = "2.1.21")) } } diff --git a/colorutilsc b/colorutilsc index ba0610b..a85cabd 160000 --- a/colorutilsc +++ b/colorutilsc @@ -1 +1 @@ -Subproject commit ba0610bb41b4bb48bd69e4b16940c98fb8f87abc +Subproject commit a85cabd10d9fa17740be8dc3285b77ef89896a42 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 474085a..f275c91 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] androidx-junit = "1.2.1" -appcompat = "1.7.0" -browser = "1.8.0" +appcompat = "1.7.1" +browser = "1.9.0-alpha04" constraintlayout = "2.2.1" -coreKtx = "1.16.0-beta01" +coreKtx = "1.16.0" desugar_jdk_libs_nio = "2.1.5" -espressoCore = "3.6.1" -gradle = "8.11.0-alpha02" -gson = "2.12.1" +espressoCore = "3.7.0-alpha03" +gradle = "8.12.0-alpha04" +gson = "2.13.1" junit = "4.13.2" -kotlinreflect = "2.1.20" -kotlinStdlib = "2.1.20" -kotlinxCoroutinesAndroid = "1.10.1" -kspPlugin = "2.1.20-1.0.31" -material = "1.13.0-alpha11" +kotlinreflect = "2.1.21" +kotlinStdlib = "2.1.21" +kotlinxCoroutinesAndroid = "1.10.2" +kspPlugin = "2.1.21-2.0.2" +material = "1.14.0-alpha01" preferenceKtx = "1.2.1" -storage = "2.0.0" -kotlin = "2.1.20" -activity = "1.10.1" +storage = "2.1.0" +kotlin = "2.1.21" +activity = "1.12.0-alpha02" [libraries] appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71df9f8..0b37f8c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 20 14:39:28 CET 2025 +#Wed Jun 11 21:35:19 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/rboardcomponents b/rboardcomponents index 3bebc8f..7470482 160000 --- a/rboardcomponents +++ b/rboardcomponents @@ -1 +1 @@ -Subproject commit 3bebc8f5fe658fba77bc30d41c2ad67741390c74 +Subproject commit 747048229dfea9305bfbe2458c42535a484b655a From 17ef6a1248c2d586dd180055bebb8deeca0b8086 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Wed, 11 Jun 2025 22:17:01 +0200 Subject: [PATCH 2/6] =?UTF-8?q?=E2=80=A2=20Update=20ColorUtilsC=20Submodul?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- colorutilsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colorutilsc b/colorutilsc index a85cabd..bda25ab 160000 --- a/colorutilsc +++ b/colorutilsc @@ -1 +1 @@ -Subproject commit a85cabd10d9fa17740be8dc3285b77ef89896a42 +Subproject commit bda25ab9fde131ec27a188970f0709f2714bb0bb From 11fcaeacc5fbc02066be3840a377ca86f3185881 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Wed, 11 Jun 2025 22:17:52 +0200 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=9A=80=20Release=203.4=20(3403)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 a1a6293..9abf5a2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ android { applicationId = "de.dertyp7214.rboardpatcher" minSdk = 23 targetSdk = 36 - versionCode = 3402 + versionCode = 3403 versionName = "3.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From 3ca15b5e6271265ef2a9055e1c311ac5fe4fa59f Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Wed, 11 Jun 2025 23:05:27 +0200 Subject: [PATCH 4/6] Fix Build Issue --- .github/workflows/ci.yml | 11 + .github/workflows/playstore.yml | 11 + app/build.gradle.kts | 2 +- app/src/main/res/layout/activity_main.xml | 337 +++++++++++----------- 4 files changed, 194 insertions(+), 167 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54675c0..25832ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,17 @@ 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: r28b diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml index dec7933..12d6944 100644 --- a/.github/workflows/playstore.yml +++ b/.github/workflows/playstore.yml @@ -21,6 +21,17 @@ 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: r28b diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9abf5a2..80bb920 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ android { applicationId = "de.dertyp7214.rboardpatcher" minSdk = 23 targetSdk = 36 - versionCode = 3403 + versionCode = 3404 versionName = "3.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f6647da..ec394d2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,186 +1,191 @@ - - - - - - - - - + + + + + + - - + + + + - - - - + + - - - - - - + + + + + + + + - - - - + + - - + android:layout_margin="4dp" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> + + + + + + + + + + + + + + + + + - - - - - - + android:background="@drawable/round_outline" + android:clipChildren="true" + android:translationZ="0dp" + tools:itemCount="3" + tools:listitem="@layout/main_option" /> - - - - - - - - \ No newline at end of file + + \ No newline at end of file From 93adc800536c4245b5b7dafac36ba8ce3e2407d5 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Wed, 11 Jun 2025 23:44:10 +0200 Subject: [PATCH 5/6] Fix Build Issue again --- app/build.gradle.kts | 2 +- .../de/dertyp7214/rboardpatcher/screens/PatchActivity.kt | 3 ++- app/src/main/res/layout/activity_main.xml | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 80bb920..470375c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ android { applicationId = "de.dertyp7214.rboardpatcher" minSdk = 23 targetSdk = 36 - versionCode = 3404 + versionCode = 3405 versionName = "3.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt index e990916..f173de2 100644 --- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt +++ b/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() @@ -93,7 +94,7 @@ class PatchActivity : BaseActivity() { private val shareTheme by lazy { findViewById(R.id.shareButton) } private val searchBar by lazy { findViewById(R.id.searchBar) } private val chipContainer by lazy { findViewById(R.id.chipContainer) } - private val recyclerView by lazy { findViewById(R.id.recyclerview) } + private val recyclerView by lazy { findViewById(R.id.recyclerview2) } private val adapter by lazy { PatchAdapter(this, list, unfiltered, { patchMeta -> openDialog(R.layout.patch_info_popup, true) { dialog -> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ec394d2..d82168f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,9 +37,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="24dp" + android:layout_marginTop="48dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="24dp" + android:layout_marginBottom="48dp" android:orientation="vertical" app:layout_constraintBottom_toTopOf="@+id/cardView2" app:layout_constraintEnd_toEndOf="parent" @@ -165,7 +165,7 @@ android:id="@+id/cardView2" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="16dp" + android:layout_marginStart="32dp" android:layout_marginEnd="16dp" android:layout_marginBottom="32dp" android:translationZ="0dp" @@ -178,7 +178,7 @@ app:strokeWidth="0dp"> Date: Thu, 12 Jun 2025 00:29:15 +0200 Subject: [PATCH 6/6] Fix Crash --- .../de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt | 2 +- .../java/de/dertyp7214/rboardpatcher/screens/MainActivity.kt | 5 +++-- app/src/main/res/layout/activity_load_theme.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_patch.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt index 5d20870..425ace4 100644 --- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt +++ b/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(R.id.recyclerview) } + private val recyclerView by lazy { findViewById(R.id.recyclerview2) } private val themes = arrayListOf() private val adapter by lazy { ThemeAdapter(this, themes, this::openPatchActivity) diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/MainActivity.kt index 2ec0f5d..54c822f 100644 --- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/MainActivity.kt +++ b/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(R.id.recyclerview) } + private val recyclerView by lazy { findViewById(R.id.recyclerview2) } private val sourceCode by lazy { findViewById(R.id.sourceCode) } private val patchesRepo by lazy { findViewById(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?) {} 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)) } diff --git a/app/src/main/res/layout/activity_load_theme.xml b/app/src/main/res/layout/activity_load_theme.xml index aab2455..5ca5c79 100644 --- a/app/src/main/res/layout/activity_load_theme.xml +++ b/app/src/main/res/layout/activity_load_theme.xml @@ -8,7 +8,7 @@ android:fitsSystemWindows="true">