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

pr fixes

Browse source
This commit is contained in:
madwasp79 2019-02-25 15:11:39 +02:00
parent 4901504fe5
commit 77e7b4141f
3 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
View file

@ -2,7 +2,6 @@ package net.osmand.plus.dialogs;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.util.Log;
import android.view.View;
import android.widget.ArrayAdapter;
@ -110,7 +109,7 @@ public class RasterMapMenu {
app.runInUIThread(new Runnable() {
@Override
public void run() {
plugin.toggleUnderlayState(mapActivity, type, onMapSelectedCallback);
plugin.toggleUnderlayState(mapActivity, type, onMapSelectedCallback, isChecked);
refreshMapComplete(mapActivity);
}
});

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

@ -284,10 +284,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
item.setColorRes(hasOverlayDescription ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
adapter.notifyDataSetChanged();
}
});
if (!isChecked) {
hideSeekBar(mapActivity, mapActivity.getMyApplication().getSettings().MAP_OVERLAY_TRANSPARENCY);
}
}, isChecked);
return false;
case R.string.layer_underlay:
toggleUnderlayState(mapActivity, RasterMapType.UNDERLAY,
@ -313,10 +310,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
hidePolygonsPref.set(hasUnderlayDescription);
RasterMapMenu.refreshMapComplete(mapActivity);
}
});
if (!isChecked) {
hideSeekBar(mapActivity, mapActivity.getMyApplication().getSettings().MAP_TRANSPARENCY);
}
}, isChecked);
return false;
}
return true;
@ -569,7 +563,8 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
public void toggleUnderlayState(@NonNull MapActivity mapActivity,
@NonNull RasterMapType type,
@Nullable OnMapSelectedCallback callback) {
@Nullable OnMapSelectedCallback callback,
boolean isChecked) {
OsmandMapTileView mapView = mapActivity.getMapView();
CommonPreference<String> mapTypePreference;
CommonPreference<String> exMapTypePreference;
@ -587,21 +582,22 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
exMapTypePreference = settings.MAP_UNDERLAY_PREVIOUS;
map = underlayLayer.getMap();
}
boolean isChecked = map != null;
boolean showSeekbar = isChecked && RasterMapMenu.isSeekbarVisible(app, type);
boolean hideSeekbar = !isChecked;
boolean isSeekBarVisible = RasterMapMenu.isSeekbarVisible(app, type);
MapActivityLayers mapLayers = mapActivity.getMapLayers();
CommonPreference<LayerTransparencySeekbarMode> seekbarModePref = settings.LAYER_TRANSPARENCY_SEEKBAR_MODE;
if (showSeekbar) {
if (isChecked && isSeekBarVisible) {
mapLayers.getMapControlsLayer().showTransparencyBar(mapTransparencyPreference);
mapLayers.getMapControlsLayer().setTransparencyBarEnabled(true);
mapActivity.getMapLayers().getMapControlsLayer().setTransparencyBarEnabled(true);
if (seekbarModePref.get() == LayerTransparencySeekbarMode.UNDEFINED) {
final OsmandSettings.LayerTransparencySeekbarMode currentMapTypeSeekbarMode =
type == OsmandRasterMapsPlugin.RasterMapType.OVERLAY ? OsmandSettings.LayerTransparencySeekbarMode.OVERLAY : OsmandSettings.LayerTransparencySeekbarMode.UNDERLAY;
type == OsmandRasterMapsPlugin.RasterMapType.OVERLAY
? OsmandSettings.LayerTransparencySeekbarMode.OVERLAY
: OsmandSettings.LayerTransparencySeekbarMode.UNDERLAY;
seekbarModePref.set(currentMapTypeSeekbarMode);
}
} else if (hideSeekbar) {
hideSeekBar(mapActivity, mapTransparencyPreference);
} else if (!isChecked || !isSeekBarVisible){
mapLayers.getMapControlsLayer().hideTransparencyBar(mapTransparencyPreference);
mapLayers.getMapControlsLayer().setTransparencyBarEnabled(false);
}
if (map != null) {
@ -615,10 +611,6 @@ 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,

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/WaypointsFragment.java
View file

@ -587,7 +587,7 @@ public class WaypointsFragment extends BaseOsmAndFragment implements ObservableS
}
private void deleteSwipeItem(int position) {
if (swipeDismissListener != null && position < listView.getCount()) {
if (swipeDismissListener != null) {
swipeDismissListener.delete(position);
}
}