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

Show zoom and location buttons with opened markers list in plan route mode

Browse source
This commit is contained in:
Alexander Sytnyk 2017-09-29 12:01:33 +03:00
parent f3e535198c
commit fdbd1c32b7
3 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
View file

@ -468,7 +468,6 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
MapMarkersLayer markersLayer = getMapMarkersLayer();
if (mapActivity != null && markersLayer != null) {
markersListOpened = true;
markersLayer.setMarkersListOpened(true);
upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_down));
View listContainer = mainView.findViewById(R.id.markers_list_container);
if (portrait && listContainer != null) {
@ -490,7 +489,6 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
MapMarkersLayer markersLayer = getMapMarkersLayer();
if (mapActivity != null && markersLayer != null) {
markersListOpened = false;
markersLayer.setMarkersListOpened(false);
upDownIconIv.setImageDrawable(getContentIcon(R.drawable.ic_action_arrow_up));
View listContainer = mainView.findViewById(R.id.markers_list_container);
if (portrait && listContainer != null) {

10
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -727,8 +727,8 @@ public class MapControlsLayer extends OsmandMapLayer {
routePlanningBtn.updateVisibility(showButtons);
menuControl.updateVisibility(showButtons);
mapZoomIn.updateVisibility(!routeDialogOpened && !isInExpandedRouteMode());
mapZoomOut.updateVisibility(!routeDialogOpened && !isInExpandedRouteMode());
mapZoomIn.updateVisibility(!routeDialogOpened);
mapZoomOut.updateVisibility(!routeDialogOpened);
compassHud.updateVisibility(!routeDialogOpened && !trackDialogOpened && shouldShowCompass()
&& !isInMeasurementToolMode() && !isInPlanRouteMode());
@ -814,7 +814,7 @@ public class MapControlsLayer extends OsmandMapLayer {
backToLocationControl.iv.setContentDescription(mapActivity.getString(R.string.map_widget_back_to_loc));
}
boolean visible = !(tracked && rh.isFollowingMode());
backToLocationControl.updateVisibility(visible && !dialogOpened && !isInExpandedRouteMode());
backToLocationControl.updateVisibility(visible && !dialogOpened);
if (app.accessibilityEnabled()) {
backToLocationControl.iv.setClickable(enabled && visible);
}
@ -1136,10 +1136,6 @@ public class MapControlsLayer extends OsmandMapLayer {
return mapActivity.getMapLayers().getMapMarkersLayer().isInPlanRouteMode();
}
private boolean isInExpandedRouteMode() {
return mapActivity.getMapLayers().getMapMarkersLayer().isMarkersListOpened();
}
public static View.OnLongClickListener getOnClickMagnifierListener(final OsmandMapTileView view) {
return new View.OnLongClickListener() {

9
OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
View file

@ -81,7 +81,6 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
private ContextMenuLayer contextMenuLayer;
private boolean inPlanRouteMode;
private boolean markersListOpened;
public MapMarkersLayer(MapActivity map) {
this.map = map;
@ -99,14 +98,6 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
this.inPlanRouteMode = inPlanRouteMode;
}
public boolean isMarkersListOpened() {
return inPlanRouteMode && markersListOpened;
}
public void setMarkersListOpened(boolean markersListOpened) {
this.markersListOpened = markersListOpened;
}
private void initUI() {
bitmapPaint = new Paint();
bitmapPaint.setDither(true);