Merge pull request #47 from pulkit4tech/dev

Bugs and UI improvement

Author: pulkit4tech

app/src/main/java/com/pulkit4tech/privy/MainActivity.java

@@ -45,7 +45,7 @@
 import com.pulkit4tech.privy.data.json.PostPrivyRequest;
 import com.pulkit4tech.privy.fragments.PrivyMapsFragment;
 import com.pulkit4tech.privy.utilities.NetworkRequest;
-import com.pulkit4tech.privy.utilities.NoLocationPermission;
+import com.pulkit4tech.privy.fragments.NoLocationPermission;
 
 import java.util.ArrayList;
 
@@ -222,7 +222,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         switch (requestCode) {
             case MY_PERMISSIONS_REQUEST_FINE_LOCATIONS:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    loadMapFragment();
+                    //loadMapFragment();
                     snackMsg(getString(R.string.location_permission_success));
                 } else {
                     loadFragment(new NoLocationPermission());

app/src/main/java/com/pulkit4tech/privy/data/LocationData.java

@@ -1,11 +1,12 @@
-package com.pulkit4tech.privy.utilities;
+package com.pulkit4tech.privy.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.pulkit4tech.privy.R;
 
@@ -14,6 +15,9 @@ public class NoLocationPermission extends Fragment {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.error_msg_layout, container, false);
+        View view = inflater.inflate(R.layout.error_msg_layout, container, false);
+        TextView errorMsg = (TextView) view.findViewById(R.id.error_msg);
+        errorMsg.setText(getString(R.string.location_permission_failed));
+        return view;
     }
 }

app/src/main/java/com/pulkit4tech/privy/utilities/NoLocationPermission.java renamed to app/src/main/java/com/pulkit4tech/privy/fragments/NoLocationPermission.java

@@ -2,8 +2,13 @@
 
 import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationManager;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
@@ -13,8 +18,12 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.location.LocationListener;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationServices;
 import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
@@ -23,26 +32,36 @@
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 import com.pulkit4tech.privy.R;
-import com.pulkit4tech.privy.data.LocationData;
 import com.pulkit4tech.privy.data.json.MarkerData;
-import com.pulkit4tech.privy.utilities.LocationServices;
 import com.pulkit4tech.privy.utilities.NetworkRequest;
 
 import java.util.HashMap;
 
+import static android.content.Context.LOCATION_SERVICE;
 import static com.pulkit4tech.privy.constants.Constants.DEBUG;
 import static com.pulkit4tech.privy.constants.Constants.CAMERA_ANIMATION_DURATION;
 import static com.pulkit4tech.privy.constants.Constants.MY_PERMISSIONS_REQUEST_FINE_LOCATIONS;
 
-public class PrivyMapsFragment extends Fragment implements OnMapReadyCallback {
+public class PrivyMapsFragment extends Fragment implements OnMapReadyCallback, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
 
     private GoogleMap mMap;
     private Context mContext;
     private CameraPosition MY_LOCATION_CAMERA_POS;
     private HashMap<String, MarkerData> universalMarkers;
+    private GoogleApiClient mGoogleApiClient;
+    private LocationRequest mLocationRequest;
+    private static int UPDATE_INTERVAL = 10000; // 10 sec
+    private static int FATEST_INTERVAL = 5000; // 5 sec
+    private static int DISPLACEMENT = 10; // 10 meters
 
     // My location
-    private LocationData myLocationData;
+    private Location myLocationData;
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        mGoogleApiClient.disconnect();
+    }
 
     @Nullable
     @Override
@@ -52,6 +71,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         View mView = inflater.inflate(R.layout.activity_privy_maps, container, false);
         mContext = getActivity();
         universalMarkers = new HashMap<>();
+        setUpGoogleApiClient();
 
         // Obtain the SupportMapFragment and get notified when the map is ready to be used.
         SupportMapFragment mapFragment = (SupportMapFragment) getChildFragmentManager()
@@ -61,6 +81,22 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return mView;
     }
 
