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

Showing active poi name in configure map.

Browse source
This commit is contained in:
GaidamakUA 2016-04-06 18:10:41 +03:00
parent 606450dd26
commit dc33fc57ef
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="map_mode">Map mode</string>
<string name="number_of_gpx_files_selected_pattern">%s GPX files selected</string> <string name="number_of_gpx_files_selected_pattern">%s GPX files selected</string>
<string name="rendering_value_thin_name">Thin</string> <string name="rendering_value_thin_name">Thin</string>
<string name="rendering_value_medium_name">Medium</string> <string name="rendering_value_medium_name">Medium</string>
@ -1426,7 +1427,6 @@ If you need help with OsmAnd application, please contact our support team: suppo
<string name="select_navigation_mode">Select transport mode</string> <string name="select_navigation_mode">Select transport mode</string>
<string name="day_night_info_description">Sunrise: %1$s \nSunset: %2$s</string> <string name="day_night_info_description">Sunrise: %1$s \nSunset: %2$s</string>
<string name="day_night_info">Day/night info</string> <string name="day_night_info">Day/night info</string>
<string name="map_widget_day_night">Day/night map</string>
<string name="map_widget_renderer">Map style</string> <string name="map_widget_renderer">Map style</string>
<string name="layer_map_appearance">Configure screen</string> <string name="layer_map_appearance">Configure screen</string>
<string name="show_lanes">Show lanes</string> <string name="show_lanes">Show lanes</string>

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

@ -269,10 +269,9 @@ public class ConfigureMapMenu {
.setTitleId(R.string.map_widget_map_rendering, activity) .setTitleId(R.string.map_widget_map_rendering, activity)
.setCategory(true) .setCategory(true)
.setLayout(R.layout.list_group_title_with_switch).createItem()); .setLayout(R.layout.list_group_title_with_switch).createItem());
String descr = getRenderDescr(activity);
adapter.addItem(new ContextMenuItem.ItemBuilder() adapter.addItem(new ContextMenuItem.ItemBuilder()
.setTitleId(R.string.map_widget_renderer, activity) .setTitleId(R.string.map_widget_renderer, activity)
.setDescription(descr) .setDescription(getRenderDescr(activity))
.setLayout(R.layout.list_item_single_line_descrition_narrow) .setLayout(R.layout.list_item_single_line_descrition_narrow)
.setIcon(R.drawable.ic_map) .setIcon(R.drawable.ic_map)
.setListener(new ContextMenuAdapter.ItemClickListener() { .setListener(new ContextMenuAdapter.ItemClickListener() {
@ -319,7 +318,7 @@ public class ConfigureMapMenu {
}).createItem()); }).createItem());
adapter.addItem(new ContextMenuItem.ItemBuilder() adapter.addItem(new ContextMenuItem.ItemBuilder()
.setTitleId(R.string.map_widget_day_night, activity) .setTitleId(R.string.map_mode, activity)
.setDescription(getDayNightDescr(activity)) .setDescription(getDayNightDescr(activity))
.setLayout(R.layout.list_item_single_line_descrition_narrow) .setLayout(R.layout.list_item_single_line_descrition_narrow)
.setIcon(getDayNightIcon(activity)) .setIcon(getDayNightIcon(activity))
@ -444,9 +443,12 @@ public class ConfigureMapMenu {
} }
}).createItem()); }).createItem());
String localeDescr = activity.getMyApplication().getSettings().MAP_PREFERRED_LOCALE.get();
localeDescr = localeDescr == null || localeDescr.equals("") ?
activity.getString(R.string.local_map_names) : localeDescr;
adapter.addItem(new ContextMenuItem.ItemBuilder() adapter.addItem(new ContextMenuItem.ItemBuilder()
.setTitleId(R.string.map_locale, activity) .setTitleId(R.string.map_locale, activity)
.setDescription(activity.getMyApplication().getSettings().MAP_PREFERRED_LOCALE.get()) .setDescription(localeDescr)
.setLayout(R.layout.list_item_single_line_descrition_narrow) .setLayout(R.layout.list_item_single_line_descrition_narrow)
.setIcon(R.drawable.ic_action_map_language) .setIcon(R.drawable.ic_action_map_language)
.setListener(new ContextMenuAdapter.ItemClickListener() { .setListener(new ContextMenuAdapter.ItemClickListener() {
@ -471,7 +473,10 @@ public class ConfigureMapMenu {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
view.getSettings().MAP_PREFERRED_LOCALE.set(txtIds[which]); view.getSettings().MAP_PREFERRED_LOCALE.set(txtIds[which]);
refreshMapComplete(activity); refreshMapComplete(activity);
adapter.getItem(pos).setDescription(txtIds[which]); String localeDescr = txtIds[which];
localeDescr = localeDescr == null || localeDescr.equals("") ?
activity.getString(R.string.local_map_names) : localeDescr;
adapter.getItem(pos).setDescription(localeDescr);
ad.notifyDataSetInvalidated(); ad.notifyDataSetInvalidated();
dialog.dismiss(); dialog.dismiss();
} }