From bfacf31c6f622211939e747a8d6441c4caf74d0b Mon Sep 17 00:00:00 2001 From: Lioness694 Date: Sun, 23 Jul 2017 21:58:36 +0200 Subject: [PATCH 1/2] Add gold color --- .idea/.name | 1 - .idea/gradle.xml | 1 + .idea/misc.xml | 24 ++++++++++++ .idea/modules.xml | 2 +- FunFacts.iml | 19 ---------- app/app.iml | 37 ++++++++----------- .../teamtreehouse/funfacts/ColorWheel.java | 3 +- 7 files changed, 43 insertions(+), 44 deletions(-) delete mode 100644 .idea/.name delete mode 100644 FunFacts.iml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 3f76547..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Fun Facts \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..c6183f8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,6 +13,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..7e40dfc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,30 @@ + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b2307c..1f0fc78 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/FunFacts.iml b/FunFacts.iml deleted file mode 100644 index 5def1bf..0000000 --- a/FunFacts.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 1593039..61edf89 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + @@ -48,50 +44,47 @@ - + + + + + + - - + + + + + + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..637bb59 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 534a0cab81aa536153f34113199f9f873412be2b Mon Sep 17 00:00:00 2001 From: Lioness694 Date: Sun, 23 Jul 2017 22:03:04 +0200 Subject: [PATCH 2/2] Add bronze color --- .idea/gradle.xml | 1 + .idea/misc.xml | 24 ++++++++++++ .idea/modules.xml | 2 +- FunFacts.iml | 19 ---------- app/app.iml | 37 ++++++++----------- .../teamtreehouse/funfacts/ColorWheel.java | 4 +- 6 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 FunFacts.iml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..c6183f8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,6 +13,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..7e40dfc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,30 @@ + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b2307c..1f0fc78 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/FunFacts.iml b/FunFacts.iml deleted file mode 100644 index 5def1bf..0000000 --- a/FunFacts.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 1593039..61edf89 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + @@ -48,50 +44,47 @@ - + + + + + + - - + + + + + + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..865c96c 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,7 +19,9 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7" // light gray + "#b7c0c7", // light gray + "#8b4513" //bronze + }; // Method (abilities: things the object can do)