Merge pull request #175 from Mahmud0808/master

Merge master into fdroid
Mahmud0808 · Jan 16, 2025 · 7806c4c · 7806c4c
2 parents 299c3cf + 131e64a
commit 7806c4c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk = 31
         targetSdk = 35
-        versionCode = 21
-        versionName = "v1.11"
+        versionCode = 22
+        versionName = "v1.11.1"
     }
 
     buildTypes {

diff --git a/app/src/main/java/com/drdisagree/colorblendr/ui/fragments/ColorPaletteFragment.kt b/app/src/main/java/com/drdisagree/colorblendr/ui/fragments/ColorPaletteFragment.kt
@@ -273,9 +273,9 @@ class ColorPaletteFragment : Fragment() {
                 colorTableRows[i].getChildAt(j).setOnLongClickListener {
                     if (finalJ == 0 ||
                         finalJ == 12 ||
-                        getInt(systemPaletteNames[finalI][finalJ], Int.MIN_VALUE) != Int.MIN_VALUE
+                        getInt(systemPaletteNames[finalI][finalJ], Int.MIN_VALUE) == Int.MIN_VALUE
                     ) {
-                        return@setOnLongClickListener true
+                        return@setOnLongClickListener false
                     }
 
                     resetCustomStyleIfNotNull()

diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1,5 @@
+Changelog:
+
+• Fix overridden color not resetting on long press. [Root]
+
+Translation credit goes to all the contributors on our Crowdin platform.