Merge master into fdroid

README.md

@@ -17,8 +17,11 @@
 <p align="center">
 Elevate your creativity with effortless material customization. Instantly tweak colors for a personalized touch in just a few taps.
 </p>
+<br>
 <div align="center">
-  <a href="https://f-droid.org/en/packages/com.drdisagree.colorblendr/"><img src="https://f-droid.org/badge/get-it-on.png" width="34.4%" alt="Get it on F-Droid" /></a>
+  <a href="https://f-droid.org/en/packages/com.drdisagree.colorblendr/"><img src="https://raw.githubusercontent.com/Mahmud0808/ColorBlendr/master/.github/resources/fdroid-button.png" width="30%" alt="Get it on F-Droid" /></a>
+  <br>
+  <a href="https://apt.izzysoft.de/packages/com.drdisagree.colorblendr/"><img src="https://raw.githubusercontent.com/Mahmud0808/ColorBlendr/master/.github/resources/izzyondroid-button.png" width="30%" alt="Get it on IzzyOnDroid" /></a>
   <br>
   <a href="https://www.buymeacoffee.com/DrDisagree"><img src="https://raw.githubusercontent.com/Mahmud0808/ColorBlendr/master/.github/resources/bmc-button.png" width="30%" alt="Buy me a coffee" /></a>
   <br><br>

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"))

app/src/main/AndroidManifest.xml

@@ -27,6 +27,10 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        tools:node="remove" />
+
     <queries>
         <intent>
             <action android:name="android.service.wallpaper.WallpaperService" />

app/src/main/java/com/drdisagree/colorblendr/ui/widgets/SeekbarWidget.kt

@@ -57,16 +57,16 @@ 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))
         seekbarProgress = typedArray.getInt(
             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()
         }

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
         }

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.

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
         }