From b20cd7d43671446f45f8b673de0b40b26a7bcd42 Mon Sep 17 00:00:00 2001 From: Deimarr Callender Date: Mon, 13 Apr 2020 16:20:34 -0400 Subject: [PATCH 1/2] Add gold colour --- .idea/.name | 1 - .idea/codeStyles/Project.xml | 116 ++++++++++++++++ .idea/gradle.xml | 3 + .idea/misc.xml | 12 +- .idea/modules.xml | 4 +- FunFacts.iml => android-fun-facts-github.iml | 2 +- app/app.iml | 131 +++++++++++------- app/build.gradle | 22 ++- .../teamtreehouse/funfacts/ColorWheel.java | 3 +- build.gradle | 4 +- gradle.properties | 5 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 231 insertions(+), 74 deletions(-) delete mode 100644 .idea/.name create mode 100644 .idea/codeStyles/Project.xml rename FunFacts.iml => android-fun-facts-github.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/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..b714862 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..7e4afd9 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..20996d2 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/FunFacts.iml b/android-fun-facts-github.iml similarity index 71% rename from FunFacts.iml rename to android-fun-facts-github.iml index 5def1bf..b4c57fd 100644 --- a/FunFacts.iml +++ b/android-fun-facts-github.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 1593039..ea2c41a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,97 +1,132 @@ - + - - - + + + - - + + - - - - - + + + + - - - + + + - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2007557..0ccb125 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,25 +1,33 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.0" + compileSdkVersion 29 defaultConfig { applicationId "com.teamtreehouse.funfacts" - minSdkVersion 15 - targetSdkVersion 23 + minSdkVersion 16 + targetSdkVersion 29 versionCode 1 versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.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..df8441f 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 }; // Method (abilities: things the object can do) diff --git a/build.gradle b/build.gradle index 1b7886d..f50ddbf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:3.6.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..65049ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..b842417 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-5.6.4-all.zip From 35365305cb51bb46efac6f483db27b8e1bd4cc92 Mon Sep 17 00:00:00 2001 From: Deimarr Callender Date: Mon, 13 Apr 2020 16:23:04 -0400 Subject: [PATCH 2/2] Add bronze colour --- .idea/caches/build_file_checksums.ser | Bin 0 -> 537 bytes .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ .idea/gradle.xml | 3 + .idea/misc.xml | 5 +- app/app.iml | 3 +- .../teamtreehouse/funfacts/ColorWheel.java | 3 +- 6 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..20fbb33e99e3ec3ccc65c90b55dc2f2637219d0d GIT binary patch literal 537 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}Q#7BMhIJFWRF{)3GpnXmM&$ag0xCL1tbI zR7(sZBnwiDN-|T6OW}rGk?pzJ&#;N*WdrAoH$R-}N*H)hoC#Ox@av~}$xr5`nL)D( z%=IQm0R5DcpPZNjiXRM9x4zi5PEpiZ)IKQZC9j#-$r1)ZJZ^Y*YEe|Z^ + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index bd4202c..b714862 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..504b7ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - @@ -13,7 +10,7 @@ - + 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 @@