From 8a80a66a80a75bb3ea5dcea0bd40437bfcdb1c4c Mon Sep 17 00:00:00 2001 From: austil Date: Sat, 6 May 2017 16:38:14 +0200 Subject: [PATCH] More Colors for habits --- .../isoron/uhabits/models/HabitListTest.java | 4 +- .../org/isoron/uhabits/utils/ColorUtils.java | 54 ++++++++++--------- app/src/main/res/values/colors.xml | 9 ++++ .../isoron/uhabits/models/HabitListTest.java | 4 +- 4 files changed, 43 insertions(+), 28 deletions(-) diff --git a/app/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java b/app/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java index 92f71a3f4..109627d47 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/models/HabitListTest.java @@ -181,8 +181,8 @@ public class HabitListTest extends BaseAndroidTest String expectedCSV = "Position,Name,Description,NumRepetitions,Interval,Color\n" + - "001,Meditate,Did you meditate this morning?,1,1,#AFB42B\n" + - "002,Wake up early,Did you wake up before 6am?,2,3,#00897B\n"; + "001,Meditate,Did you meditate this morning?,1,1,#F9A825\n" + + "002,Wake up early,Did you wake up before 6am?,2,3,#388E3C\n"; StringWriter writer = new StringWriter(); habitList.writeCSV(writer); diff --git a/app/src/main/java/org/isoron/uhabits/utils/ColorUtils.java b/app/src/main/java/org/isoron/uhabits/utils/ColorUtils.java index 25434bacc..b7113027a 100644 --- a/app/src/main/java/org/isoron/uhabits/utils/ColorUtils.java +++ b/app/src/main/java/org/isoron/uhabits/utils/ColorUtils.java @@ -27,18 +27,21 @@ public abstract class ColorUtils { public static String CSV_PALETTE[] = { "#D32F2F", // 0 red - "#E64A19", // 1 orange - "#F9A825", // 2 yellow - "#AFB42B", // 3 light green - "#388E3C", // 4 dark green - "#00897B", // 5 teal - "#00ACC1", // 6 cyan - "#039BE5", // 7 blue - "#5E35B1", // 8 deep purple - "#8E24AA", // 9 purple - "#D81B60", // 10 pink - "#303030", // 11 dark grey - "#aaaaaa" // 12 light grey + "#E64A19", // 1 deep orange + "#F57C00", // 2 orange + "#F9A825", // 3 yellow + "#AFB42B", // 4 light green + "#388E3C", // 5 dark green + "#00897B", // 6 teal + "#00ACC1", // 7 cyan + "#039BE5", // 8 blue + "#5E35B1", // 9 deep purple + "#8E24AA", // 10 purple + "#D81B60", // 11 pink + "#5D4037", // 12 brown + "#303030", // 13 dark grey + "#757575", // 14 grey + "#aaaaaa" // 15 light grey }; public static int colorToPaletteIndex(Context context, int color) @@ -56,18 +59,21 @@ public abstract class ColorUtils { int palette[] = { Color.parseColor("#D32F2F"), // 0 red - Color.parseColor("#E64A19"), // 1 orange - Color.parseColor("#F9A825"), // 2 yellow - Color.parseColor("#AFB42B"), // 3 light green - Color.parseColor("#388E3C"), // 4 dark green - Color.parseColor("#00897B"), // 5 teal - Color.parseColor("#00ACC1"), // 6 cyan - Color.parseColor("#039BE5"), // 7 blue - Color.parseColor("#5E35B1"), // 8 deep purple - Color.parseColor("#8E24AA"), // 9 purple - Color.parseColor("#D81B60"), // 10 pink - Color.parseColor("#303030"), // 11 dark grey - Color.parseColor("#aaaaaa") // 12 light grey + Color.parseColor("#E64A19"), // 1 deep orange + Color.parseColor("#F57C00"), // 2 orange + Color.parseColor("#F9A825"), // 3 yellow + Color.parseColor("#AFB42B"), // 4 light green + Color.parseColor("#388E3C"), // 5 dark green + Color.parseColor("#00897B"), // 6 teal + Color.parseColor("#00ACC1"), // 7 cyan + Color.parseColor("#039BE5"), // 8 blue + Color.parseColor("#5E35B1"), // 9 deep purple + Color.parseColor("#8E24AA"), // 10 purple + Color.parseColor("#D81B60"), // 11 pink + Color.parseColor("#5D4037"), // 12 brown + Color.parseColor("#303030"), // 13 dark grey + Color.parseColor("#757575"), // 14 grey + Color.parseColor("#aaaaaa") // 15 light grey }; return palette[index]; diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 29616a09e..4138ed7e5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -19,6 +19,7 @@ @color/red_700 @color/deep_orange_700 + @color/orange_700 @color/yellow_800 @color/lime_700 @color/green_700 @@ -28,13 +29,16 @@ @color/deep_purple_600 @color/purple_600 @color/pink_600 + @color/brown_700 @color/grey_800 + @color/grey_600 @color/grey_500 @color/red_200 @color/deep_orange_200 + @color/orange_200 @color/yellow_200 @color/lime_200 @color/green_A200 @@ -44,13 +48,16 @@ @color/deep_purple_200 @color/purple_200 @color/pink_200 + @color/brown_200 @color/grey_100 + @color/grey_300 @color/grey_500 @color/red_800 @color/deep_orange_800 + @color/orange_800 @color/yellow_800 @color/lime_800 @color/green_700 @@ -60,6 +67,8 @@ @color/deep_purple_700 @color/purple_700 @color/pink_700 + @color/brown_800 + @color/black_aa @color/black_aa @color/black_aa diff --git a/app/src/test/java/org/isoron/uhabits/models/HabitListTest.java b/app/src/test/java/org/isoron/uhabits/models/HabitListTest.java index 961e1536c..2b77f9f02 100644 --- a/app/src/test/java/org/isoron/uhabits/models/HabitListTest.java +++ b/app/src/test/java/org/isoron/uhabits/models/HabitListTest.java @@ -172,8 +172,8 @@ public class HabitListTest extends BaseUnitTest String expectedCSV = "Position,Name,Description,NumRepetitions,Interval,Color\n" + - "001,Meditate,Did you meditate this morning?,1,1,#AFB42B\n" + - "002,Wake up early,Did you wake up before 6am?,2,3,#00897B\n"; + "001,Meditate,Did you meditate this morning?,1,1,#F9A825\n" + + "002,Wake up early,Did you wake up before 6am?,2,3,#388E3C\n"; StringWriter writer = new StringWriter(); list.writeCSV(writer);