From 1780b27302cd29e50e0a3da2c091a7cc17f02ade Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 12:09:26 +0000 Subject: [PATCH 1/8] Gold color plus update gradle and APK --- .idea/.name | 1 - .idea/gradle.xml | 1 + .idea/misc.xml | 34 +++++--- .idea/modules.xml | 2 +- ...s.iml => android-fun-facts-github-test.iml | 2 +- app/app.iml | 78 ++++++++++++------- app/build.gradle | 8 +- .../teamtreehouse/funfacts/ColorWheel.java | 5 +- build.gradle | 7 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 90 insertions(+), 50 deletions(-) delete mode 100644 .idea/.name rename FunFacts.iml => android-fun-facts-github-test.iml (71%) 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..17958cf 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,17 +3,31 @@ - - - - - - - - - + + + - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b2307c..ee409e5 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/FunFacts.iml b/android-fun-facts-github-test.iml similarity index 71% rename from FunFacts.iml rename to android-fun-facts-github-test.iml index 5def1bf..5a80c68 100644 --- a/FunFacts.iml +++ b/android-fun-facts-github-test.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 1593039..92cace0 100644 --- a/app/app.iml +++ b/app/app.iml @@ -9,13 +9,9 @@ - + - + + + + - + + + + + + + + + + + + + + + - + + + + + + + + - - - - - - - - - - + + + - - - - - - + + + - - + - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2007557..57e3717 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 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "com.teamtreehouse.funfacts" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 27 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:27.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..49af321 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -19,12 +19,13 @@ 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) public int getColor() { - String color = ""; + String color; // Randomly select a fact Random randomGenerator = new Random(); // Construct a new Random number generator diff --git a/build.gradle b/build.gradle index 1b7886d..2706258 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + 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 @@ -15,5 +19,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..649480d 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-4.1-all.zip From 3e8586bb7961b43bcd22f781ee85684b0f7cd943 Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 12:25:57 +0000 Subject: [PATCH 2/8] updated master --- .idea/misc.xml | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index c9710e6..7b6b661 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,30 @@ - - + + + - - - - - - - - - - - + From dea0de81b42320c85940c5d1dfc5cc0daa6a387a Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 12:32:22 +0000 Subject: [PATCH 3/8] bronze color2 --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 2 +- 1 file changed, 1 insertion(+), 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 49af321..b8c990b 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -20,7 +20,7 @@ public class ColorWheel { "#637a91", // dark gray "#f092b0", // pink "#b7c0c7", // light gray - "#ddca8b" //gold + "#8b4613" //bronze2 }; // Method (abilities: things the object can do) From 9d1065b132404c9c59f129d01ed10ee87c4530fa Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 12:36:12 +0000 Subject: [PATCH 4/8] bronze color4 --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 2 +- 1 file changed, 1 insertion(+), 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 b8c990b..f06a0fa 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -20,7 +20,7 @@ public class ColorWheel { "#637a91", // dark gray "#f092b0", // pink "#b7c0c7", // light gray - "#8b4613" //bronze2 + "#8b4614" //bronze4 }; // Method (abilities: things the object can do) From afa45ebbae275fa7c503b0d373c4a678488e0829 Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 12:37:15 +0000 Subject: [PATCH 5/8] bronze color4 --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 2 +- 1 file changed, 1 insertion(+), 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 f06a0fa..4ec315c 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -20,7 +20,7 @@ public class ColorWheel { "#637a91", // dark gray "#f092b0", // pink "#b7c0c7", // light gray - "#8b4614" //bronze4 + "#8b4624" //bronze5 }; // Method (abilities: things the object can do) From db09525f3b5e44ff37a27c37aa8989bf719817e8 Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 12:37:47 +0000 Subject: [PATCH 6/8] bronze color6 --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 2 +- 1 file changed, 1 insertion(+), 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 f06a0fa..f23b823 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -20,7 +20,7 @@ public class ColorWheel { "#637a91", // dark gray "#f092b0", // pink "#b7c0c7", // light gray - "#8b4614" //bronze4 + "#8b4616" //bronze6 }; // Method (abilities: things the object can do) From 6ca6c090cc2c4a3e4854d1653f46ef92501df3c0 Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 13:07:42 +0000 Subject: [PATCH 7/8] cok --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java index 4ec315c..b913bf1 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -21,6 +21,7 @@ public class ColorWheel { "#f092b0", // pink "#b7c0c7", // light gray "#8b4624" //bronze5 + //cok }; // Method (abilities: things the object can do) From 8666ec6aeff1874c66f2598373a5cd68e29776af Mon Sep 17 00:00:00 2001 From: Victor Cuc Date: Wed, 28 Feb 2018 13:21:30 +0000 Subject: [PATCH 8/8] Merge remote-tracking branch 'remotes/bfdeitch/master' # Conflicts: # .idea/.name # .idea/misc.xml --- app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java | 2 +- 1 file changed, 1 insertion(+), 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 b913bf1..dc6d029 100644 --- a/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java +++ b/app/src/main/java/com/teamtreehouse/funfacts/ColorWheel.java @@ -21,7 +21,7 @@ public class ColorWheel { "#f092b0", // pink "#b7c0c7", // light gray "#8b4624" //bronze5 - //cok + //cok 3 }; // Method (abilities: things the object can do)