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

Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch

Browse source
This commit is contained in:
PavelRatushny 2017-09-26 17:59:02 +03:00
commit 309daae774
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
View file

@ -551,12 +551,18 @@ public class MapMarkersHelper {
return mapMarkersHistory;
}
public void clearSelections() {
public void deselectAllActiveMarkers() {
for (MapMarker m : mapMarkers) {
m.selected = false;
}
}
public void selectAllActiveMarkers() {
for (MapMarker m : mapMarkers) {
m.selected = true;
}
}
public List<MapMarker> getSelectedMarkers() {
List<MapMarker> list = new ArrayList<>();
for (MapMarker m : this.mapMarkers) {

25
OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
View file

@ -50,6 +50,7 @@ public class PlanRouteFragment extends Fragment {
private PlanRouteToolbarController toolbarController;
private ApplicationMode appMode;
private int previousMapPosition;
private int selectedCount = 0;
private boolean nightMode;
private boolean portrait;
@ -120,7 +121,16 @@ public class PlanRouteFragment extends Fragment {
mainView.findViewById(R.id.select_all_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Toast.makeText(mapActivity, "Select all", Toast.LENGTH_SHORT).show();
int activeMarkersCount = markersHelper.getMapMarkers().size();
if (selectedCount == activeMarkersCount) {
markersHelper.deselectAllActiveMarkers();
selectedCount = 0;
} else {
markersHelper.selectAllActiveMarkers();
selectedCount = activeMarkersCount;
}
adapter.notifyDataSetChanged();
updateSelectButton();
}
});
@ -167,8 +177,10 @@ public class PlanRouteFragment extends Fragment {
public void onItemClick(View view) {
int pos = markersRv.getChildAdapterPosition(view);
MapMarker marker = adapter.getItem(pos);
selectedCount = marker.selected ? selectedCount - 1 : selectedCount + 1;
marker.selected = !marker.selected;
adapter.notifyItemChanged(pos);
updateSelectButton();
}
@Override
@ -270,6 +282,7 @@ public class PlanRouteFragment extends Fragment {
mapActivity.refreshMap();
updateText();
updateSelectButton();
}
}
@ -329,6 +342,14 @@ public class PlanRouteFragment extends Fragment {
timeTv.setText("~ 45 min.");
}
private void updateSelectButton() {
if (selectedCount == markersHelper.getMapMarkers().size()) {
((TextView) mainView.findViewById(R.id.select_all_button)).setText(getString(R.string.shared_string_deselect_all));
} else {
((TextView) mainView.findViewById(R.id.select_all_button)).setText(getString(R.string.shared_string_select_all));
}
}
private void mark(int status, int... widgets) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
@ -427,7 +448,7 @@ public class PlanRouteFragment extends Fragment {
if (markersListOpened) {
hideMarkersList();
}
markersHelper.clearSelections();
markersHelper.deselectAllActiveMarkers();
activity.getSupportFragmentManager().beginTransaction().remove(this).commitAllowingStateLoss();
}