diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0833b17..18623c0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,6 +13,7 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b2307c..ee409e5 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/FunFacts.iml b/android-fun-facts-github-test.iml similarity index 71% rename from FunFacts.iml rename to android-fun-facts-github-test.iml index 5def1bf..5a80c68 100644 --- a/FunFacts.iml +++ b/android-fun-facts-github-test.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 1593039..92cace0 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..57e3717 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 "27.0.3" 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.1.0' } diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..dc6d029 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 + "#8b4624" //bronze5 + //cok 3 }; // Method (abilities: things the object can do) public int getColor() { - String color = ""; + String color; // Randomly select a fact Random randomGenerator = new Random(); // Construct a new Random number generator diff --git a/build.gradle b/build.gradle index 1b7886d..2706258 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name '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 +19,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..649480d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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