Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r27c
ndk-version: r28

- name: Get Commit Message
id: commitMessage
Expand Down Expand Up @@ -67,12 +67,13 @@ jobs:
- name: Accept Preview SDK License
run: echo -n -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > /usr/local/lib/android/sdk/licenses/android-sdk-preview-license

- name: Build apk
- name: Build Bundle
id: buildAllApks
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: wrapper
arguments: assembleRelease
gradle-version: wrapper
- name: bundleRelease the project
run: ./gradlew bundleRelease

- name: Get JSON
id: metadataJson
Expand All @@ -92,7 +93,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: '36.0.0-rc1'
buildToolsVersion: '36.0.0'


- name: List files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/playstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: nttld/setup-ndk@v1
with:
ndk-version: r27c
ndk-version: r28

- name: Setup JDK
uses: actions/setup-java@v4
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
signingKey: ${{ secrets.SIGNING_KEY }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
buildToolsVersion: '36.0.0-rc1'
buildToolsVersion: '36.0.0'


- name: Upload Artifact
Expand Down
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ plugins {

android {
namespace = "de.dertyp7214.rboardthemecreator"
compileSdkPreview = "Baklava"
compileSdk = 36

buildToolsVersion = "36.0.0 rc1"
buildToolsVersion = "36.0.0"
buildFeatures.buildConfig = true

defaultConfig {
applicationId = "de.dertyp7214.rboardthemecreator"
minSdk = 26
targetSdk = 35
versionCode = 132003
versionName = "1.3.2"
targetSdk = 36
versionCode = 133000
versionName = "1.3.3"

vectorDrawables.useSupportLibrary = true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import de.dertyp7214.rboardthemecreator.core.openDialog
import de.dertyp7214.rboardthemecreator.core.toHex
import java.util.Locale
import java.util.regex.Pattern
import androidx.core.graphics.toColorInt

class HexColorAdapter(
private val activity: Activity,
Expand Down Expand Up @@ -106,9 +107,9 @@ class HexColorAdapter(

private fun parseColor(string: String): Int {
return try {
Color.parseColor(string.let {
string.let {
if (it.startsWith("#")) it else "#$it"
})
}.toColorInt()
} catch (_: Exception) {
Color.RED
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.preference.PreferenceManager
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import de.dertyp7214.rboardthemecreator.R
import androidx.core.net.toUri

val Activity.preferences: SharedPreferences
get() = PreferenceManager.getDefaultSharedPreferences(this)
Expand All @@ -48,7 +49,7 @@ fun Activity.openUrl(url: String) {
.build()
)
.build()
.launchUrl(this, Uri.parse(url))
.launchUrl(this, url.toUri())
}

fun Activity.openDialog(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import de.dertyp7214.rboardthemecreator.utils.AppStartUp
import de.dertyp7214.rboardthemecreator.utils.RepoHelper
import de.dertyp7214.rboardthemecreator.utils.ThemeUtils
import de.dertyp7214.rboardthemecreator.utils.doInBackground
import androidx.core.view.isVisible

@SuppressLint("NotifyDataSetChanged")
class MainActivity : AppCompatActivity() {
Expand Down Expand Up @@ -359,9 +360,9 @@ class MainActivity : AppCompatActivity() {
if (usingHex) return themeColors.apply { this.template = this@MainActivity.template }

val dBool = darkMode.isChecked
val mBool = monet.visibility == View.VISIBLE && monet.isChecked
val tBool = mBool && tertiary.visibility == View.VISIBLE && tertiary.isChecked
val aBool = amoled.visibility == View.VISIBLE && dBool && amoled.isChecked
val mBool = monet.isVisible && monet.isChecked
val tBool = mBool && tertiary.isVisible && tertiary.isChecked
val aBool = amoled.isVisible && dBool && amoled.isChecked

return ThemeUtils.buildColorSets(
this, getColor(),
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
classpath(libs.gradle)
classpath(libs.r8)
//noinspection DifferentKotlinGradleVersion
classpath(kotlin("gradle-plugin", version = "2.1.0-RC2"))
classpath(kotlin("gradle-plugin", version = "2.1.10"))
classpath(libs.kotlin.gradle.plugin)
}
}
Expand Down
2 changes: 1 addition & 1 deletion colorutilsc
Submodule colorutilsc updated 1 files
+4 −4 build.gradle
40 changes: 20 additions & 20 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
[versions]
activity-ktx = "1.10.0-beta01"
activity-ktx = "1.10.1"
android-shell = "1.0.0"
appcompat = "1.7.0"
browser = "1.8.0"
commons-text = "1.12.0"
constraintlayout = "2.2.0"
core = "1.15.0"
core-ktx = "1.15.0"
desugar_jdk_libs_nio = "2.1.3"
browser = "1.9.0-alpha01"
commons-text = "1.13.0"
constraintlayout = "2.2.1"
core = "1.16.0-beta01"
core-ktx = "1.16.0-beta01"
desugar_jdk_libs_nio = "2.1.5"
espresso-core = "3.6.1"
firebase-bom = "33.6.0"
firebase-analytics-ktx = "22.1.2"
firebase-bom = "33.10.0"
firebase-analytics-ktx = "22.3.0"
firebase-messaging-ktx = "24.1.0"
fragment-ktx = "1.8.5"
fragment-ktx = "1.8.6"
github-ksp = "5.0.0-SNAPSHOT"
gradle = "8.9.0-alpha03"
gson = "2.11.0"
gradle = "8.11.0-alpha01"
gson = "2.12.1"
insetter = "0.6.1"
junit = "1.2.1"
junit-junit = "4.13.2"
kotlin-gradle-plugin = "2.1.0-RC2"
kotlin-reflect = "2.1.0-RC2"
material = "1.12.0"
navigation-ui-ktx = "2.9.0-alpha03"
navigation-fragment-ktx = "2.9.0-alpha03"
kotlin-gradle-plugin = "2.1.10"
kotlin-reflect = "2.1.10"
material = "1.13.0-alpha11"
navigation-ui-ktx = "2.9.0-alpha08"
navigation-fragment-ktx = "2.9.0-alpha08"
legacy-support-v4 = "1.0.0"
pikolo = "2.0.2"
prdownloader = "v0.6.0"
preference-ktx = "1.2.1"
r8 = "8.8.19"
r8 = "8.10.13"
simple-item-decoration = "1.0.0"
vectorchildfinder = "1.0.0"
webkit = "1.13.0-alpha01"
kspPlugin = "2.1.0-RC2-1.0.28"
webkit = "1.13.0"
kspPlugin = "2.1.10-1.0.31"

[libraries]
android-shell = { module = "com.jaredrummler:android-shell", version.ref = "android-shell" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Nov 20 13:12:21 CET 2024
#Thu Feb 27 14:10:19 CET 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading