From 6b390b04475e25c5e80e9cab790097d71b114b91 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 10 Mar 2020 17:13:59 -0500
Subject: [PATCH] Add option to disable color saturation

---
 app/src/main/java/org/tasks/Tasks.java        |   2 +
 .../preferences/fragments/LookAndFeel.kt      |   9 ++
 .../java/org/tasks/themes/ThemeColor.java     | 100 +++++++++---------
 app/src/main/res/values/keys.xml              |   1 +
 app/src/main/res/values/strings.xml           |   3 +
 .../res/xml/preferences_look_and_feel.xml     |   7 ++
 6 files changed, 74 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/org/tasks/Tasks.java b/app/src/main/java/org/tasks/Tasks.java
index 91a170fd1..56bfe98bf 100644
--- a/app/src/main/java/org/tasks/Tasks.java
+++ b/app/src/main/java/org/tasks/Tasks.java
@@ -26,6 +26,7 @@ import org.tasks.scheduling.CalendarNotificationIntentService;
 import org.tasks.scheduling.NotificationSchedulerIntentService;
 import org.tasks.scheduling.RefreshScheduler;
 import org.tasks.themes.ThemeBase;
+import org.tasks.themes.ThemeColor;
 import timber.log.Timber;
 
 public class Tasks extends InjectingApplication {
@@ -58,6 +59,7 @@ public class Tasks extends InjectingApplication {
     preferences.setSyncOngoing(false);
 
     ThemeBase.getThemeBase(preferences, inventory, null).setDefaultNightMode();
+    ThemeColor.enableSaturation(preferences.getBoolean(R.string.p_desaturate_colors, true));
 
     localBroadcastManager.registerRefreshReceiver(new RefreshBroadcastReceiver());
 
diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
index e7a56da22..6e0a85657 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
@@ -5,6 +5,7 @@ import android.content.ComponentName
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.widget.Toast
@@ -107,6 +108,14 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange
             true
         }
 
+        findPreference(R.string.p_desaturate_colors).setOnPreferenceChangeListener { _, newValue ->
+            ThemeColor.enableSaturation(newValue as Boolean)
+            if (context?.resources?.configuration?.uiMode?.and(Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES) {
+                activity?.recreate()
+            }
+            true
+        }
+
         val defaultList = findPreference(R.string.p_default_list)
         val filter: Filter = defaultFilterProvider.defaultFilter
         defaultList.summary = filter.listingTitle
diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java
index b47cb3a00..a5a45e831 100644
--- a/app/src/main/java/org/tasks/themes/ThemeColor.java
+++ b/app/src/main/java/org/tasks/themes/ThemeColor.java
@@ -26,6 +26,7 @@ import androidx.core.graphics.ColorUtils;
 import androidx.core.os.ParcelCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
+import java.util.Collections;
 import java.util.Map;
 import org.tasks.R;
 import org.tasks.dialogs.ColorPalettePicker.Pickable;
@@ -167,57 +168,62 @@ public class ThemeColor implements Pickable {
   private static final int WHITE = -1;
   private static final int BLACK = -16777216;
 
-  private static final Map<Integer, Integer> colorMap = newHashMap();
+  private static final Map<Integer, Integer> saturated = newHashMap();
+  public static Map<Integer, Integer> colorMap = saturated;
+
+  public static void enableSaturation(boolean enabled) {
+    colorMap = enabled ? saturated : Collections.emptyMap();
+  }
 
   static {
     // 2014 material design palette
-    colorMap.put(-10453621, -5194043); // blue_grey
-    colorMap.put(-12434878, -14606047); // grey
-    colorMap.put(-769226, -1074534); // red
-    colorMap.put(-1499549, -749647); // pink
-    colorMap.put(-6543440, -3238952); // purple
-    colorMap.put(-10011977, -5005861); // deep purple
-    colorMap.put(-12627531, -6313766); // indigo
-    colorMap.put(-14575885, -7288071); // blue
-    colorMap.put(-16537100, -8268550); // light blue
-    colorMap.put(-16728876, -8331542); // cyan
-    colorMap.put(-16738680, -8336444); // teal
-    colorMap.put(-11751600, -5908825); // green
-    colorMap.put(-7617718, -3808859); // light green
-    colorMap.put(-3285959, -1642852); // lime
-    colorMap.put(-5317, -2659); // yellow
-    colorMap.put(-16121, -8062); // amber
-    colorMap.put(-26624, -13184); // orange
-    colorMap.put(-43230, -21615); // deep orange
-    colorMap.put(-8825528, -4412764); // brown
-    colorMap.put(-6381922, -1118482); // grey
-    colorMap.put(-1, -16777216); // white & black
+    saturated.put(-10453621, -5194043); // blue_grey
+    saturated.put(-12434878, -14606047); // grey
+    saturated.put(-769226, -1074534); // red
+    saturated.put(-1499549, -749647); // pink
+    saturated.put(-6543440, -3238952); // purple
+    saturated.put(-10011977, -5005861); // deep purple
+    saturated.put(-12627531, -6313766); // indigo
+    saturated.put(-14575885, -7288071); // blue
+    saturated.put(-16537100, -8268550); // light blue
+    saturated.put(-16728876, -8331542); // cyan
+    saturated.put(-16738680, -8336444); // teal
+    saturated.put(-11751600, -5908825); // green
+    saturated.put(-7617718, -3808859); // light green
+    saturated.put(-3285959, -1642852); // lime
+    saturated.put(-5317, -2659); // yellow
+    saturated.put(-16121, -8062); // amber
+    saturated.put(-26624, -13184); // orange
+    saturated.put(-43230, -21615); // deep orange
+    saturated.put(-8825528, -4412764); // brown
+    saturated.put(-6381922, -1118482); // grey
+    saturated.put(WHITE, BLACK);
 
     // 2019 google calendar
-    colorMap.put(-2818048, -3397335); // tomato
-    colorMap.put(-765666, -2136512); // tangerine
-    colorMap.put(-1086464, -2459092); // pumpkin
-    colorMap.put(-1010944, -2254804); // mango
-    colorMap.put(-606426, -2050234); // banana
-    colorMap.put(-1784767, -2769834); // citron
-    colorMap.put(-4142541, -4274613); // avocado
-    colorMap.put(-8604862, -7817131); // pistachio
-    colorMap.put(-16023485, -14116514); // basil
-    //    colorMap.put(-16738680, -14571622); // eucalyptus
-    colorMap.put(-13388167, -11879802); // sage
-    colorMap.put(-16540699, -13787178); // peacock
-    colorMap.put(-12417548, -10974241); // cobalt
-    //    colorMap.put(-12627531, -11312199); // blueberry
-    colorMap.put(-8812853, -8615738); // lavender
-    colorMap.put(-5005861, -5597744); // wisteria
-    colorMap.put(-6395473, -5934410); // amethyst
-    colorMap.put(-7461718, -6668365); // grape
-    colorMap.put(-5434281, -4967572); // radicchio
-    colorMap.put(-2614432, -3261327); // cherry blossom
-    colorMap.put(-1672077, -2654344); // flamingo
-    //    colorMap.put(-8825528, -6984611); // cocoa
-    colorMap.put(-10395295, -7895161); // graphite
-    colorMap.put(-5792882, -5135210); // birch
+    saturated.put(-2818048, -3397335); // tomato
+    saturated.put(-765666, -2136512); // tangerine
+    saturated.put(-1086464, -2459092); // pumpkin
+    saturated.put(-1010944, -2254804); // mango
+    saturated.put(-606426, -2050234); // banana
+    saturated.put(-1784767, -2769834); // citron
+    saturated.put(-4142541, -4274613); // avocado
+    saturated.put(-8604862, -7817131); // pistachio
+    saturated.put(-16023485, -14116514); // basil
+    //    saturated.put(-16738680, -14571622); // eucalyptus
+    saturated.put(-13388167, -11879802); // sage
+    saturated.put(-16540699, -13787178); // peacock
+    saturated.put(-12417548, -10974241); // cobalt
+    //    saturated.put(-12627531, -11312199); // blueberry
+    saturated.put(-8812853, -8615738); // lavender
+    saturated.put(-5005861, -5597744); // wisteria
+    saturated.put(-6395473, -5934410); // amethyst
+    saturated.put(-7461718, -6668365); // grape
+    saturated.put(-5434281, -4967572); // radicchio
+    saturated.put(-2614432, -3261327); // cherry blossom
+    saturated.put(-1672077, -2654344); // flamingo
+    //    saturated.put(-8825528, -6984611); // cocoa
+    saturated.put(-10395295, -7895161); // graphite
+    saturated.put(-5792882, -5135210); // birch
   }
 
   private final int original;
@@ -295,8 +301,6 @@ public class ThemeColor implements Pickable {
     if (colorMap.containsKey(color)) {
       //noinspection ConstantConditions
       return colorMap.get(color);
-    } else if (color == WHITE) {
-      return BLACK; // white -> black
     } else {
       return color;
     }
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 22a1d4926..1f8c4e08b 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -290,4 +290,5 @@
   <string name="p_notified_oauth_error">notified_oauth_error_%s_%s</string>
   <string name="p_chip_style">chip_style</string>
   <string name="p_chip_appearance">chip_appearance</string>
+  <string name="p_desaturate_colors">desaturate_colors</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9d946eb8..2e31f27ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -563,4 +563,7 @@ File %1$s contained %2$s.\n\n
   <string name="chip_style_filled">Filled</string>
   <string name="chips">Chips</string>
   <string name="chip_appearance">Chip appearance</string>
+  <string name="desaturate_colors">Desaturate colors</string>
+  <string name="desaturate_colors_summary_on">Colors will be desaturated in dark themes</string>
+  <string name="desaturate_colors_summary_off">Colors will not be desaturated in dark themes</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml
index 3bed3b0a8..a90d823e6 100644
--- a/app/src/main/res/xml/preferences_look_and_feel.xml
+++ b/app/src/main/res/xml/preferences_look_and_feel.xml
@@ -19,6 +19,13 @@
     android:key="@string/p_theme_launcher"
     android:title="@string/launcher_icon" />
 
+  <SwitchPreferenceCompat
+    android:defaultValue="true"
+    android:key="@string/p_desaturate_colors"
+    android:title="@string/desaturate_colors"
+    android:summaryOn="@string/desaturate_colors_summary_on"
+    android:summaryOff="@string/desaturate_colors_summary_off" />
+
   <PreferenceCategory
     android:key="@string/task_list_options"
     android:title="@string/task_list_options">