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

Prevent POI dialog from dropping scroll in configure map.

Browse source
This commit is contained in:
GaidamakUA 2016-04-06 19:15:51 +03:00
parent a8cc1aafb9
commit c59acacc60
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -107,10 +107,10 @@ public class ConfigureMapMenu {
@Override @Override
public boolean onRowItemClick(ArrayAdapter<ContextMenuItem> adapter, View view, int itemId, int pos) { public boolean onRowItemClick(ArrayAdapter<ContextMenuItem> adapter, View view, int itemId, int pos) {
if (itemId == R.string.layer_poi) { if (itemId == R.string.layer_poi) {
selectPOILayer(ma.getMyApplication().getSettings()); selectPOILayer(adapter, adapter.getItem(pos));
return false; return false;
} else if (itemId == R.string.layer_gpx_layer && cm.getItem(pos).getSelected()) { } else if (itemId == R.string.layer_gpx_layer && cm.getItem(pos).getSelected()) {
ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView()); showGpxSelectionDialog();
return false; return false;
} else { } else {
CompoundButton btn = (CompoundButton) view.findViewById(R.id.toggle_item); CompoundButton btn = (CompoundButton) view.findViewById(R.id.toggle_item);
@ -136,7 +136,7 @@ public class ConfigureMapMenu {
if (itemId == R.string.layer_poi) { if (itemId == R.string.layer_poi) {
settings.SELECTED_POI_FILTER_FOR_MAP.set(null); settings.SELECTED_POI_FILTER_FOR_MAP.set(null);
if (isChecked) { if (isChecked) {
selectPOILayer(settings); selectPOILayer(adapter, adapter.getItem(pos));
} else { } else {
adapter.getItem(pos).setDescription(POIMapLayer.getSelectedPoiName(ma.getMyApplication())); adapter.getItem(pos).setDescription(POIMapLayer.getSelectedPoiName(ma.getMyApplication()));
} }
@ -150,18 +150,7 @@ public class ConfigureMapMenu {
selectedGpxHelper.clearAllGpxFileToShow(); selectedGpxHelper.clearAllGpxFileToShow();
adapter.getItem(pos).setDescription(selectedGpxHelper.getGpxDescription()); adapter.getItem(pos).setDescription(selectedGpxHelper.getGpxDescription());
} else { } else {
AlertDialog dialog = ma.getMapLayers() showGpxSelectionDialog();
.showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
boolean areAnyGpxTracksVisible =
selectedGpxHelper.isShowingAnyGpxFiles();
item.setSelected(areAnyGpxTracksVisible);
item.setColorRes(areAnyGpxTracksVisible ? R.color.osmand_orange : defaultColor);
adapter.notifyDataSetChanged();
}
});
} }
} else if (itemId == R.string.layer_map) { } else if (itemId == R.string.layer_map) {
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) == null) { if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) == null) {
@ -179,14 +168,25 @@ public class ConfigureMapMenu {
return false; return false;
} }
protected void selectPOILayer(final OsmandSettings settings) { private void showGpxSelectionDialog() {
ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
}
protected void selectPOILayer(final ArrayAdapter<ContextMenuItem> adapter,
final ContextMenuItem item) {
final PoiUIFilter[] selected = new PoiUIFilter[1]; final PoiUIFilter[] selected = new PoiUIFilter[1];
AlertDialog dlg = ma.getMapLayers().selectPOIFilterLayer(ma.getMapView(), selected); AlertDialog dlg = ma.getMapLayers().selectPOIFilterLayer(ma.getMapView(), selected);
dlg.setOnDismissListener(new DialogInterface.OnDismissListener() { dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override @Override
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
ma.getDashboard().refreshContent(true); OsmandApplication myApplication = ma.getMyApplication();
boolean selected = myApplication.getSettings()
.SELECTED_POI_FILTER_FOR_MAP.get() != null;
item.setSelected(selected);
item.setDescription(POIMapLayer.getSelectedPoiName(myApplication));
item.setColorRes(selected ? R.color.osmand_orange : defaultColor);
adapter.notifyDataSetChanged();
} }
}); });
} }