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..8010b56 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,7 +3,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..17958cf 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,17 +3,31 @@ - - - - - - - - - + + + - + diff --git a/app/app.iml b/app/app.iml index 1593039..19765e7 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + - + + + + - + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + - + - - - + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2007557..44c8635 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 27 + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.teamtreehouse.funfacts" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -21,5 +21,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.android.support:appcompat-v7:27.0.2' } diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..85ae4f4 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 + "#8b4513", // bronze + "#b7c0c7", // light gray + "#ddca8b" // gold }; // Method (abilities: things the object can do) diff --git a/build.gradle b/build.gradle index 1b7886d..dcba93d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,5 +16,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..61aefdc 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 +#Sun Feb 11 19:52:17 GMT 2018 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-4.1-all.zip