From 3e8dc0b205d1121bff0ca52b740afd5e2f0010b0 Mon Sep 17 00:00:00 2001 From: Stephen Cornett Date: Fri, 28 Apr 2017 15:33:47 -0400 Subject: [PATCH 1/3] Added gold --- .idea/gradle.xml | 1 + .idea/misc.xml | 24 ++++++++++++++++++++++++ .idea/modules.xml | 2 +- FunFacts.iml | 19 ------------------- app/app.iml | 36 +++++++++++++++--------------------- 5 files changed, 41 insertions(+), 41 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..3eccbae 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + @@ -48,50 +44,48 @@ - + + + + + + - + + + + + + - - - - - - - - - - - - - - + + \ No newline at end of file From 9b4a72f21ed06d6bc32bd8b0c0f96fa55b25ff53 Mon Sep 17 00:00:00 2001 From: Stephen Cornett Date: Fri, 28 Apr 2017 15:36:50 -0400 Subject: [PATCH 2/3] Added gold --- .idea/.name | 1 - app/app.iml | 23 ++++++++++++++--------- app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 .idea/.name 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/app/app.iml b/app/app.iml index 3eccbae..632ce8d 100644 --- a/app/app.iml +++ b/app/app.iml @@ -31,12 +31,14 @@ + + @@ -45,40 +47,43 @@ + + - - - - - - + + + + + + + + + - - + - diff --git a/app/build.gradle b/app/build.gradle index 2007557..617f872 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.0" + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.teamtreehouse.funfacts" diff --git a/build.gradle b/build.gradle index 1b7886d..072e693 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..aaf2573 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Fri Apr 28 15:34:46 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 29ec3636a2cf27f609fcde23af387be905457733 Mon Sep 17 00:00:00 2001 From: Stephen Cornett Date: Fri, 28 Apr 2017 15:37:45 -0400 Subject: [PATCH 3/3] Added gold --- app/app.iml | 2 -- .../main/java/com/teamtreehouse/funfacts/ColorWheel.java | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app.iml b/app/app.iml index 632ce8d..ff883b3 100644 --- a/app/app.iml +++ b/app/app.iml @@ -76,7 +76,6 @@ - @@ -84,7 +83,6 @@ - diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..5545b12 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,12 +19,14 @@ 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) public int getColor() { - String color = ""; + String color = "1"; // Randomly select a fact Random randomGenerator = new Random(); // Construct a new Random number generator