From a9978b9716a554c82512e0964f532dd6752a21b0 Mon Sep 17 00:00:00 2001
From: JollyGood1 <jollygood@ymail.com>
Date: Sun, 19 Jan 2025 14:50:22 +0200
Subject: [PATCH] Option to inverse checkmark widget On/Off colours

---
 .../preferences/SharedPreferencesStorage.kt   |  2 +
 .../widgets/views/CheckmarkWidgetView.kt      | 51 ++++++++++++++-----
 .../src/main/res/values/strings.xml           |  2 +
 .../src/main/res/xml/preferences.xml          |  7 +++
 .../uhabits/core/preferences/Preferences.kt   |  8 +++
 5 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
index 0e019be0c..6237329d9 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
@@ -93,6 +93,8 @@ class SharedPreferencesStorage
             "pref_unknown_enabled" -> {
                 preferences.areQuestionMarksEnabled = getBoolean(key, false)
             }
+            "pref_inverse_checkmark_colors" ->
+                preferences.isCheckmarkWidgetColorInverted = getBoolean(key, false)
         }
         sharedPreferences.registerOnSharedPreferenceChangeListener(this)
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
index 72c95da64..6475e8423 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
@@ -67,20 +67,45 @@ class CheckmarkWidgetView : HabitWidgetView {
         val bgColor: Int
         val fgColor: Int
         setShadowAlpha(0x4f)
-        when (entryState) {
-            YES_MANUAL, SKIP, YES_AUTO -> {
-                bgColor = activeColor
-                fgColor = res.getColor(R.attr.contrast0)
-                backgroundPaint!!.color = bgColor
-                frame!!.setBackgroundDrawable(background)
-            }
-            NO, UNKNOWN -> {
-                bgColor = res.getColor(R.attr.cardBgColor)
-                fgColor = res.getColor(R.attr.contrast60)
+        if (preferences!!.isCheckmarkWidgetColorInverted) {
+            when (entryState) {
+                YES_MANUAL, SKIP, YES_AUTO -> {
+                    bgColor = res.getColor(R.attr.cardBgColor)
+                    fgColor = res.getColor(R.attr.contrast60)
+                }
+
+                NO, UNKNOWN -> {
+                    bgColor = activeColor
+                    fgColor = res.getColor(R.attr.contrast0)
+                    backgroundPaint!!.color = bgColor
+                    frame!!.setBackgroundDrawable(background)
+                }
+
+                else -> {
+                    bgColor = activeColor
+                    fgColor = res.getColor(R.attr.contrast0)
+                    backgroundPaint!!.color = bgColor
+                    frame!!.setBackgroundDrawable(background)
+                }
             }
-            else -> {
-                bgColor = res.getColor(R.attr.cardBgColor)
-                fgColor = res.getColor(R.attr.contrast60)
+        } else {
+            when (entryState) {
+                YES_MANUAL, SKIP, YES_AUTO -> {
+                    bgColor = activeColor
+                    fgColor = res.getColor(R.attr.contrast0)
+                    backgroundPaint!!.color = bgColor
+                    frame!!.setBackgroundDrawable(background)
+                }
+
+                NO, UNKNOWN -> {
+                    bgColor = res.getColor(R.attr.cardBgColor)
+                    fgColor = res.getColor(R.attr.contrast60)
+                }
+
+                else -> {
+                    bgColor = res.getColor(R.attr.cardBgColor)
+                    fgColor = res.getColor(R.attr.contrast60)
+                }
             }
         }
         ring.setPercentage(percentage)
diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 9fec1cbca..f856432cd 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -233,4 +233,6 @@
     <string name="activity_not_found">No app was found to support this action</string>
     <string name="pref_midnight_delay_title">Extend day a few hours past midnight</string>
     <string name="pref_midnight_delay_description">Wait until 3:00 AM to show a new day. Useful if you typically go to sleep after midnight. Requires app restart.</string>
+    <string name="pref_inverse_checkmark_colors_title">Inverse checkmark widget colors</string>
+    <string name="pref_inverse_checkmark_colors_description">Make the checkmark widget looked turn off once the task is done.</string>
 </resources>
diff --git a/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/src/main/res/xml/preferences.xml
index ad381b502..dee86768c 100644
--- a/uhabits-android/src/main/res/xml/preferences.xml
+++ b/uhabits-android/src/main/res/xml/preferences.xml
@@ -81,6 +81,13 @@
                 android:title="@string/first_day_of_the_week"
                 app:iconSpaceReserved="false" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_inverse_checkmark_colors"
+            android:summary="@string/pref_inverse_checkmark_colors_description"
+            android:title="@string/pref_inverse_checkmark_colors_title"
+            app:iconSpaceReserved="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
index e01ac73c8..2f3b961a2 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/preferences/Preferences.kt
@@ -205,6 +205,13 @@ open class Preferences(private val storage: Storage) {
             for (l in listeners) l.onQuestionMarksChanged()
         }
 
+    var isCheckmarkWidgetColorInverted: Boolean
+        get() = storage.getBoolean("pref_inverse_checkmark_colors", false)
+        set(value) {
+            storage.putBoolean("pref_inverse_checkmark_colors", value)
+            for (l in listeners) l.onCheckmarkColorsChanged()
+        }
+
     /**
      * @return An integer representing the first day of the week. Sunday
      * corresponds to 1, Monday to 2, and so on, until Saturday, which is
@@ -237,6 +244,7 @@ open class Preferences(private val storage: Storage) {
         fun onCheckmarkSequenceChanged() {}
         fun onNotificationsChanged() {}
         fun onQuestionMarksChanged() {}
+        fun onCheckmarkColorsChanged() {}
     }
 
     interface Storage {