From 99d3a76b56a82099c3d6c1b9d4cf9b44f0332cc0 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 27 Jul 2015 10:48:39 -0700 Subject: [PATCH] Soften a few colors that are a bit too vibrant. Closes #3814 // FREEBIE --- .../securesms/color/MaterialColor.java | 14 +++++++------- .../securesms/color/MaterialColors.java | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/org/thoughtcrime/securesms/color/MaterialColor.java b/src/org/thoughtcrime/securesms/color/MaterialColor.java index e02284520..01f862f7c 100644 --- a/src/org/thoughtcrime/securesms/color/MaterialColor.java +++ b/src/org/thoughtcrime/securesms/color/MaterialColor.java @@ -8,20 +8,20 @@ import org.thoughtcrime.securesms.R; public enum MaterialColor { - RED (R.color.red_500, R.color.red_900, R.color.red_700, "red"), - PINK (R.color.pink_500, R.color.pink_900, R.color.pink_700, "pink"), - PURPLE (R.color.purple_500, R.color.purple_900, R.color.purple_700, "purple"), - DEEP_PURPLE(R.color.deep_purple_500, R.color.deep_purple_900, R.color.deep_purple_700, "deep_purple"), - INDIGO (R.color.indigo_500, R.color.indigo_900, R.color.indigo_700, "indigo"), + RED (R.color.red_400, R.color.red_900, R.color.red_700, "red"), + PINK (R.color.pink_400, R.color.pink_900, R.color.pink_700, "pink"), + PURPLE (R.color.purple_400, R.color.purple_900, R.color.purple_700, "purple"), + DEEP_PURPLE(R.color.deep_purple_400, R.color.deep_purple_900, R.color.deep_purple_700, "deep_purple"), + INDIGO (R.color.indigo_400, R.color.indigo_900, R.color.indigo_700, "indigo"), BLUE (R.color.blue_500, R.color.blue_900, R.color.blue_700, "blue"), LIGHT_BLUE (R.color.light_blue_500, R.color.light_blue_900, R.color.light_blue_700, "light_blue"), CYAN (R.color.cyan_500, R.color.cyan_900, R.color.cyan_700, "cyan"), TEAL (R.color.teal_500, R.color.teal_900, R.color.teal_700, "teal"), GREEN (R.color.green_500, R.color.green_900, R.color.green_700, "green"), - LIGHT_GREEN(R.color.light_green_500, R.color.light_green_900, R.color.light_green_700, "light_green"), + LIGHT_GREEN(R.color.light_green_600, R.color.light_green_900, R.color.light_green_700, "light_green"), LIME (R.color.lime_500, R.color.lime_900, R.color.lime_700, "lime"), YELLOW (R.color.yellow_500, R.color.yellow_900, R.color.yellow_700, "yellow"), - AMBER (R.color.amber_500, R.color.amber_900, R.color.amber_700, "amber"), + AMBER (R.color.amber_600, R.color.amber_900, R.color.amber_700, "amber"), ORANGE (R.color.orange_500, R.color.orange_900, R.color.orange_700, "orange"), DEEP_ORANGE(R.color.deep_orange_500, R.color.deep_orange_900, R.color.deep_orange_700, "deep_orange"), BROWN (R.color.brown_500, R.color.brown_900, R.color.brown_700, "brown"), diff --git a/src/org/thoughtcrime/securesms/color/MaterialColors.java b/src/org/thoughtcrime/securesms/color/MaterialColors.java index 30a906829..a02378cdb 100644 --- a/src/org/thoughtcrime/securesms/color/MaterialColors.java +++ b/src/org/thoughtcrime/securesms/color/MaterialColors.java @@ -29,7 +29,8 @@ public class MaterialColors { // Amber MaterialColor.ORANGE, MaterialColor.DEEP_ORANGE, - MaterialColor.BROWN, +// MaterialColor.BROWN, + MaterialColor.AMBER, // Grey MaterialColor.BLUE_GREY )));