2019 updates

app/build.gradle

@@ -29,45 +29,48 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
-    implementation 'com.google.firebase:firebase-core:16.0.3'
-    implementation 'com.firebaseui:firebase-ui-auth:4.1.0'
-    implementation 'com.google.firebase:firebase-storage:16.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+
+    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
+    annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.0.0"
+    implementation "androidx.lifecycle:lifecycle-reactivestreams:2.0.0"
+
+
+    implementation 'com.google.firebase:firebase-core:17.0.1'
+    implementation 'com.firebaseui:firebase-ui-auth:5.0.0'
+    implementation 'com.google.firebase:firebase-storage:18.1.1'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.google.firebase:firebase-firestore:17.1.0'
-    implementation 'com.firebaseui:firebase-ui-firestore:4.0.0'
+    implementation 'com.google.firebase:firebase-firestore:20.2.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:5.0.0'
+
+
 
     // an alternative to picasso
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
-    implementation ("com.github.bumptech.glide:recyclerview-integration:4.8.0") {
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+    implementation ("com.github.bumptech.glide:recyclerview-integration:4.9.0") {
         // Excludes the support library because it's already included by Glide.
         transitive = false
     }
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.github.yalantis:ucrop:2.2.2-native'
-    implementation 'com.github.tajchert:nammu:1.2.0'
+    implementation 'com.github.tajchert:nammu:1.2.1'
+    // Update to version 3, needs code changes:
     implementation 'com.github.jkwiecien:EasyImage:2.1.0'
 
-    // lombok
-    // before upgrading, check if this has been resolved:
-    // https://github.com/mplushnikov/lombok-intellij-plugin/issues/496
-    compileOnly "org.projectlombok:lombok:1.16.20"
-    annotationProcessor "org.projectlombok:lombok:1.16.20"
-
     // ButterKnife
-    implementation 'com.jakewharton:butterknife:9.0.0-SNAPSHOT'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-SNAPSHOT'
+    implementation 'com.jakewharton:butterknife:10.1.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
 
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
-    implementation 'com.android.support:design:28.0.0-rc02'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/java/ch/beerpro/MyApplication.java

@@ -1,6 +1,7 @@
 package ch.beerpro;
 
 import android.app.Application;
+
 import com.google.firebase.firestore.FirebaseFirestore;
 
 /**

app/src/main/java/ch/beerpro/data/repositories/BeersRepository.java

@@ -2,16 +2,18 @@
 
 import androidx.arch.core.util.Function;
 import androidx.lifecycle.LiveData;
-import ch.beerpro.domain.models.Beer;
-import ch.beerpro.domain.utils.FirestoreQueryLiveData;
-import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+
 import com.google.firebase.firestore.FirebaseFirestore;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import ch.beerpro.domain.models.Beer;
+import ch.beerpro.domain.utils.FirestoreQueryLiveData;
+import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+
 import static androidx.lifecycle.Transformations.map;
 import static androidx.lifecycle.Transformations.switchMap;
 
@@ -20,7 +22,9 @@ public class BeersRepository {
     private final static Function<List<Beer>, List<String>> mapBeersToCategories = (List<Beer> beers) -> {
         Set<String> filtered = new HashSet<>();
         for (Beer beer : beers) {
-            filtered.add(beer.getCategory());
+            if (beer.getCategory() != null) {
+                filtered.add(beer.getCategory());
+            }
         }
         String[] strings = filtered.toArray(new String[0]);
         return Arrays.asList(strings).subList(0, Math.min(8, strings.length));
@@ -29,7 +33,9 @@ public class BeersRepository {
     private final static Function<List<Beer>, List<String>> mapBeersToManufacturers = (List<Beer> beers) -> {
         Set<String> filtered = new HashSet<>();
         for (Beer beer : beers) {
-            filtered.add(beer.getManufacturer());
+            if (beer.getManufacturer() != null) {
+                filtered.add(beer.getManufacturer());
+            }
         }
         String[] strings = filtered.toArray(new String[0]);
         Arrays.sort(strings);

app/src/main/java/ch/beerpro/data/repositories/LikesRepository.java

@@ -1,7 +1,5 @@
 package ch.beerpro.data.repositories;
 
-import ch.beerpro.presentation.utils.EntityClassSnapshotParser;
-import ch.beerpro.domain.models.Rating;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.firestore.DocumentReference;
@@ -10,6 +8,9 @@
 
 import java.util.Map;
 
+import ch.beerpro.domain.models.Rating;
+import ch.beerpro.presentation.utils.EntityClassSnapshotParser;
+
 public class LikesRepository {
 
     private final static EntityClassSnapshotParser<Rating> parser = new EntityClassSnapshotParser<>(Rating.class);

app/src/main/java/ch/beerpro/data/repositories/MyBeersRepository.java

@@ -1,16 +1,23 @@
 package ch.beerpro.data.repositories;
 
 import androidx.lifecycle.LiveData;
+
+import org.apache.commons.lang3.tuple.Triple;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import ch.beerpro.domain.models.Beer;
 import ch.beerpro.domain.models.Entity;
-import ch.beerpro.domain.models.Rating;
-import ch.beerpro.domain.models.Wish;
 import ch.beerpro.domain.models.MyBeer;
 import ch.beerpro.domain.models.MyBeerFromRating;
 import ch.beerpro.domain.models.MyBeerFromWishlist;
-import org.apache.commons.lang3.tuple.Triple;
-
-import java.util.*;
+import ch.beerpro.domain.models.Rating;
+import ch.beerpro.domain.models.Wish;
 
 import static androidx.lifecycle.Transformations.map;
 import static ch.beerpro.domain.utils.LiveDataExtensions.combineLatest;

app/src/main/java/ch/beerpro/data/repositories/RatingsRepository.java

@@ -1,10 +1,9 @@
 package ch.beerpro.data.repositories;
 
 import android.util.Pair;
+
 import androidx.lifecycle.LiveData;
-import ch.beerpro.domain.models.Rating;
-import ch.beerpro.domain.models.Wish;
-import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.Query;
 
@@ -13,6 +12,10 @@
 import java.util.HashMap;
 import java.util.List;
 
+import ch.beerpro.domain.models.Rating;
+import ch.beerpro.domain.models.Wish;
+import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+
 import static androidx.lifecycle.Transformations.map;
 import static androidx.lifecycle.Transformations.switchMap;
 import static ch.beerpro.domain.utils.LiveDataExtensions.combineLatest;

app/src/main/java/ch/beerpro/data/repositories/SearchesRepository.java

@@ -1,16 +1,18 @@
 package ch.beerpro.data.repositories;
 
 import androidx.lifecycle.LiveData;
-import ch.beerpro.domain.models.Search;
-import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
-import ch.beerpro.presentation.utils.EntityClassSnapshotParser;
+
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.Query;
 
 import java.util.List;
 
+import ch.beerpro.domain.models.Search;
+import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+import ch.beerpro.presentation.utils.EntityClassSnapshotParser;
+
 public class SearchesRepository {
 
     private final static EntityClassSnapshotParser<Search> parser = new EntityClassSnapshotParser<>(Search.class);

app/src/main/java/ch/beerpro/data/repositories/WishlistRepository.java

@@ -1,12 +1,9 @@
 package ch.beerpro.data.repositories;
 
 import android.util.Pair;
+
 import androidx.lifecycle.LiveData;
-import ch.beerpro.domain.models.Beer;
-import ch.beerpro.domain.models.Entity;
-import ch.beerpro.domain.models.Wish;
-import ch.beerpro.domain.utils.FirestoreQueryLiveData;
-import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.FirebaseFirestore;
@@ -17,6 +14,12 @@
 import java.util.HashMap;
 import java.util.List;
 
+import ch.beerpro.domain.models.Beer;
+import ch.beerpro.domain.models.Entity;
+import ch.beerpro.domain.models.Wish;
+import ch.beerpro.domain.utils.FirestoreQueryLiveData;
+import ch.beerpro.domain.utils.FirestoreQueryLiveDataArray;
+
 import static androidx.lifecycle.Transformations.map;
 import static androidx.lifecycle.Transformations.switchMap;
 import static ch.beerpro.domain.utils.LiveDataExtensions.combineLatest;