From ae020c30526a238fb03cdb79e62f0b940f8989c1 Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 00:50:24 +0530 Subject: [PATCH 1/8] Adding whole files --- .idea/.name | 1 - .idea/gradle.xml | 1 + .idea/misc.xml | 24 ++++++++ .idea/modules.xml | 2 +- FunFacts.iml | 19 ------- app/app.iml | 71 +++++++++++++++--------- app/build.gradle | 8 +-- build.gradle | 6 +- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 82 insertions(+), 53 deletions(-) delete mode 100644 .idea/.name delete mode 100644 FunFacts.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/gradle.xml b/.idea/gradle.xml index bd4202c..c6183f8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,6 +13,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..7e40dfc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,30 @@ + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b2307c..48e2837 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + 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 index 1593039..d2ee7bb 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + + + @@ -48,50 +46,71 @@ - + + + + + + + + - + - + + + + + + + + - + - - - - - - - - - - + + + + + + + - - - + + + + + - + - - - + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2007557..3ca574d 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 25 + buildToolsVersion "26.0.1" defaultConfig { applicationId "com.teamtreehouse.funfacts" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -21,5 +21,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.android.support:appcompat-v7:25.3.1' } diff --git a/build.gradle b/build.gradle index 1b7886d..d9dde6f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,3 +17,7 @@ allprojects { jcenter() } } + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1d3591c..4e7c65d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,7 @@ # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..eaba301 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-3.3-all.zip From 06a2381e2ec13761ef34e02c1cf605950551e50d Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 00:53:27 +0530 Subject: [PATCH 2/8] Adding whole files --- 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..9bd6742 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 + "#ddca8b" // gold color }; // Method (abilities: things the object can do) From df731211c3c505e26cd73aa94b359586d6c3b224 Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 00:56:04 +0530 Subject: [PATCH 3/8] Adding whole files --- 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..fdfae8e 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 + }; // Method (abilities: things the object can do) From 65b946f4d2ff8dd773e41b48eef00a6451346859 Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 01:01:01 +0530 Subject: [PATCH 4/8] Adding whole files --- .../com/teamtreehouse/funfacts/ColorWheel.java | 14 +++++++++++++- 1 file changed, 13 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 fdfae8e..174a119 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -20,7 +20,19 @@ public class ColorWheel { "#637a91", // dark gray "#f092b0", // pink "#b7c0c7", // light gray - +<<<<<<< Updated upstream + +======= +<<<<<<< Updated upstream + "#ddca8b" // gold color +======= +<<<<<<< HEAD + +======= + "#ddca8b" // gold color +>>>>>>> adding_gold_color +>>>>>>> Stashed changes +>>>>>>> Stashed changes }; // Method (abilities: things the object can do) From 0c735add659bb95e3b5d7b015f3d0961f56293d9 Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 01:01:54 +0530 Subject: [PATCH 5/8] Adding whole files --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 9bd6742..8a62442 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,8 +19,7 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7", // light gray - "#ddca8b" // gold color + "#b7c0c7" // light gray }; // Method (abilities: things the object can do) From 63d0ea40f7bb3ff3435809101411f1cb5bd4e1a0 Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 01:02:28 +0530 Subject: [PATCH 6/8] Adding whole files --- .../com/teamtreehouse/funfacts/ColorWheel.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 174a119..558dce4 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,20 +19,8 @@ public class ColorWheel { "#e0ab18", // mustard "#637a91", // dark gray "#f092b0", // pink - "#b7c0c7", // light gray -<<<<<<< Updated upstream - -======= -<<<<<<< Updated upstream - "#ddca8b" // gold color -======= -<<<<<<< HEAD - -======= - "#ddca8b" // gold color ->>>>>>> adding_gold_color ->>>>>>> Stashed changes ->>>>>>> Stashed changes + "#b7c0c7" // light gray + }; // Method (abilities: things the object can do) From f5f4a8b8668849827d5b3192e50d693d2a9bc84c Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 01:06:43 +0530 Subject: [PATCH 7/8] Adding gold --- 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..18caf63 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 + "#ddca8b" // gold colors }; // Method (abilities: things the object can do) From 925819d1ae383fbd03327dc7272a0122f18467e6 Mon Sep 17 00:00:00 2001 From: sidlumen15 Date: Wed, 9 Aug 2017 01:07:46 +0530 Subject: [PATCH 8/8] Adding bronze --- 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 558dce4..c640251 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 };