diff --git a/.github/resources/fdroid-button.png b/.github/resources/fdroid-button.png new file mode 100644 index 00000000..13b05984 Binary files /dev/null and b/.github/resources/fdroid-button.png differ diff --git a/.github/resources/izzyondroid-button.png b/.github/resources/izzyondroid-button.png new file mode 100644 index 00000000..2fec4b98 Binary files /dev/null and b/.github/resources/izzyondroid-button.png differ diff --git a/README.md b/README.md index cb78f46e..871373d1 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,11 @@

Elevate your creativity with effortless material customization. Instantly tweak colors for a personalized touch in just a few taps.

+
- Get it on F-Droid + Get it on F-Droid +
+ Get it on IzzyOnDroid
Buy me a coffee

diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 90ee3a85..4a9f728b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,8 @@ android { defaultConfig { minSdk = 31 targetSdk = 36 - versionCode = 39 - versionName = "v2.1" + versionCode = 40 + versionName = "v2.1.1" ndk { abiFilters.addAll(listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64")) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a3d67738..b0cbfbbd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,10 @@ + + diff --git a/app/src/main/java/com/drdisagree/colorblendr/ui/widgets/SeekbarWidget.kt b/app/src/main/java/com/drdisagree/colorblendr/ui/widgets/SeekbarWidget.kt index 48b4a590..c803673b 100644 --- a/app/src/main/java/com/drdisagree/colorblendr/ui/widgets/SeekbarWidget.kt +++ b/app/src/main/java/com/drdisagree/colorblendr/ui/widgets/SeekbarWidget.kt @@ -57,6 +57,9 @@ class SeekbarWidget : RelativeLayout { valueFormat = typedArray.getString(R.styleable.SeekbarWidget_progressFormat) defaultValue = typedArray.getInt(R.styleable.SeekbarWidget_seekbarDefaultProgress, Int.MAX_VALUE) + isDecimalFormat = typedArray.getBoolean(R.styleable.SeekbarWidget_isDecimalFormat, false) + decimalFormat = typedArray.getString(R.styleable.SeekbarWidget_decimalFormat) + outputScale = typedArray.getFloat(R.styleable.SeekbarWidget_outputScale, 1f) setTitle(typedArray.getString(R.styleable.SeekbarWidget_titleText)) setSeekbarMinProgress(typedArray.getInt(R.styleable.SeekbarWidget_seekbarMinProgress, 0)) setSeekbarMaxProgress(typedArray.getInt(R.styleable.SeekbarWidget_seekbarMaxProgress, 100)) @@ -64,9 +67,6 @@ class SeekbarWidget : RelativeLayout { R.styleable.SeekbarWidget_seekbarProgress, typedArray.getInt(R.styleable.SeekbarWidget_seekbarDefaultProgress, 50) ) - isDecimalFormat = typedArray.getBoolean(R.styleable.SeekbarWidget_isDecimalFormat, false) - decimalFormat = typedArray.getString(R.styleable.SeekbarWidget_decimalFormat) - outputScale = typedArray.getFloat(R.styleable.SeekbarWidget_outputScale, 1f) val position = typedArray.getInt(R.styleable.SeekbarWidget_position, 0) typedArray.recycle() @@ -119,7 +119,11 @@ class SeekbarWidget : RelativeLayout { var seekbarProgress: Int get() = seekBar!!.progress set(value) { - seekBar!!.progress = value + val min = seekBar?.min ?: 0 + val max = seekBar?.max ?: 100 + val safeValue = value.coerceIn(min, max) + + seekBar?.progress = safeValue setSelectedProgress() handleResetVisibility() } diff --git a/colorpickerdialog/build.gradle b/colorpickerdialog/build.gradle index f26a21e5..15fde457 100644 --- a/colorpickerdialog/build.gradle +++ b/colorpickerdialog/build.gradle @@ -3,12 +3,12 @@ plugins { } android { - compileSdk 36 + compileSdk = 36 namespace "me.jfenn.colorpickerdialog" defaultConfig { - minSdk 31 - targetSdk 36 + minSdk = 31 + targetSdk = 36 aarMetadata { minCompileSdk = 31 } diff --git a/fastlane/metadata/android/en-US/changelogs/40.txt b/fastlane/metadata/android/en-US/changelogs/40.txt new file mode 100644 index 00000000..6d570473 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40.txt @@ -0,0 +1,6 @@ +Changelog: + +• Fixed a crash related to seekbar views. +• Removed unnecessary permissions. + +Translation credit goes to all the contributors on our Crowdin platform. \ No newline at end of file diff --git a/libadb/build.gradle b/libadb/build.gradle index 5382282f..7fcbad8f 100644 --- a/libadb/build.gradle +++ b/libadb/build.gradle @@ -8,12 +8,12 @@ group = 'io.github.muntashirakon' version = '3.1.0' android { - compileSdk 35 + compileSdk = 35 namespace "io.github.muntashirakon.adb" defaultConfig { - minSdk 1 - targetSdk 35 + minSdk = 1 + targetSdk = 35 aarMetadata { minCompileSdk = 1 }