JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added circle to map

Browse source
This commit is contained in:
Aran Zaiger 2016-07-10 15:21:01 +03:00
parent c984336a95
commit f07af145c9
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
View file

@ -8,6 +8,7 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.location.Location; import android.location.Location;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -37,6 +38,8 @@ import com.google.android.gms.maps.SupportMapFragment;
import com.google.android.gms.maps.model.BitmapDescriptor; import com.google.android.gms.maps.model.BitmapDescriptor;
import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.CameraPosition; import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.Circle;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions; import com.google.android.gms.maps.model.MarkerOptions;
@ -81,6 +84,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
private Long dateFilterSelection; private Long dateFilterSelection;
private float locationFilterSelection; private float locationFilterSelection;
List<Note> listOfNotes; List<Note> listOfNotes;
private Circle onMapCircle;
private final String day = "24 hours"; private final String day = "24 hours";
private final String week = "Week"; private final String week = "Week";
@ -236,9 +240,9 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
mMap.setOnCameraChangeListener(new GoogleMap.OnCameraChangeListener() { mMap.setOnCameraChangeListener(new GoogleMap.OnCameraChangeListener() {
@Override @Override
public void onCameraChange(CameraPosition cameraPosition) { public void onCameraChange(CameraPosition cameraPosition) {
if (cameraPosition.zoom > MAX_ZOOM) { // if (cameraPosition.zoom > MAX_ZOOM) {
getMap().animateCamera(CameraUpdateFactory.zoomTo(MAX_ZOOM)); // getMap().animateCamera(CameraUpdateFactory.zoomTo(MAX_ZOOM));
} // }
if (cameraPosition.zoom < MIN_ZOOM) { if (cameraPosition.zoom < MIN_ZOOM) {
getMap().animateCamera(CameraUpdateFactory.zoomTo(MIN_ZOOM)); getMap().animateCamera(CameraUpdateFactory.zoomTo(MIN_ZOOM));
} }
@ -253,6 +257,16 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
if (ActivityCompat.checkSelfPermission(mainActivity, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(mainActivity, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { if (ActivityCompat.checkSelfPermission(mainActivity, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(mainActivity, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
return; return;
} }
updateLocationCircle();
//add circle around user locaiton
// onMapCircle = mMap.addCircle(new CircleOptions()
// .center(new LatLng(gpsUtils.getLatitude(), gpsUtils.getLongitude()))
// .radius(locationFilterSelection)
// .fillColor(Utils.circleColor));
mMap.setMyLocationEnabled(true); mMap.setMyLocationEnabled(true);
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(userLocation, DEFAULT_ZOOM)); mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(userLocation, DEFAULT_ZOOM));
@ -271,6 +285,16 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
} }
private void updateLocationCircle() {
if(onMapCircle!=null){
onMapCircle.remove();
}
onMapCircle = mMap.addCircle(new CircleOptions()
.center(new LatLng(gpsUtils.getLatitude(), gpsUtils.getLongitude()))
.radius(locationFilterSelection)
.fillColor(Utils.circleColor));
}
GoogleMap.InfoWindowAdapter infoWindowAdapter = new GoogleMap.InfoWindowAdapter() { // Use default InfoWindow frame GoogleMap.InfoWindowAdapter infoWindowAdapter = new GoogleMap.InfoWindowAdapter() { // Use default InfoWindow frame
@Override @Override
public View getInfoWindow(Marker args) { public View getInfoWindow(Marker args) {
@ -537,6 +561,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default); map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
map_large_filter.setBackgroundColor(Utils.filterColor); map_large_filter.setBackgroundColor(Utils.filterColor);
} }
updateLocationCircle();
} else { } else {
locationFilter.setBackgroundResource(android.R.drawable.btn_default); locationFilter.setBackgroundResource(android.R.drawable.btn_default);
} }
@ -570,6 +595,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
} }
Log.d(TAG, "updateShowedNotes: ======= markers presented: "+ presentedNotes.size()+"============="); Log.d(TAG, "updateShowedNotes: ======= markers presented: "+ presentedNotes.size()+"=============");
mMap.clear(); mMap.clear();
updateLocationCircle();
new getMarkersFromNotes(mMap, eventMarkerMap).execute(presentedNotes); new getMarkersFromNotes(mMap, eventMarkerMap).execute(presentedNotes);
} }