diff --git a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java index c44f67e..a0bddf2 100644 --- a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java +++ b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java @@ -1,14 +1,11 @@ package com.pulkit4tech.privy; import android.content.Intent; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; public class MainActivity extends AppCompatActivity { - private PrivyMapsActivity mapFragement; public static final String DEBUG = "DEBUGGER"; @Override diff --git a/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java b/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java index 1c57282..f395be5 100644 --- a/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java +++ b/app/src/main/java/com/pulkit4tech/privy/PrivyMapsActivity.java @@ -2,20 +2,19 @@ import android.content.Context; import android.content.pm.PackageManager; -import android.location.Criteria; -import android.location.Location; -import android.location.LocationManager; import android.os.Bundle; import android.support.v4.app.ActivityCompat; import android.support.v7.app.ActionBarActivity; import android.util.Log; import android.widget.Toast; +import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.BitmapDescriptorFactory; +import com.google.android.gms.maps.model.CameraPosition; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; @@ -29,6 +28,8 @@ public class PrivyMapsActivity extends ActionBarActivity implements OnMapReadyCa private GoogleMap mMap; private Context mContext; private Marker myLocationMarker; + private CameraPosition MY_LOCATION_CAMERA_POS; + private static final int CAMERA_ANIMATION_DURATION = 2500; // My Location private LocationData myLocationData; @@ -99,8 +100,17 @@ public boolean onMyLocationButtonClick() { myLocationMarker.remove(); } + MY_LOCATION_CAMERA_POS = new CameraPosition.Builder() + .target(myLocationData.getLatLng()) + .zoom(15.0f) + .bearing(0) + .tilt(25) + .build(); + myLocationMarker = mMap.addMarker(new MarkerOptions().position(myLocationData.getLatLng()).title("My Location")); - mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(myLocationData.getLatLng(), 15.0f)); + + //animate camera + onGoToMyLocation(); Log.d(DEBUG, myLocationData.getLatLng().toString()); } return true; @@ -108,6 +118,24 @@ public boolean onMyLocationButtonClick() { }); } + private void onGoToMyLocation() { + changeCamera(CameraUpdateFactory.newCameraPosition(MY_LOCATION_CAMERA_POS), new GoogleMap.CancelableCallback() { + @Override + public void onFinish() { + Toast.makeText(mContext,"Animation Finished",Toast.LENGTH_SHORT).show(); + } + + @Override + public void onCancel() { + Toast.makeText(mContext,"Animation Canceled",Toast.LENGTH_SHORT).show(); + } + }); + } + + private void changeCamera(CameraUpdate update, GoogleMap.CancelableCallback callback){ + mMap.animateCamera(update,CAMERA_ANIMATION_DURATION,callback); + } + private boolean checkLocationEnabledPermission() { if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { // TODO: Consider calling diff --git a/app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java b/app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java index 6acb190..dba4237 100644 --- a/app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java +++ b/app/src/main/java/com/pulkit4tech/privy/Utilities/LocationServices.java @@ -9,7 +9,6 @@ import android.location.LocationListener; import android.os.Bundle; import android.support.v4.app.ActivityCompat; -import android.util.Log; import android.widget.Toast; @@ -18,11 +17,6 @@ import com.pulkit4tech.privy.data.LocationData; import static android.content.Context.LOCATION_SERVICE; -import static com.pulkit4tech.privy.MainActivity.DEBUG; - -/** - * Created by pulkit on 01/01/17. - */ public class LocationServices implements LocationListener { diff --git a/app/src/main/java/com/pulkit4tech/privy/data/LocationData.java b/app/src/main/java/com/pulkit4tech/privy/data/LocationData.java index bf77ced..ac1b656 100644 --- a/app/src/main/java/com/pulkit4tech/privy/data/LocationData.java +++ b/app/src/main/java/com/pulkit4tech/privy/data/LocationData.java @@ -2,10 +2,6 @@ import com.google.android.gms.maps.model.LatLng; -/** - * Created by pulkit on 01/01/17. - */ - public class LocationData { private LatLng latLng; private String Description;