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

Remove "Transport" from "Map rendering" section of Configure Map menu

Browse source
This commit is contained in:
Nazar-Kutz 2020-05-07 16:33:53 +03:00
parent 98d02f7e8e
commit 1706c809e1
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,6 @@ import net.osmand.plus.GpxSelectionHelper;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.OsmandSettings.CommonPreference; import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.OsmandSettings.ListStringPreference; import net.osmand.plus.OsmandSettings.ListStringPreference;
import net.osmand.plus.R; import net.osmand.plus.R;
@ -107,6 +106,7 @@ import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_DENSITY_ATTR;
import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_ATTR; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_ATTR;
import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_SCHEME_ATTR; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_SCHEME_ATTR;
import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_WIDTH_ATTR; import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_WIDTH_ATTR;
import static net.osmand.plus.transport.TransportLinesMenu.RENDERING_CATEGORY_TRANSPORT;
public class ConfigureMapMenu { public class ConfigureMapMenu {
private static final Log LOG = PlatformUtil.getLog(ConfigureMapMenu.class); private static final Log LOG = PlatformUtil.getLog(ConfigureMapMenu.class);
@ -140,7 +140,8 @@ public class ConfigureMapMenu {
ma.getDashboard().updateListAdapter(createListAdapter(ma)); ma.getDashboard().updateListAdapter(createListAdapter(ma));
} }
}); });
List<RenderingRuleProperty> customRules = getCustomRules(app); List<RenderingRuleProperty> customRules = getCustomRules(app,
RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN, RENDERING_CATEGORY_TRANSPORT);
adapter.setProfileDependent(true); adapter.setProfileDependent(true);
adapter.setNightMode(nightMode); adapter.setNightMode(nightMode);
createLayersItems(customRules, adapter, ma, themeRes, nightMode); createLayersItems(customRules, adapter, ma, themeRes, nightMode);
@ -148,16 +149,27 @@ public class ConfigureMapMenu {
return adapter; return adapter;
} }
public static List<RenderingRuleProperty> getCustomRules(OsmandApplication app) { public static List<RenderingRuleProperty> getCustomRules(OsmandApplication app, String... skipCategories) {
RenderingRulesStorage renderer = app.getRendererRegistry().getCurrentSelectedRenderer(); RenderingRulesStorage renderer = app.getRendererRegistry().getCurrentSelectedRenderer();
if (renderer == null) {
return new ArrayList<>();
}
List<RenderingRuleProperty> customRules = new ArrayList<>(); List<RenderingRuleProperty> customRules = new ArrayList<>();
boolean useDepthContours = app.getResourceManager().hasDepthContours() boolean useDepthContours = app.getResourceManager().hasDepthContours()
&& (InAppPurchaseHelper.isSubscribedToLiveUpdates(app) && (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)
|| InAppPurchaseHelper.isDepthContoursPurchased(app)); || InAppPurchaseHelper.isDepthContoursPurchased(app));
if (renderer != null) {
for (RenderingRuleProperty p : renderer.PROPS.getCustomRules()) { for (RenderingRuleProperty p : renderer.PROPS.getCustomRules()) {
if (!RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(p.getCategory()) if (useDepthContours || !"depthContours".equals(p.getAttrName())) {
&& (useDepthContours || !p.getAttrName().equals("depthContours"))) { boolean skip = false;
if (skipCategories != null) {
for (String category : skipCategories) {
if (category.equals(p.getCategory())) {
skip = true;
break;
}
}
}
if (!skip) {
customRules.add(p); customRules.add(p);
} }
} }
@ -767,9 +779,6 @@ public class ConfigureMapMenu {
.setItemDeleteAction(makeDeleteAction(settings.MAP_PREFERRED_LOCALE)) .setItemDeleteAction(makeDeleteAction(settings.MAP_PREFERRED_LOCALE))
.createItem()); .createItem());
if (props != null) {
adapter.addItem(props);
}
props = createProperties(customRules, null, R.string.rendering_category_details, R.drawable.ic_action_layers, props = createProperties(customRules, null, R.string.rendering_category_details, R.drawable.ic_action_layers,
"details", null, adapter, activity, true, DETAILS_ID, themeRes, nightMode, selectedProfileColor); "details", null, adapter, activity, true, DETAILS_ID, themeRes, nightMode, selectedProfileColor);
if (props != null) { if (props != null) {

4
OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
View file

@ -35,7 +35,7 @@ import java.util.Map;
public class TransportLinesMenu { public class TransportLinesMenu {
public static final String TRANSPORT_RENDERING_CATEGORY = "transport"; public static final String RENDERING_CATEGORY_TRANSPORT = "transport";
public static final String PT_TRANSPORT_STOPS = "transportStops"; public static final String PT_TRANSPORT_STOPS = "transportStops";
public static final String PT_PUBLIC_TRANSPORT_MODE = "publicTransportMode"; public static final String PT_PUBLIC_TRANSPORT_MODE = "publicTransportMode";
@ -199,7 +199,7 @@ public class TransportLinesMenu {
public static List<RenderingRuleProperty> getTransportRules(OsmandApplication app) { public static List<RenderingRuleProperty> getTransportRules(OsmandApplication app) {
List<RenderingRuleProperty> transportRules = new ArrayList<>(); List<RenderingRuleProperty> transportRules = new ArrayList<>();
for (RenderingRuleProperty property : ConfigureMapMenu.getCustomRules(app)) { for (RenderingRuleProperty property : ConfigureMapMenu.getCustomRules(app)) {
if (TRANSPORT_RENDERING_CATEGORY.equals(property.getCategory()) && property.isBoolean()) { if (RENDERING_CATEGORY_TRANSPORT.equals(property.getCategory()) && property.isBoolean()) {
transportRules.add(property); transportRules.add(property);
} }
} }