From bea11552b8a333896fb84c40c96213b95f001786 Mon Sep 17 00:00:00 2001 From: Konstantinos Kalaitzidis <33810634+konkalaitzidis@users.noreply.github.com> Date: Wed, 31 Oct 2018 16:41:46 +0000 Subject: [PATCH 1/2] Add gold color --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..7be8d15 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,7 +19,8 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7" // light gray + "#b7c0c7", // light gray + "ddca8b" //gold }; // Method (abilities: things the object can do) From cdedf6c41eb81662fd2927c55e85e9441d2a184c Mon Sep 17 00:00:00 2001 From: Konstantinos Kalaitzidis <33810634+konkalaitzidis@users.noreply.github.com> Date: Wed, 31 Oct 2018 16:44:52 +0000 Subject: [PATCH 2/2] Add bronze color --- .idea/codeStyles/Project.xml | 29 ++++++++++++++ .idea/misc.xml | 38 ++++++++++++------- app/app.iml | 1 - .../teamtreehouse/funfacts/ColorWheel.java | 3 +- 4 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..18d646f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,31 @@ - - + + + - - - - - - - - - - - + diff --git a/app/app.iml b/app/app.iml index 1593039..e5908db 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,7 +9,6 @@