Merge branch 'master' of https://github.com/CMPUT301F17T11/CupOfJava

nbhuiyan · nbhuiyan · commit c90167da7b58 · 2017-12-04T05:54:05.000-07:00
diff --git a/app/src/main/java/com/cmput301f17t11/cupofjava/Views/MapsActivity.java b/app/src/main/java/com/cmput301f17t11/cupofjava/Views/MapsActivity.java
@@ -66,6 +66,9 @@ protected void onCreate(Bundle savedInstanceState) {
                 double lat2= latitudes[i];
                 double lng2= longitudes[i];
                 if ((within5(currentLat, currentLon, lat2, lng2) <= 5.0) == false){
+                    //do nothing
+                }
+                else{
                     latitudes[i] = 0;
                     longitudes[i] = 0;
                 }
diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.google.gms:google-services:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`	`9`	`classpath 'com.android.tools.build:gradle:3.0.1'`
	`10`	`+ classpath 'com.google.gms:google-services:3.1.2'`
`10`	`11`
`11`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`13`	`// in the individual module build.gradle files`