added filter logics and colors to map - WiP
This commit is contained in:
parent
9c29617b00
commit
8ed984a871
3 changed files with 202 additions and 55 deletions
|
@ -77,21 +77,27 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
private boolean dateFilterIsVisible = false;
|
||||
private boolean locationFilterIsVisible = false;
|
||||
private boolean userFilterIsVisible = false;
|
||||
private int userFilterSelection;
|
||||
private Long dateFilterSelection;
|
||||
private float locationFilterSelection;
|
||||
List<Note> listOfNotes;
|
||||
|
||||
private final String day = "24 hours";
|
||||
private final String week = "Week";
|
||||
private final String month = "Month";
|
||||
private final String hundredMeters = "100 meters";
|
||||
private final String kilometer = "1 Km";
|
||||
private final String threeKilometer = "3 Km";
|
||||
private final String tenKilometers = "10 Km";
|
||||
private final String mine = "Mine";
|
||||
private final String others = "Others";
|
||||
private final String all = "All";
|
||||
|
||||
|
||||
|
||||
public GmapFragment() {
|
||||
eventMarkerMap = new HashMap<Marker, Note>();
|
||||
dateFilterSelection = Utils.MONTH_MILI;
|
||||
userFilterSelection = 3;
|
||||
locationFilterSelection = Utils.DISTANCE_LONG;
|
||||
}
|
||||
|
||||
|
||||
|
@ -130,6 +136,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
super.onViewCreated(view, savedInstanceState);
|
||||
SupportMapFragment frag = (SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.mapFragment);
|
||||
frag.getMapAsync(this);
|
||||
listOfNotes = new ArrayList<>();
|
||||
|
||||
dateFilter = (ImageButton) view.findViewById(R.id.map_date_filter);
|
||||
locationFilter = (ImageButton) view.findViewById(R.id.map_location_filter);
|
||||
|
@ -139,6 +146,10 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
map_medium_filter = (Button) view.findViewById(R.id.map_medium_filter);
|
||||
map_large_filter = (Button) view.findViewById(R.id.map_large_filter);
|
||||
|
||||
map_small_filter.setOnClickListener(button1ClickListener);
|
||||
map_medium_filter.setOnClickListener(button2ClickListener);
|
||||
map_large_filter.setOnClickListener(button3ClickListener);
|
||||
|
||||
mapFilters = (LinearLayout) view.findViewById(R.id.map_filter_options);
|
||||
|
||||
dateFilter.setOnClickListener(new View.OnClickListener() {
|
||||
|
@ -158,6 +169,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
map_medium_filter.setText(week);
|
||||
map_large_filter.setText(month);
|
||||
}
|
||||
updateShowedNotes();
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -176,8 +188,9 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
// set text button in the right filter string
|
||||
map_small_filter.setText(hundredMeters);
|
||||
map_medium_filter.setText(kilometer);
|
||||
map_large_filter.setText(threeKilometer);
|
||||
map_large_filter.setText(tenKilometers);
|
||||
}
|
||||
updateShowedNotes();
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -198,6 +211,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
map_medium_filter.setText(others);
|
||||
map_large_filter.setText(all);
|
||||
}
|
||||
updateShowedNotes();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -314,8 +328,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
}
|
||||
|
||||
|
||||
if (isOwner)
|
||||
{
|
||||
if (isOwner) {
|
||||
deleteBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
//Put up the Yes/No message box
|
||||
|
@ -359,8 +372,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
});
|
||||
|
||||
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
//like Btn
|
||||
deleteBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
|
@ -398,7 +410,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "getNotesSuccessListener: " + response.toString());
|
||||
List<Note> listOfNotes = new ArrayList<>();
|
||||
// listOfNotes = new ArrayList<>();
|
||||
|
||||
try {
|
||||
//need to get all notes and add to listOfNotes
|
||||
|
@ -409,7 +421,9 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
time.setTime(noteObject.getLong("created_at"));
|
||||
listOfNotes.add(Utils.getNoteFromJsonObj(noteObject, time));
|
||||
}
|
||||
new getMarkersFromNotes(mMap, eventMarkerMap).execute(listOfNotes);
|
||||
updateShowedNotes();
|
||||
// new getMarkersFromNotes(mMap, eventMarkerMap).execute(listOfNotes);
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
||||
e.printStackTrace();
|
||||
|
@ -418,7 +432,6 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
};
|
||||
|
||||
|
||||
|
||||
private class getMarkersFromNotes extends AsyncTask<List<Note>, MarkerNoteStruct, Void> {
|
||||
GoogleMap mMap;
|
||||
HashMap<Marker, Note> eventMarkerMap;
|
||||
|
@ -460,19 +473,181 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
|
||||
}
|
||||
|
||||
// public Marker placeMarker(Note eventInfo) {
|
||||
//
|
||||
// Marker m = getMap().addMarker(new MarkerOptions()
|
||||
//
|
||||
// .position(eventInfo.getLatLong())
|
||||
//
|
||||
// .title(eventInfo.getName()));
|
||||
//
|
||||
//
|
||||
//
|
||||
// return m;
|
||||
//
|
||||
// }
|
||||
//set main filter colors
|
||||
private void setButtonsColor() {
|
||||
|
||||
Log.d(TAG, "setButtonsColor: start");
|
||||
//set date filter colors
|
||||
if (dateFilterIsVisible) {
|
||||
Log.d(TAG, "setButtonsColor: dateselection :" + dateFilterSelection);
|
||||
dateFilter.setBackgroundColor(Utils.filterColor);
|
||||
if (dateFilterSelection == Utils.DAY_MILI) {
|
||||
map_small_filter.setBackgroundColor(Utils.filterColor);
|
||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
} else if (dateFilterSelection == Utils.WEEK_MILI) {
|
||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
} else {
|
||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_large_filter.setBackgroundColor(Utils.filterColor);
|
||||
}
|
||||
} else {
|
||||
dateFilter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
}
|
||||
|
||||
//set date filter colors
|
||||
if (userFilterIsVisible) {
|
||||
Log.d(TAG, "setButtonsColor: userFilter: " + userFilterSelection);
|
||||
userFilter.setBackgroundColor(Utils.filterColor);
|
||||
if (userFilterSelection == 1) {
|
||||
map_small_filter.setBackgroundColor(Utils.filterColor);
|
||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
} else if (userFilterSelection == 2) {
|
||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
} else {
|
||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_large_filter.setBackgroundColor(Utils.filterColor);
|
||||
}
|
||||
} else {
|
||||
userFilter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
}
|
||||
|
||||
//set distance filter colors
|
||||
if (locationFilterIsVisible) {
|
||||
Log.d(TAG, "setButtonsColor: userFilter: " + userFilterSelection);
|
||||
locationFilter.setBackgroundColor(Utils.filterColor);
|
||||
if (locationFilterSelection == Utils.DISTANCE_SMALL) {
|
||||
map_small_filter.setBackgroundColor(Utils.filterColor);
|
||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
} else if (locationFilterSelection == Utils.DISTANCE_MEDIUM) {
|
||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
} else {
|
||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
map_large_filter.setBackgroundColor(Utils.filterColor);
|
||||
}
|
||||
} else {
|
||||
locationFilter.setBackgroundResource(android.R.drawable.btn_default);
|
||||
}
|
||||
}
|
||||
|
||||
public void updateShowedNotes() {
|
||||
List<Note> presentedNotes = new ArrayList<>();
|
||||
long timeDifference;
|
||||
float distance;
|
||||
//get current date and location
|
||||
Location currLocation = new Location(gpsUtils.getLocation());
|
||||
Date now = new Date();
|
||||
Location targetLocation = new Location("");//provider name is unecessary
|
||||
Date targetDate;
|
||||
|
||||
for (Note note : listOfNotes) {
|
||||
// get note location and date
|
||||
targetLocation.setLatitude(note.getLat());//your coords of course
|
||||
targetLocation.setLongitude(note.getLon());
|
||||
targetDate = new Date(note.getTimestamp());
|
||||
//get time and date differences
|
||||
timeDifference = now.getTime() - targetDate.getTime();
|
||||
distance = currLocation.distanceTo(targetLocation);
|
||||
//add to currently presented list according to filters.
|
||||
if (timeDifference <= dateFilterSelection
|
||||
&& distance <= locationFilterSelection
|
||||
&& ((note.getOwnerId().equals(mainActivity.getUserId()) && userFilterSelection == 1) || (!note.getOwnerId().equals(mainActivity.getUserId()) && userFilterSelection == 2) || (userFilterSelection == 3))) {
|
||||
presentedNotes.add(note);
|
||||
}
|
||||
|
||||
}
|
||||
Log.d(TAG, "updateShowedNotes: ======= markers presented: "+ presentedNotes.size()+"=============");
|
||||
// noteListAdapter.updateList(presentedNotes);
|
||||
// noteList.setAdapter(noteListAdapter);
|
||||
mMap.clear();
|
||||
new getMarkersFromNotes(mMap, eventMarkerMap).execute(listOfNotes);
|
||||
|
||||
}
|
||||
|
||||
//all buttons listener
|
||||
public View.OnClickListener button1ClickListener = new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(final View v) {
|
||||
//user filters
|
||||
if (userFilterIsVisible) {
|
||||
userFilterSelection = 1;
|
||||
}
|
||||
|
||||
//location filter
|
||||
else if (locationFilterIsVisible) {
|
||||
locationFilterSelection = Utils.DISTANCE_SMALL;
|
||||
}
|
||||
|
||||
//date filters
|
||||
else {
|
||||
dateFilterSelection = Utils.DAY_MILI;
|
||||
|
||||
}
|
||||
//change colors of buttons and update visible notes
|
||||
setButtonsColor();
|
||||
updateShowedNotes();
|
||||
}
|
||||
};
|
||||
|
||||
//all buttons listener
|
||||
public View.OnClickListener button2ClickListener = new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(final View v) {
|
||||
//user filters
|
||||
if (userFilterIsVisible) {
|
||||
userFilterSelection = 2;
|
||||
}
|
||||
|
||||
//location filter
|
||||
else if (locationFilterIsVisible) {
|
||||
locationFilterSelection = Utils.DISTANCE_MEDIUM;
|
||||
}
|
||||
|
||||
//date filters
|
||||
else {
|
||||
dateFilterSelection = Utils.MONTH_MILI;
|
||||
}
|
||||
//change colors of buttons and update visible notes
|
||||
setButtonsColor();
|
||||
updateShowedNotes();
|
||||
}
|
||||
};
|
||||
|
||||
//all buttons listener
|
||||
public View.OnClickListener button3ClickListener = new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(final View v) {
|
||||
//user filters
|
||||
if (userFilterIsVisible) {
|
||||
userFilterSelection = 3;
|
||||
}
|
||||
|
||||
//location filter
|
||||
else if (locationFilterIsVisible) {
|
||||
locationFilterSelection = Utils.DISTANCE_LONG;
|
||||
}
|
||||
|
||||
//date filters
|
||||
else {
|
||||
dateFilterSelection = Utils.MONTH_MILI;
|
||||
|
||||
}
|
||||
//change colors of buttons and update visible notes
|
||||
setButtonsColor();
|
||||
updateShowedNotes();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -531,29 +531,15 @@ public class PersonalFragment extends Fragment {
|
|||
public View.OnClickListener button2ClickListener = new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(final View v) {
|
||||
|
||||
// Log.d(TAG, "onClick: start");
|
||||
// Log.d(TAG, "onClick: v id: " + v.getId());
|
||||
// Log.d(TAG, "onClick: map_small_filter id: " + R.id.map_small_filter);
|
||||
// Log.d(TAG, "onCreateView: personalSpace_filter_options = " + R.id.personalSpace_filter_options);
|
||||
//
|
||||
// Log.d(TAG, "onClick: are equal? " + (v.getId() == R.id.map_small_filter));
|
||||
//
|
||||
//
|
||||
// Log.d(TAG, "onClick: case map_medium_filter");
|
||||
|
||||
//user filters
|
||||
if (userFilterIsVisible) {
|
||||
userFilterSelection = 2;
|
||||
|
||||
}
|
||||
//date filters
|
||||
else {
|
||||
dateFilterSelection = Utils.WEEK_MILI;
|
||||
|
||||
}
|
||||
setButtonsColor();
|
||||
|
||||
updateShowedNotes();
|
||||
|
||||
}
|
||||
|
@ -654,40 +640,25 @@ public class PersonalFragment extends Fragment {
|
|||
public void updateShowedNotes() {
|
||||
presentedNotes = new ArrayList<>();
|
||||
long timeDifference;
|
||||
// float distance;
|
||||
// Log.d(TAG, "updateShowedNotes: start");
|
||||
// Log.d(TAG, "updateShowedNotes: userPrefFilter = " + userFilterSelection);
|
||||
// Log.d(TAG, "updateShowedNotes: timeDifferencePerf = " + dateFilterSelection);
|
||||
// Log.d(TAG, "updateShowedNotes: +++++++++++++++++++++++++++++++++++++++++++++++++");
|
||||
|
||||
|
||||
// Location currLocation = new Location(gpsUtils.getLocation());
|
||||
Date now = new Date();
|
||||
|
||||
// Location targetLocation = new Location("");//provider name is unecessary
|
||||
Date targetDate;
|
||||
for (Note note : listOfNotes) {
|
||||
// Log.d(TAG, "updateShowedNotes: checkcing note with title: " + note.title);
|
||||
//get note location and date
|
||||
// targetLocation.setLatitude(note.getLat());//your coords of course
|
||||
// targetLocation.setLongitude(note.getLon());
|
||||
targetDate = new Date(note.getTimestamp());
|
||||
|
||||
//get time and date differences
|
||||
timeDifference = now.getTime() - targetDate.getTime();
|
||||
// distance = currLocation.distanceTo(targetLocation);
|
||||
|
||||
// Log.d(TAG, "updateShowedNotes: time difference = " + timeDifference);
|
||||
//add to currently presented list according to filters.
|
||||
if (timeDifference <= dateFilterSelection
|
||||
&& ((!note.isPublic && userFilterSelection == 1) || (note.isPublic && userFilterSelection == 2) || (userFilterSelection == 3))) {
|
||||
presentedNotes.add(note);
|
||||
}
|
||||
|
||||
// Log.d(TAG, "updateShowedNotes: ======================================");
|
||||
}
|
||||
// Log.d(TAG, "updateShowedNotes: presentedNotes size = " + presentedNotes.size());
|
||||
|
||||
noteListAdapter.updateList(presentedNotes);
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
}
|
||||
|
|
|
@ -50,6 +50,7 @@ public class Utils {
|
|||
private static SharedPreferences prefs;
|
||||
public static int filterColor = Color.parseColor("#33adff");
|
||||
public static final long DAY_MILI = 86400000L,WEEK_MILI = 604800000L,MONTH_MILI = 2592000000L;
|
||||
public static final float DISTANCE_SMALL = 100,DISTANCE_MEDIUM = 1000,DISTANCE_LONG = 10000;
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue