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/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..4d1ebb6 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..4919393 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,9 +1,11 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..74bff5b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,17 +3,7 @@ - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b2307c..9dacc3a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/.idea/modules/android-fun-facts-github.iml b/.idea/modules/android-fun-facts-github.iml new file mode 100644 index 0000000..aa9a74f --- /dev/null +++ b/.idea/modules/android-fun-facts-github.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/android-fun-facts-github.app.iml b/.idea/modules/app/android-fun-facts-github.app.iml new file mode 100644 index 0000000..8d37c6d --- /dev/null +++ b/.idea/modules/app/android-fun-facts-github.app.iml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FunFacts.iml b/FunFacts.iml deleted file mode 100644 index 5def1bf..0000000 --- a/FunFacts.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index 1593039..0000000 --- a/app/app.iml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2007557..35faa8c 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 30 + buildToolsVersion "31.0.0" defaultConfig { applicationId "com.teamtreehouse.funfacts" - minSdkVersion 15 - targetSdkVersion 23 + minSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "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..a7e51e9 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 + "#8b4513", //bronze + "#b7c0c7", // light gray + "#ddca8b" //gold + }; // Method (abilities: things the object can do) diff --git a/build.gradle b/build.gradle index 1b7886d..c2361ac 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:4.1.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..a193790 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 +#Sat Oct 09 22:15:47 EDT 2021 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-6.5-all.zip \ No newline at end of file