From 4cce99606c3c1c58967f32e37614171da9950d20 Mon Sep 17 00:00:00 2001 From: suddencreator Date: Sat, 9 Oct 2021 22:32:54 -0400 Subject: [PATCH 1/2] added gold color --- .idea/.name | 1 - .idea/caches/build_file_checksums.ser | Bin 0 -> 537 bytes .idea/compiler.xml | 18 +--- .idea/gradle.xml | 6 +- .idea/jarRepositories.xml | 25 +++++ .idea/misc.xml | 12 +-- .idea/modules.xml | 4 +- .idea/modules/android-fun-facts-github.iml | 20 ++++ .../app/android-fun-facts-github.app.iml | 45 ++++++++ FunFacts.iml | 19 ---- app/app.iml | 97 ------------------ app/build.gradle | 8 +- .../teamtreehouse/funfacts/ColorWheel.java | 4 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 15 files changed, 111 insertions(+), 156 deletions(-) delete mode 100644 .idea/.name create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/modules/android-fun-facts-github.iml create mode 100644 .idea/modules/app/android-fun-facts-github.app.iml 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/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..4d1ebb6108b75ce44fb4c33b6758b3c5cd0550b0 GIT binary patch literal 537 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}Q#7BMhIJFWRF{)3GpR0BG( zIJKlCGcUaurm>Krj)4uNcHYf|eKz;m^K=vRq{5vJFDzluaJGsGElw>ej>#;}NKA}@ zYKcLFWI<|CNoHzsDcq1NvOPEZ88)%JY~Y;n=7&>V2?Gy`GvNvwrE1mr>Wb@(twpAv zo@F2j^ixiLa$*iBelSd3Q6AF#{L%Z(cOsuQmIZ6el`sh6af5bvG((x*D&?kmwf^QG ILVi{N0H@u!rvLx| literal 0 HcmV?d00001 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..24ee99a 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,7 +19,9 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7" // light gray + "#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 From 3dfb64e124ce7c6e1113d62e09aba6b3c99092c5 Mon Sep 17 00:00:00 2001 From: suddencreator Date: Sat, 9 Oct 2021 22:34:58 -0400 Subject: [PATCH 2/2] added bronze color --- .idea/gradle.xml | 4 ++++ .idea/misc.xml | 15 +-------------- app/app.iml | 3 ++- .../com/teamtreehouse/funfacts/ColorWheel.java | 3 ++- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..655216d 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..b43498c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,6 @@ - - - - - - - - - - - - - - + diff --git a/app/app.iml b/app/app.iml index 1593039..93ac62c 100644 --- a/app/app.iml +++ b/app/app.iml @@ -4,12 +4,13 @@