diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png new file mode 100644 index 0000000000..7603e05c52 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png differ diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png new file mode 100644 index 0000000000..b3774733e0 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png new file mode 100644 index 0000000000..63ef1340d4 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png differ diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png new file mode 100644 index 0000000000..de9e82c1a0 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png new file mode 100644 index 0000000000..3ac453e873 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png new file mode 100644 index 0000000000..c1cc5eb59c Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png differ diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 2d65f36877..3e7adf30cc 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -30,6 +30,7 @@ Share taxi routes Trolleybus routes Bus routes + Hide Routes Details Transport diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java index cd81cb1d8b..accaf3e288 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java @@ -261,12 +261,16 @@ public class ConfigureMapMenu { RenderingRulesStorage renderer = activity.getMyApplication().getRendererRegistry().getCurrentSelectedRenderer(); if (renderer != null) { List customRules = new ArrayList(renderer.PROPS.getCustomRules()); - createProperties(customRules, R.string.rendering_category_details, "details", + + createProperties(customRules, R.string.rendering_category_transport, "transport", adapter, activity); createProperties(customRules, R.string.rendering_category_routes, "routes", adapter, activity); - createProperties(customRules, R.string.rendering_category_transport, "transport", + createProperties(customRules, R.string.rendering_category_details, "details", adapter, activity); + createProperties(customRules, R.string.rendering_category_hide, "hide", + adapter, activity); + if(customRules.size() > 0) { adapter.item(R.string.rendering_category_others).setCategory(true).layout(R.layout.drawer_list_sub_header).reg(); createCustomRenderingProperties(adapter, activity, customRules); diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java index cacea3bc36..95ceb3be41 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java @@ -210,7 +210,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin { } }; adapter.item(R.string.layer_map).icons(R.drawable.ic_action_globus_dark, R.drawable.ic_action_globus_light) - .listen(listener).position(0).reg(); + .listen(listener).position(3).reg(); adapter.item(R.string.layer_overlay).selected(overlayLayer.getMap() != null ? 1 : 0). icons(R.drawable.ic_action_up_dark, R.drawable.ic_action_up_light).listen(listener).position(14).reg(); adapter.item(R.string.layer_underlay).selected(underlayLayer.getMap() != null ? 1 : 0)