FlutterFire plugins & SDK updates (#5)

Author: mzdm

analysis_options.yaml

@@ -1 +1 @@
-include: package:pedantic/analysis_options.yaml
+include: package:pedantic/analysis_options.yaml

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,8 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.friendlyeats"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
+        multiDexEnabled true
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -61,9 +62,10 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:multidex:1.0.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.3'
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Sun Sep 06 18:43:15 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

firebase.json

@@ -1,6 +1,6 @@
 {
   "hosting": {
-    "predeploy": "flutter clean; flutter build web",
+    "predeploy": "flutter clean & flutter build web",
     "public": "build/web",
     "ignore": [
       "firebase.json",

lib/main.dart

@@ -12,12 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 
 import 'src/app.dart' deferred as app;
 
-void main() {
-  final Future<void> loadedLibrary = app.loadLibrary();
+void main() async {
+  // Initialize Firebase
+  WidgetsFlutterBinding.ensureInitialized();
+  await Firebase.initializeApp();
+
+  final Future<void> loadedLibrary = await app.loadLibrary();
   runApp(
     FutureBuilder(
       future: loadedLibrary,

lib/src/home_page.dart

@@ -39,7 +39,9 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> {
   _HomePageState() {
-    FirebaseAuth.instance.signInAnonymously().then((AuthResult auth) {
+    FirebaseAuth.instance
+        .signInAnonymously()
+        .then((UserCredential userCredential) {
       _currentSubscription =
           data.loadAllRestaurants().listen(_updateRestaurants);
     });

lib/src/model/restaurant.dart

@@ -41,14 +41,14 @@ class Restaurant {
 
   Restaurant.fromSnapshot(DocumentSnapshot snapshot)
       : assert(snapshot != null),
-        id = snapshot.documentID,
-        name = snapshot['name'],
-        category = snapshot['category'],
-        city = snapshot['city'],
-        avgRating = snapshot['avgRating'].toDouble(),
-        numRatings = snapshot['numRatings'],
-        price = snapshot['price'],
-        photo = snapshot['photo'],
+        id = snapshot.id,
+        name = snapshot.data()['name'],
+        category = snapshot.data()['category'],
+        city = snapshot.data()['city'],
+        avgRating = snapshot.data()['avgRating'].toDouble(),
+        numRatings = snapshot.data()['numRatings'],
+        price = snapshot.data()['price'],
+        photo = snapshot.data()['photo'],
         reference = snapshot.reference;
 
   factory Restaurant.random() {

lib/src/model/review.dart

@@ -31,12 +31,12 @@ class Review {
 
   Review.fromSnapshot(DocumentSnapshot snapshot)
       : assert(snapshot != null),
-        id = snapshot.documentID,
-        rating = snapshot['rating'].toDouble(),
-        text = snapshot['text'],
-        userName = snapshot['userName'],
-        userId = snapshot['userId'],
-        timestamp = snapshot['timestamp'],
+        id = snapshot.id,
+        rating = snapshot.data()['rating'].toDouble(),
+        text = snapshot.data()['text'],
+        userName = snapshot.data()['userName'],
+        userId = snapshot.data()['userId'],
+        timestamp = snapshot.data()['timestamp'],
         reference = snapshot.reference;
 
   Review.fromUserInput({this.rating, this.text, this.userName, this.userId})

lib/src/restaurant_page.dart

@@ -45,17 +45,20 @@ class RestaurantPage extends StatefulWidget {
 
 class _RestaurantPageState extends State<RestaurantPage> {
   _RestaurantPageState({@required String restaurantId}) {
-    FirebaseAuth.instance.signInAnonymously().then((AuthResult auth) {
+    FirebaseAuth.instance
+        .signInAnonymously()
+        .then((UserCredential userCredential) {
       data.getRestaurant(restaurantId).then((Restaurant restaurant) {
         _currentReviewSubscription?.cancel();
         setState(() {
-          if (auth.user.displayName == null || auth.user.displayName.isEmpty) {
+          if (userCredential.user.displayName == null ||
+              userCredential.user.displayName.isEmpty) {
             _userName = 'Anonymous (${kIsWeb ? "Web" : "Mobile"})';
           } else {
-            _userName = auth.user.displayName;
+            _userName = userCredential.user.displayName;
           }
           _restaurant = restaurant;
-          _userId = auth.user.uid;
+          _userId = userCredential.user.uid;
 
           // Initialize the reviews snapshot...
           _currentReviewSubscription = _restaurant.reference
@@ -65,7 +68,7 @@ class _RestaurantPageState extends State<RestaurantPage> {
               .listen((QuerySnapshot reviewSnap) {
             setState(() {
               _isLoading = false;
-              _reviews = reviewSnap.documents.map((DocumentSnapshot doc) {
+              _reviews = reviewSnap.docs.map((DocumentSnapshot doc) {
                 return Review.fromSnapshot(doc);
               }).toList();
             });