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

finished filters on gmap

Browse source
This commit is contained in:
Aran Zaiger 2016-07-10 13:18:39 +03:00
parent 8ed984a871
commit 21bf1c7b9d
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,9 +85,9 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
private final String day = "24 hours"; private final String day = "24 hours";
private final String week = "Week"; private final String week = "Week";
private final String month = "Month"; private final String month = "Month";
private final String hundredMeters = "100 meters"; private final String hundredMeters = "1 Km";
private final String kilometer = "1 Km"; private final String kilometer = "10 Km";
private final String tenKilometers = "10 Km"; private final String tenKilometers = "100 Km";
private final String mine = "Mine"; private final String mine = "Mine";
private final String others = "Others"; private final String others = "Others";
private final String all = "All"; private final String all = "All";
@ -167,9 +167,10 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
// set text button in the right filter string // set text button in the right filter string
map_small_filter.setText(day); map_small_filter.setText(day);
map_medium_filter.setText(week); map_medium_filter.setText(week);
map_medium_filter.setText(week);
map_large_filter.setText(month); map_large_filter.setText(month);
} }
updateShowedNotes(); setButtonsColor();
} }
}); });
@ -190,7 +191,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
map_medium_filter.setText(kilometer); map_medium_filter.setText(kilometer);
map_large_filter.setText(tenKilometers); map_large_filter.setText(tenKilometers);
} }
updateShowedNotes(); setButtonsColor();
} }
}); });
@ -211,7 +212,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
map_medium_filter.setText(others); map_medium_filter.setText(others);
map_large_filter.setText(all); map_large_filter.setText(all);
} }
updateShowedNotes(); setButtonsColor();
} }
}); });
} }
@ -568,10 +569,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
} }
Log.d(TAG, "updateShowedNotes: ======= markers presented: "+ presentedNotes.size()+"============="); Log.d(TAG, "updateShowedNotes: ======= markers presented: "+ presentedNotes.size()+"=============");
// noteListAdapter.updateList(presentedNotes);
// noteList.setAdapter(noteListAdapter);
mMap.clear(); mMap.clear();
new getMarkersFromNotes(mMap, eventMarkerMap).execute(listOfNotes); new getMarkersFromNotes(mMap, eventMarkerMap).execute(presentedNotes);
} }
@ -616,7 +615,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
//date filters //date filters
else { else {
dateFilterSelection = Utils.MONTH_MILI; dateFilterSelection = Utils.WEEK_MILI;
} }
//change colors of buttons and update visible notes //change colors of buttons and update visible notes
setButtonsColor(); setButtonsColor();

2
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
View file

@ -50,7 +50,7 @@ public class Utils {
private static SharedPreferences prefs; private static SharedPreferences prefs;
public static int filterColor = Color.parseColor("#33adff"); public static int filterColor = Color.parseColor("#33adff");
public static final long DAY_MILI = 86400000L,WEEK_MILI = 604800000L,MONTH_MILI = 2592000000L; 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; public static final float DISTANCE_SMALL = 1000,DISTANCE_MEDIUM = 10000,DISTANCE_LONG = 100000;