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

Author: nbhuiyan

app/build.gradle

@@ -27,19 +27,18 @@ android {
 
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.google.android.gms:play-services-maps:11.6.0'
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:appcompat-v7:25.3.1'
     //compile 'io.searchbox:jest-droid:2.0.0'
-    compile 'com.android.support:design:25.3.1'
+    implementation 'com.android.support:design:25.3.1'
     testCompile 'junit:junit:4.12'
     compile files('src/include/jest-droid-2.0.1-SNAPSHOT.jar')
     implementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
     // Map Support Features
-    //compile 'com.google.android.gms:play-services:11.6.2'
-    compile 'com.google.android.gms:play-services-maps:11.6.2'
-    compile 'com.google.android.gms:play-services-location:11.6.2'
+    implementation 'com.google.android.gms:play-services-maps:11.6.2'
+    implementation 'com.google.android.gms:play-services-location:11.6.2'
+    //implementation 'com.google.android.gms:play-services:11.6.2'
 }

app/src/debug/res/values/google_maps_api.xml

@@ -7,6 +7,7 @@
     https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=AF:51:71:DA:6C:35:07:9A:FD:7A:0B:2A:DC:3E:BF:F7:66:A0:B5:B6%3Bcom.cmput301f17t11.cupofjava
 
     You can also add your credentials to an existing key, using these values:
+    AIzaSyA0JZmP-iJddAOx8hI4RM6jO0J16zMW2M0
 
     Package name:
     AF:51:71:DA:6C:35:07:9A:FD:7A:0B:2A:DC:3E:BF:F7:66:A0:B5:B6
@@ -22,3 +23,4 @@
     -->
     <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">YOUR_KEY_HERE</string>
 </resources>
+

app/src/main/AndroidManifest.xml

@@ -33,7 +33,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera" />
-
     <!--
          The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
          Google Maps Android API v2, but you must specify either coarse or fine
@@ -44,6 +43,7 @@
 
     <application
         android:allowBackup="true"
+        android:largeHeap="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"

app/src/main/java/com/cmput301f17t11/cupofjava/Views/MapsActivity.java

@@ -69,8 +69,8 @@ protected void onCreate(Bundle savedInstanceState) {
                     //do nothing
                 }
                 else{
-                    latitudes[i] = 0;
-                    longitudes[i] = 0;
+                    latitudes[i] = 0.0;
+                    longitudes[i] = 0.0;
                 }
             }