From c1c9d09efdec6b75cf3631a52b70793667be0ee5 Mon Sep 17 00:00:00 2001 From: FlapjackStaxx <93682443+FlapjackStaxx@users.noreply.github.com> Date: Mon, 10 Jan 2022 12:28:58 -0700 Subject: [PATCH 1/3] Add gold color --- .idea/.name | 1 - .idea/compiler.xml | 18 +--- .idea/gradle.xml | 3 + .idea/misc.xml | 12 +-- .idea/modules.xml | 4 +- .idea/runConfigurations.xml | 12 --- FunFacts.iml | 19 ---- app/app.iml | 97 ------------------- app/build.gradle | 11 ++- .../teamtreehouse/funfacts/ColorWheel.java | 3 +- build.gradle | 3 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 18 insertions(+), 167 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/runConfigurations.xml delete mode 100644 FunFacts.iml delete mode 100644 app/app.iml 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/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..f8bbd49 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ + 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/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ 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..7c6478c 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 29 + buildToolsVersion "23.0.3" defaultConfig { applicationId "com.teamtreehouse.funfacts" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -20,6 +20,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + //noinspection GradleCompatible + implementation 'com.android.support:appcompat-v7:23.4.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..d496e22 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,7 +19,8 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7" // light gray + "#b7c0c7", // light gray + "#ddcaab" // gold }; // Method (abilities: things the object can do) diff --git a/build.gradle b/build.gradle index 1b7886d..6d66689 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:7.0.4' // 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 e7faee0..e2bfe2e 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-7.0.2-all.zip From 875afd6481dcc9b03794663ff048fb76de5b9e71 Mon Sep 17 00:00:00 2001 From: FlapjackStaxx <93682443+FlapjackStaxx@users.noreply.github.com> Date: Mon, 10 Jan 2022 12:33:04 -0700 Subject: [PATCH 2/3] Add bronze color --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 8a62442..58a9fd5 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,7 +19,8 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7" // light gray + "#b7c0c7", // light gray + "#8b4513" // bronze }; // Method (abilities: things the object can do) From 7a7c6d6c1af7a1c3fee0386c1e34384426704a2a Mon Sep 17 00:00:00 2001 From: FlapjackStaxx <93682443+FlapjackStaxx@users.noreply.github.com> Date: Mon, 10 Jan 2022 12:33:59 -0700 Subject: [PATCH 3/3] Add bronze color --- .idea/gradle.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..aadc689 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,7 @@