diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00939bf..25832ed 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml index 5d69b21..12d6944 100644 --- a/.github/workflows/playstore.yml +++ b/.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 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..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 = 3401 + versionCode = 3405 versionName = "3.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" 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/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_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"> - - - - - - - - - + + + + + + - - + + + + - - - - + + - - - - - - + + + + + + + + - - - - + + - - + 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 diff --git a/app/src/main/res/layout/activity_patch.xml b/app/src/main/res/layout/activity_patch.xml index 888f8f4..dd5a492 100644 --- a/app/src/main/res/layout/activity_patch.xml +++ b/app/src/main/res/layout/activity_patch.xml @@ -24,7 +24,7 @@ app:layout_constraintTop_toBottomOf="@id/searchBar" />