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

Issue - #6485 - Remove the close button for the layer transparency seekbar - Fixed

Browse source
This commit is contained in:
madwasp79 2019-02-21 17:37:12 +02:00
parent 3700a01bd7
commit 4901504fe5
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
View file

@ -53,7 +53,6 @@ import static net.osmand.plus.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_UPDA
public class OsmandRasterMapsPlugin extends OsmandPlugin {
public static final String ID = "osmand.rastermaps";
// Constants for determining the order of items in the additional actions context menu
private static final int UPDATE_MAP_ITEM_ORDER = 12300;
private static final int DOWNLOAD_MAP_ITEM_ORDER = 12600;
@ -286,6 +285,9 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
adapter.notifyDataSetChanged();
}
});
if (!isChecked) {
hideSeekBar(mapActivity, mapActivity.getMyApplication().getSettings().MAP_OVERLAY_TRANSPARENCY);
}
return false;
case R.string.layer_underlay:
toggleUnderlayState(mapActivity, RasterMapType.UNDERLAY,
@ -312,6 +314,9 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
RasterMapMenu.refreshMapComplete(mapActivity);
}
});
if (!isChecked) {
hideSeekBar(mapActivity, mapActivity.getMyApplication().getSettings().MAP_TRANSPARENCY);
}
return false;
}
return true;
@ -582,10 +587,9 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
exMapTypePreference = settings.MAP_UNDERLAY_PREVIOUS;
map = underlayLayer.getMap();
}
boolean isChecked = map == null;
boolean isChecked = map != null;
boolean showSeekbar = isChecked && RasterMapMenu.isSeekbarVisible(app, type);
boolean hideSeekbar = !isChecked && RasterMapMenu.isSeekbarVisible(app, type);
boolean hideSeekbar = !isChecked;
MapActivityLayers mapLayers = mapActivity.getMapLayers();
CommonPreference<LayerTransparencySeekbarMode> seekbarModePref = settings.LAYER_TRANSPARENCY_SEEKBAR_MODE;
if (showSeekbar) {
@ -597,8 +601,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
seekbarModePref.set(currentMapTypeSeekbarMode);
}
} else if (hideSeekbar) {
mapLayers.getMapControlsLayer().hideTransparencyBar(mapTransparencyPreference);
mapLayers.getMapControlsLayer().setTransparencyBarEnabled(false);
hideSeekBar(mapActivity, mapTransparencyPreference);
}
if (map != null) {
@ -612,6 +615,11 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
}
}
private void hideSeekBar(MapActivity mapActivity, OsmandSettings.CommonPreference<Integer> preference) {
mapActivity.getMapLayers().getMapControlsLayer().hideTransparencyBar(preference);
mapActivity.getMapLayers().getMapControlsLayer().setTransparencyBarEnabled(false);
}
public enum RasterMapType {
OVERLAY,
UNDERLAY