Merge pull request #38 from OwaisChunawala/master

Add location FAB functionality

app/build.gradle

@@ -41,15 +41,16 @@ dependencies {
     compile "net.openid:appauth:${appAuthVersion}"
     testCompile "junit:junit:4.12"
     compile "com.android.support:design:${supportLibVersion}"
-    compile "com.google.android.gms:play-services-maps:${playServicesVersion}"
     compile "com.android.support:support-v4:${supportLibVersion}"
     compile "com.jakewharton:butterknife:${butterKnifeVersion}"
-    compile "com.google.android.gms:play-services-gcm:${playServicesVersion}"
+    compile "com.google.android.gms:play-services-gcm:11.6.2"
     annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
     compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
     compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
     compile "com.squareup.okhttp3:okhttp:${okhttpVersion}"
     compile "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
     compile "com.squareup.picasso:picasso:${picassoVersion}"
+    compile 'com.google.android.gms:play-services-maps:11.6.2'
+    compile 'com.google.android.gms:play-services-location:11.6.2'
 }
 apply plugin: 'com.google.gms.google-services'

app/src/main/res/layout/fragment_map.xml

@@ -15,7 +15,7 @@
 
     <!--TODO: Change colours-->
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/location"
+        android:id="@+id/location_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"

app/src/main/res/values/strings.xml

@@ -8,4 +8,8 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+
+    <string name="Cancel">Cancel</string>
+    <string name="gps_network_not_enabled">Location is not enabled. Please turn on your location from the settings.</string>
+    <string name="open_location_settings">Open Location Settings</string>
 </resources>

gradle.properties

@@ -17,4 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 
 # TODO Replace Key and put in local:properties
-GOOGLE_MAPS_API_KEY=AIzaSyB72DhM4E1NW0F-_SLnYtYYvz0rT9kne-U
+#GOOGLE_MAPS_API_KEY=AIzaSyB72DhM4E1NW0F-_SLnYtYYvz0rT9kne-U
+GOOGLE_MAPS_API_KEY=AIzaSyC31o6h06Z36V8M0lXgkGj4Y1cmNRVV9s0