From d0d3c7eef5430d0828e42251c78ff301edbe92dc Mon Sep 17 00:00:00 2001 From: austil Date: Sat, 3 Jun 2017 15:16:09 +0200 Subject: [PATCH] More Colors - requested changes --- app/build.gradle | 2 +- app/src/main/assets/migrations/20.sql | 12 ++++ .../org/isoron/uhabits/utils/ColorUtils.java | 60 +++++++++++-------- app/src/main/res/values/colors.xml | 12 ++++ .../isoron/uhabits/models/HabitListTest.java | 4 +- 5 files changed, 61 insertions(+), 29 deletions(-) create mode 100644 app/src/main/assets/migrations/20.sql diff --git a/app/build.gradle b/app/build.gradle index 8d1e3ce1f..6661682b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 15 targetSdkVersion 25 - buildConfigField "Integer", "databaseVersion", "19" + buildConfigField "Integer", "databaseVersion", "20" buildConfigField "String", "databaseFilename", "\"uhabits.db\"" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/assets/migrations/20.sql b/app/src/main/assets/migrations/20.sql new file mode 100644 index 000000000..20cd9fe89 --- /dev/null +++ b/app/src/main/assets/migrations/20.sql @@ -0,0 +1,12 @@ +update habits set color=19 where color=12; +update habits set color=17 where color=11; +update habits set color=15 where color=10; +update habits set color=14 where color=9; +update habits set color=13 where color=8; +update habits set color=10 where color=7; +update habits set color=9 where color=6; +update habits set color=8 where color=5; +update habits set color=7 where color=4; +update habits set color=5 where color=3; +update habits set color=4 where color=2; +update habits set color=0 where color<0 or color>19; \ No newline at end of file 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 b7113027a..7c4d15412 100644 --- a/app/src/main/java/org/isoron/uhabits/utils/ColorUtils.java +++ b/app/src/main/java/org/isoron/uhabits/utils/ColorUtils.java @@ -29,19 +29,23 @@ public abstract class ColorUtils "#D32F2F", // 0 red "#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 + "#FF8F00", // 3 amber + "#F9A825", // 4 yellow + "#AFB42B", // 5 lime + "#7CB342", // 6 light green + "#388E3C", // 7 green + "#00897B", // 8 teal + "#00ACC1", // 9 cyan + "#039BE5", // 10 light blue + "#1976D2", // 11 blue + "#303F9F", // 12 indigo + "#5E35B1", // 13 deep purple + "#8E24AA", // 14 purple + "#D81B60", // 15 pink + "#5D4037", // 16 brown + "#303030", // 17 dark grey + "#757575", // 18 grey + "#aaaaaa" // 19 light grey }; public static int colorToPaletteIndex(Context context, int color) @@ -61,19 +65,23 @@ public abstract class ColorUtils Color.parseColor("#D32F2F"), // 0 red 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 + Color.parseColor("#FF8F00"), // 3 amber + Color.parseColor("#F9A825"), // 4 yellow + Color.parseColor("#AFB42B"), // 5 lime + Color.parseColor("#7CB342"), // 6 light green + Color.parseColor("#388E3C"), // 7 green + Color.parseColor("#00897B"), // 8 teal + Color.parseColor("#00ACC1"), // 9 cyan + Color.parseColor("#039BE5"), // 10 light blue + Color.parseColor("#1976D2"), // 11 blue + Color.parseColor("#303F9F"), // 12 indigo + Color.parseColor("#5E35B1"), // 13 deep purple + Color.parseColor("#8E24AA"), // 14 purple + Color.parseColor("#D81B60"), // 15 pink + Color.parseColor("#5D4037"), // 16 brown + Color.parseColor("#303030"), // 17 dark grey + Color.parseColor("#757575"), // 18 grey + Color.parseColor("#aaaaaa") // 19 light grey }; return palette[index]; diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4138ed7e5..0905b9e3d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -20,12 +20,16 @@ @color/red_700 @color/deep_orange_700 @color/orange_700 + @color/amber_800 @color/yellow_800 @color/lime_700 + @color/light_green_600 @color/green_700 @color/teal_600 @color/cyan_600 @color/light_blue_600 + @color/blue_700 + @color/indigo_700 @color/deep_purple_600 @color/purple_600 @color/pink_600 @@ -39,12 +43,16 @@ @color/red_200 @color/deep_orange_200 @color/orange_200 + @color/amber_100 @color/yellow_200 @color/lime_200 + @color/light_green_200 @color/green_A200 @color/teal_200 @color/cyan_200 @color/light_blue_200 + @color/blue_300 + @color/indigo_200 @color/deep_purple_200 @color/purple_200 @color/pink_200 @@ -58,12 +66,16 @@ @color/red_800 @color/deep_orange_800 @color/orange_800 + @color/amber_800 @color/yellow_800 @color/lime_800 + @color/light_green_600 @color/green_700 @color/teal_700 @color/cyan_700 @color/light_blue_700 + @color/blue_800 + @color/indigo_800 @color/deep_purple_700 @color/purple_700 @color/pink_700 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 2b77f9f02..9d5f90681 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,#F9A825\n" + - "002,Wake up early,Did you wake up before 6am?,2,3,#388E3C\n"; + "001,Meditate,Did you meditate this morning?,1,1,#FF8F00\n" + + "002,Wake up early,Did you wake up before 6am?,2,3,#AFB42B\n"; StringWriter writer = new StringWriter(); list.writeCSV(writer);