From 92ebce088c08f9fb08539636f728bd2f10f82014 Mon Sep 17 00:00:00 2001 From: fanfan Date: Mon, 11 Jul 2011 21:59:26 +0200 Subject: [PATCH] Change UI in select layer. - Display all items as radiobutton - 1/ Display the last layer selected - 2/ Display the vector map layer - 3/ Display all other layers - 4/ Display "Install more" Option --- .../plus/activities/MapActivityLayers.java | 71 ++++++++++++++----- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index b51d730e7c..e7b1546c0f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -4,23 +4,25 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import net.osmand.Algoritms; import net.osmand.CallbackWithObject; import net.osmand.GPXUtilities; -import net.osmand.OsmAndFormatter; import net.osmand.GPXUtilities.GPXFileResult; +import net.osmand.OsmAndFormatter; import net.osmand.data.AmenityType; import net.osmand.map.ITileSource; import net.osmand.plus.OsmandSettings; +import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.PoiFilter; import net.osmand.plus.PoiFiltersHelper; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; import net.osmand.plus.SQLiteTileSource; -import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.render.MapRenderRepositories; import net.osmand.plus.render.MapVectorLayer; import net.osmand.plus.views.BaseMapLayer; @@ -40,8 +42,8 @@ import net.osmand.plus.views.RouteLayer; import net.osmand.plus.views.TransportInfoLayer; import net.osmand.plus.views.TransportStopsLayer; import android.app.AlertDialog; -import android.app.ProgressDialog; import android.app.AlertDialog.Builder; +import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; import android.widget.LinearLayout; @@ -73,7 +75,6 @@ public class MapActivityLayers { private RouteInfoLayer routeInfoLayer; private MapControlsLayer mapControlsLayer; - public MapActivityLayers(MapActivity activity) { this.activity = activity; } @@ -466,21 +467,52 @@ public class MapActivityLayers { private void selectMapLayer(final OsmandMapTileView mapView){ final OsmandSettings settings = getApplication().getSettings(); - Map entriesMap = settings.getTileSourceEntries(); + + final LinkedHashMap entriesMap = new LinkedHashMap(); + + final String layerOsmVector = "LAYER_OSM_VECTOR"; + final String layerInstallMore = "LAYER_INSTALL_MORE"; + + entriesMap.put(layerOsmVector, getString(R.string.vector_data)); + entriesMap.putAll(settings.getTileSourceEntries()); + entriesMap.put(layerInstallMore, getString(R.string.install_more)); + + final List> entriesMapList = new ArrayList>(entriesMap.entrySet()); + Builder builder = new AlertDialog.Builder(activity); - final ArrayList keys = new ArrayList(entriesMap.keySet()); - final String[] items = new String[entriesMap.size() + 2]; - items[0] = getString(R.string.vector_data); - int i = 1; - for(String it : entriesMap.values()){ - items[i++] = it; + + String selectedTileSourceKey = settings.MAP_TILE_SOURCES.get(); + + int selectedItem = -1; + if (settings.MAP_VECTOR_DATA.get()) { + selectedItem = 0; + } else { + + Entry selectedEntry = null; + for (Entry entry : entriesMap.entrySet()) { + if (entry.getKey().equals(selectedTileSourceKey)) { + selectedEntry = entry; + break; + } + } + if (selectedEntry != null) { + selectedItem = 0; + entriesMapList.remove(selectedEntry); + entriesMapList.add(0, selectedEntry); + } } - items[i] = getString(R.string.install_more); - builder.setItems(items, new DialogInterface.OnClickListener(){ + final String[] items = new String[entriesMapList.size()]; + int i = 0; + for (Entry entry : entriesMapList) { + items[i++] = entry.getValue(); + } + + builder.setSingleChoiceItems(items, selectedItem, new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which) { - if (which == 0) { + String layerKey = entriesMapList.get(which).getKey(); + if (layerKey.equals(layerOsmVector)) { MapRenderRepositories r = ((OsmandApplication) getApplication()).getResourceManager().getRenderer(); if (r.isEmpty()) { Toast.makeText(activity, getString(R.string.no_vector_map_loaded), Toast.LENGTH_LONG).show(); @@ -489,7 +521,7 @@ public class MapActivityLayers { settings.MAP_VECTOR_DATA.set(true); } updateMapSource(mapView, null); - } else if (which == items.length - 1) { + } else if (layerKey.equals(layerInstallMore)) { SettingsActivity.installMapLayers(activity, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -497,18 +529,18 @@ public class MapActivityLayers { } }); } else { - settings.MAP_TILE_SOURCES.set(keys.get(which - 1)); + settings.MAP_TILE_SOURCES.set(layerKey); settings.MAP_VECTOR_DATA.set(false); updateMapSource(mapView, settings.MAP_TILE_SOURCES); } + dialog.dismiss(); } }); builder.show(); } - - + private void selectMapOverlayLayer(final OsmandMapTileView mapView, final CommonPreference mapPref, final CommonPreference transparencyPref, final BaseMapLayer... transparencyToChange){ @@ -523,7 +555,7 @@ public class MapActivityLayers { } items[i] = getString(R.string.install_more); - builder.setItems(items, new DialogInterface.OnClickListener(){ + builder.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener(){ @Override public void onClick(DialogInterface dialog, int which) { if (which == items.length - 1){ @@ -539,6 +571,7 @@ public class MapActivityLayers { updateMapSource(mapView, mapPref); } + dialog.dismiss(); } });