From 60b1d6494d81a3671ab08e7cac298925633d0a56 Mon Sep 17 00:00:00 2001 From: ryanbrashear Date: Wed, 28 Jun 2017 11:03:17 -0400 Subject: [PATCH 1/2] Add gold color --- .idea/.name | 1 - .idea/gradle.xml | 1 + .idea/misc.xml | 24 ++++++ .idea/modules.xml | 2 +- FunFacts.iml => android-fun-facts-github.iml | 2 +- app/app.iml | 84 +++++++++++++------ app/build.gradle | 13 +-- .../teamtreehouse/funfacts/ColorWheel.java | 3 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 10 files changed, 98 insertions(+), 38 deletions(-) delete mode 100644 .idea/.name rename FunFacts.iml => android-fun-facts-github.iml (71%) 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..8ff2b6c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/FunFacts.iml b/android-fun-facts-github.iml similarity index 71% rename from FunFacts.iml rename to android-fun-facts-github.iml index 5def1bf..b4c57fd 100644 --- a/FunFacts.iml +++ b/android-fun-facts-github.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 1593039..410658a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + + + @@ -48,50 +46,84 @@ - + + + + + + + + - + - + + + + + + + + - + + - - - - - - - - - - + + + + + + + - - - + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2007557..035223b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.0" + compileSdkVersion 25 + buildToolsVersion '25.0.3' defaultConfig { applicationId "com.teamtreehouse.funfacts" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -21,5 +21,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' -} + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.+' +} \ 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..e4d56c6 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 + "#ddcaab" //gold }; // Method (abilities: things the object can do) diff --git a/build.gradle b/build.gradle index 1b7886d..5966013 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.3' // 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..ce1d442 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 +#Wed Jun 28 09:26:17 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 3cd2ed6db4fb472152a1e8af655ca125d87d87ab Mon Sep 17 00:00:00 2001 From: ryanbrashear Date: Wed, 28 Jun 2017 11:04:42 -0400 Subject: [PATCH 2/2] Add bronze color --- .idea/gradle.xml | 1 + .idea/misc.xml | 24 +++++++++++++++++++ app/app.iml | 1 - .../teamtreehouse/funfacts/ColorWheel.java | 4 +++- 4 files changed, 28 insertions(+), 2 deletions(-) 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/app/app.iml b/app/app.iml index 1593039..e5908db 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,7 +9,6 @@