diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..760ea46
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..c9b5619
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/android-fun-facts.iml b/.idea/modules/android-fun-facts.iml
new file mode 100644
index 0000000..42ecf25
--- /dev/null
+++ b/.idea/modules/android-fun-facts.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index fd04da4..b8be089 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -10,9 +10,10 @@
-
-
-
+
+
+ generateDebugSources
+
@@ -21,46 +22,82 @@
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 311784e..dc966c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,19 +1,19 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 19
- buildToolsVersion "20.0.0"
+ compileSdkVersion 25
+
defaultConfig {
applicationId "com.teamtreehouse.funfacts"
minSdkVersion 14
- targetSdkVersion 19
+ targetSdkVersion 25
versionCode 1
versionName "1.0"
}
buildTypes {
release {
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java
index 78847bf..12f0764 100644
--- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java
+++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java
@@ -23,7 +23,10 @@ public class ColorWheel {
"#e0ab18",
"#637a91",
"#f092b0",
- "#b7c0c7"
+ "#8b4513",
+ "#b7c0c7",
+ "#ddca8b"
+
};
// Method (abilities: things the object can do)
diff --git a/build.gradle b/build.gradle
index a75fc81..2540ef4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
+ 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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e61d1f..e93a684 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 May 06 18:54:16 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/local.properties b/local.properties
index 2247327..22bc3b3 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,11 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
-# This file should *NOT* be checked into Version Control Systems,
+# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=/Applications/Android Studio.app/sdk
\ No newline at end of file
+#Sun May 06 18:45:11 CEST 2018
+sdk.dir=/Users/mehdifabienpazuki/Library/Android/sdk