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/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c9710e6..18d646f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,19 +1,31 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9b2307c..475de5a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/FunFacts.iml b/TH-GitHub-FunFacts.iml
similarity index 71%
rename from FunFacts.iml
rename to TH-GitHub-FunFacts.iml
index 5def1bf..d5b1521 100644
--- a/FunFacts.iml
+++ b/TH-GitHub-FunFacts.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/app/app.iml b/app/app.iml
index 1593039..6aaaf1a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -9,13 +9,9 @@
-
-
-
- generateDebugAndroidTestSources
generateDebugSources
@@ -26,72 +22,95 @@
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2007557..40d7e87 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
+ minSdkVersion 16
+ targetSdkVersion 27
versionCode 1
versionName "1.0"
}
@@ -20,6 +20,6 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:23.0.0'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support:appcompat-v7:27.1.1'
}
diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java
index 8a62442..207fa65 100644
--- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java
+++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java
@@ -19,7 +19,10 @@ public class ColorWheel {
"#e0ab18", // mustard
"#637a91", // dark gray
"#f092b0", // pink
- "#b7c0c7" // light gray
+ "#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..499a407 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.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -15,5 +19,9 @@ buildscript {
allprojects {
repositories {
jcenter()
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7faee0..ba9b119 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.4-all.zip