+    private void setUpGoogleApiClient() {
+        if (mGoogleApiClient == null) {
+            mGoogleApiClient = new GoogleApiClient.Builder(getContext())
+                    .addConnectionCallbacks(this)
+                    .addOnConnectionFailedListener(this)
+                    .addApi(LocationServices.API)
+                    .build();
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        mGoogleApiClient.connect();
+    }
+
     /**
      * Manipulates the map once available.
      * This callback is triggered when the map is ready to be used.
@@ -80,12 +116,11 @@ public void onMapReady(GoogleMap googleMap) {
     private void addMarkers() {
 
         if (myLocationData == null) {
-            LocationServices locationService = new LocationServices(mContext);
-            myLocationData = locationService.getCurrentLocation();
+            myLocationData = getCurrentLocation();
         }
 
         if (myLocationData != null)
-            markNearbyPrivys(myLocationData.getLatLng());
+            markNearbyPrivys(new LatLng(myLocationData.getLatitude(), myLocationData.getLongitude()));
 
         // Add a test marker in Delhi and move the camera
 //        LatLng delhi = new LatLng(28.633011, 77.219373);
@@ -119,12 +154,11 @@ public boolean onMyLocationButtonClick() {
     }
 
     private void getMyCurrentLocation() {
-        LocationServices locationService = new LocationServices(mContext);
-        myLocationData = locationService.getCurrentLocation();
+        myLocationData = getCurrentLocation();
         if (myLocationData != null) {
 
             MY_LOCATION_CAMERA_POS = new CameraPosition.Builder()
-                    .target(myLocationData.getLatLng())
+                    .target(new LatLng(myLocationData.getLatitude(), myLocationData.getLongitude()))
                     .zoom(15.0f)
                     .bearing(0)
                     .tilt(25)
@@ -134,20 +168,24 @@ private void getMyCurrentLocation() {
             moveCameraToMyLocation();
             addMarkers();
 
-            Log.d(DEBUG, myLocationData.getLatLng().toString());
+            Log.d(DEBUG, new LatLng(myLocationData.getLatitude(), myLocationData.getLongitude()).toString());
+        } else {
+            Log.d(DEBUG, "Can't retrieve location at the moment.");
+            if (!checkGPSon())
+                promptToEnableGPS();
         }
     }
 
     private void moveCameraToMyLocation() {
         changeCamera(CameraUpdateFactory.newCameraPosition(MY_LOCATION_CAMERA_POS), new GoogleMap.CancelableCallback() {
             @Override
             public void onFinish() {
-                snackMsg("Animation Finished");
+                Log.d(DEBUG, "moveCameraToMyLocation: Camera Animation finished");
             }
 
             @Override
             public void onCancel() {
-                Toast.makeText(mContext, "Animation Canceled", Toast.LENGTH_SHORT).show();
+                Log.d(DEBUG, "moveCameraToMyLocation: Camera Animation Cancelled");
             }
         });
 
@@ -168,4 +206,88 @@ private void markNearbyPrivys(LatLng myLocation) {
     private void snackMsg(String msg) {
         Snackbar.make((CoordinatorLayout) getActivity().findViewById(R.id.coordinator_layout), msg, Snackbar.LENGTH_LONG).show();
     }
+
+    @Override
+    public void onConnected(@Nullable Bundle bundle) {
+        myLocationData = com.google.android.gms.location.LocationServices.FusedLocationApi.getLastLocation(
+                mGoogleApiClient);
+        if (myLocationData == null) {
+            if (!checkGPSon()) {
+                promptToEnableGPS();
+            }
+        } else {
+            getMyCurrentLocation();
+        }
+
+        startLocationUpdates();
+    }
+
+    private Location getCurrentLocation() {
+        if (myLocationData != null)
+            return myLocationData;
+        Location location = com.google.android.gms.location.LocationServices.FusedLocationApi.getLastLocation(
+                mGoogleApiClient);
+        if (location == null && !checkGPSon())
+            promptToEnableGPS();
+
+        return location;
+
+    }
+
+    @Override
+    public void onConnectionSuspended(int i) {
+        stopLocationUpdates();
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+        snackMsg("Can't connect to Google Api Client");
+    }
+
+
+    private void snackMsgWithAction(String msg) {
+        Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.coordinator_layout), msg, Snackbar.LENGTH_LONG);
+        snackbar.setAction(R.string.turn_on, new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // start intent to turn on GPS
+                Intent onGPS = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+                mContext.startActivity(onGPS);
+            }
+        });
+        snackbar.show();
+    }
+
+    private void promptToEnableGPS() {
+        snackMsgWithAction(mContext.getString(R.string.enable_gps_msg));
+    }
+
+    private boolean checkGPSon() {
+        LocationManager locationManager = (LocationManager) mContext.getSystemService(LOCATION_SERVICE);
+        return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+    }
+
+    protected void createLocationRequest() {
+        mLocationRequest = new LocationRequest();
+        mLocationRequest.setInterval(UPDATE_INTERVAL);
+        mLocationRequest.setFastestInterval(FATEST_INTERVAL);
+        mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+        mLocationRequest.setSmallestDisplacement(DISPLACEMENT); // 10 meters
+    }
+
+    private void startLocationUpdates() {
+        createLocationRequest();
+        LocationServices.FusedLocationApi.requestLocationUpdates(
+                mGoogleApiClient, mLocationRequest, this);
+    }
+
+    private void stopLocationUpdates() {
+        LocationServices.FusedLocationApi.removeLocationUpdates(
+                mGoogleApiClient, this);
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        getMyCurrentLocation();
+    }
 }