Merge branch 'update_dependencies'

Author: mdanics

android/app/build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -28,7 +28,7 @@ android {
         targetSdkVersion 27
         versionCode 1
         versionName "1.2.2"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
 
@@ -47,8 +47,8 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
     compile 'com.google.firebase:firebase-core:11.8.0'
 
 }

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.google.gms:google-services:3.2.0'
 
     }

android/gradle.properties

@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Tue Apr 02 01:36:58 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

lib/image_post.dart

@@ -138,8 +138,8 @@ class _ImagePost extends State<ImagePost> {
           new CachedNetworkImage(
             imageUrl: mediaUrl,
             fit: BoxFit.fitWidth,
-            placeholder: loadingPlaceHolder,
-            errorWidget: new Icon(Icons.error),
+            placeholder: (context, url) => loadingPlaceHolder,
+            errorWidget: (context, url, error) => Icon(Icons.error),
           ),
           showHeart
               ? new Positioned(

lib/location.dart

@@ -7,12 +7,11 @@ import 'package:geocoder/geocoder.dart';
 import 'package:location/location.dart';
 
 getUserLocation() async {
-  Map<String, double> currentLocation = new Map();
-  Map<String, double> myLocation;
+  LocationData currentLocation;
   String error;
   Location location = new Location();
   try {
-    myLocation = await location.getLocation();
+    currentLocation = await location.getLocation();
   } on PlatformException catch (e) {
     if (e.code == 'PERMISSION_DENIED') {
       error = 'please grant permission';
@@ -22,11 +21,10 @@ getUserLocation() async {
       error = 'permission denied- please enable it from app settings';
       print(error);
     }
-    myLocation = null;
+    currentLocation = null;
   }
-  currentLocation = myLocation;
   final coordinates = new Coordinates(
-      currentLocation['latitude'], currentLocation['longitude']);
+      currentLocation.latitude, currentLocation.longitude);
   var addresses =
       await Geocoder.local.findAddressesFromCoordinates(coordinates);
   var first = addresses.first;

lib/main.dart

@@ -38,13 +38,47 @@ Future<Null> _ensureLoggedIn(BuildContext context) async {
   }
 
   if (await auth.currentUser() == null) {
-    GoogleSignInAuthentication credentials =
-        await googleSignIn.currentUser.authentication;
-    await auth.signInWithGoogle(
-        idToken: credentials.idToken, accessToken: credentials.accessToken);
+
+    final GoogleSignInAccount googleUser = await googleSignIn.signIn();
+    final GoogleSignInAuthentication googleAuth = await googleUser
+        .authentication;
+
+
+    final AuthCredential credential = GoogleAuthProvider.getCredential(
+      accessToken: googleAuth.accessToken,
+      idToken: googleAuth.idToken,
+    );
+
+    await auth.signInWithCredential(credential);
   }
 }
 
+Future<Null> _silentLogin(BuildContext context) async {
+  GoogleSignInAccount user = googleSignIn.currentUser;
+
+  if (user == null) {
+    user = await googleSignIn.signInSilently().then((_) {
+      tryCreateUserRecord(context);
+    });
+  }
+
+  if (await auth.currentUser() == null && user != null) {
+    final GoogleSignInAccount googleUser = await googleSignIn.signIn();
+    final GoogleSignInAuthentication googleAuth = await googleUser
+        .authentication;
+
+
+    final AuthCredential credential = GoogleAuthProvider.getCredential(
+      accessToken: googleAuth.accessToken,
+      idToken: googleAuth.idToken,
+    );
+
+    await auth.signInWithCredential(credential);
+  }
+
+
+}
+
 Future<Null> _setUpNotifications() async {
   if (Platform.isAndroid) {
     _firebaseMessaging.configure(
@@ -70,23 +104,6 @@ Future<Null> _setUpNotifications() async {
   }
 }
 
-Future<Null> _silentLogin(BuildContext context) async {
-  GoogleSignInAccount user = googleSignIn.currentUser;
-
-  if (user == null) {
-    user = await googleSignIn.signInSilently().then((_) {
-      tryCreateUserRecord(context);
-    });
-  }
-
-  if (await auth.currentUser() == null && user != null) {
-    GoogleSignInAuthentication credentials =
-        await googleSignIn.currentUser.authentication;
-    await auth.signInWithGoogle(
-        idToken: credentials.idToken, accessToken: credentials.accessToken);
-  }
-}
-
 tryCreateUserRecord(BuildContext context) async {
   GoogleSignInAccount user = googleSignIn.currentUser;
   if (user == null) {