Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix wrong markers group header

Browse source
This commit is contained in:
Nazar-Kutz 2020-05-15 11:48:59 +03:00
parent f5568b931b
commit 1b5e4e7a8c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
View file

@ -144,7 +144,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
items.add(markerMonth); items.add(markerMonth);
previousDateHeader = markerMonth; previousDateHeader = markerMonth;
monthsDisplayed += 1; monthsDisplayed += 1;
} else if (currentMonth - markerMonth >= 4 && previousDateHeader != THIS_YEAR_HEADER) { } else if (currentMonth - markerMonth >= 4 && previousDateHeader != markerMonth && previousDateHeader != THIS_YEAR_HEADER) {
items.add(THIS_YEAR_HEADER); items.add(THIS_YEAR_HEADER);
previousDateHeader = THIS_YEAR_HEADER; previousDateHeader = THIS_YEAR_HEADER;
} }

4
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
View file

@ -80,8 +80,8 @@ public class MapMarkersHistoryAdapter extends RecyclerView.Adapter<RecyclerView.
} else if (currentDay - markerDay > 8 && monthsDisplayed < 3 && previousHeader != markerMonth) { } else if (currentDay - markerDay > 8 && monthsDisplayed < 3 && previousHeader != markerMonth) {
items.add(markerMonth); items.add(markerMonth);
previousHeader = markerMonth; previousHeader = markerMonth;
monthsDisplayed += 1; monthsDisplayed++;
} else if (currentMonth - markerMonth >= 4 && previousHeader != THIS_YEAR_HEADER) { } else if (currentMonth - markerMonth >= 4 && previousHeader != markerMonth && previousHeader != THIS_YEAR_HEADER) {
items.add(THIS_YEAR_HEADER); items.add(THIS_YEAR_HEADER);
previousHeader = THIS_YEAR_HEADER; previousHeader = THIS_YEAR_HEADER;
} }