diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8144c3c..f861765 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,6 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 67bad0e..1282353 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,10 +20,10 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'androidx.constraintlayout:constraintlayout:1.1.3'
- testCompile 'junit:junit:4.12'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ testImplementation 'junit:junit:4.12'
}
diff --git a/app/src/main/java/com/hfad/beeradviser/BeerExpert.java b/app/src/main/java/com/hfad/beeradviser/BeerExpert.java
index e2492b9..6846f0e 100755
--- a/app/src/main/java/com/hfad/beeradviser/BeerExpert.java
+++ b/app/src/main/java/com/hfad/beeradviser/BeerExpert.java
@@ -6,9 +6,22 @@
public class BeerExpert {
//TODO: Complete the Model with private members, a constructor, and getter/setter methods
+ private String mColor;
+ public BeerExpert() {
+ setColor(mColor);
+ }
+
+ public void setColor(String color) {
+ mColor = color;
+ }
+
+ public String getColor() {
+ return mColor;
+ }
- String getRecommendation(String color) {
+ String getRecommendation() {
+ String color = getColor();
//Adds brand recommendation data to an ArrayList
List brandList = new ArrayList<>();
switch (color) {
diff --git a/app/src/main/java/com/hfad/beeradviser/FindBeerActivity.java b/app/src/main/java/com/hfad/beeradviser/FindBeerActivity.java
index c7c042b..05fa628 100755
--- a/app/src/main/java/com/hfad/beeradviser/FindBeerActivity.java
+++ b/app/src/main/java/com/hfad/beeradviser/FindBeerActivity.java
@@ -28,9 +28,10 @@ public void onClickFindBeer(View view) {
String beerType = String.valueOf(colorSpinnerView.getSelectedItem());
//TODO: WRITE code to get recommendations from the BeerExpert class
-
+ expert.setColor(beerType);
+ String brands = expert.getRecommendation();
//TODO: MODIFY code to display the brands instead of the beerType using the BeerExpert class
- brandsListView.setText(beerType);
+ brandsListView.setText(brands);
}
}
diff --git a/build.gradle b/build.gradle
index 7d498b5..2b7b8cb 100755
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.0'
+ classpath 'com.android.tools.build:gradle:7.0.2'
// 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 94ba83a..af71561 100755
--- 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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip