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

Enable map moving with follow track screen

Browse source
This commit is contained in:
Vitaliy 2020-08-28 12:31:06 +03:00
parent 69e5293412
commit 3004c8bc35
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java
View file

@ -148,13 +148,6 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
}
});
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
openMenuHeaderOnly();
}
});
if (isPortrait()) {
updateCardsLayout();
}
@ -272,6 +265,18 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
return divider;
}
@Override
public void onResume() {
super.onResume();
MapRouteInfoMenu.followTrackVisible = true;
}
@Override
public void onPause() {
super.onPause();
MapRouteInfoMenu.followTrackVisible = false;
}
@Override
protected void calculateLayout(View view, boolean initLayout) {
menuTitleHeight = view.findViewById(R.id.route_menu_top_shadow_all).getHeight()

1
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -134,6 +134,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
public static int directionInfo = -1;
public static boolean chooseRoutesVisible = false;
public static boolean waypointsVisible = false;
public static boolean followTrackVisible = false;
private Stack<MapRouteMenuStateHolder> menuBackStack = new Stack<>();

6
OsmAnd/src/net/osmand/plus/views/layers/ContextMenuLayer.java
View file

@ -843,7 +843,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
}
public boolean disableSingleTap() {
if (activity.getMapRouteInfoMenu().isVisible() || MapRouteInfoMenu.waypointsVisible) {
if (activity.getMapRouteInfoMenu().isVisible() || MapRouteInfoMenu.waypointsVisible
|| MapRouteInfoMenu.followTrackVisible) {
return true;
}
boolean res = false;
@ -860,7 +861,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
public boolean disableLongPressOnMap() {
if (mInChangeMarkerPositionMode || mInGpxDetailsMode || mInAddGpxPointMode ||
activity.getMapRouteInfoMenu().isVisible() || MapRouteInfoMenu.waypointsVisible) {
activity.getMapRouteInfoMenu().isVisible() || MapRouteInfoMenu.waypointsVisible
|| MapRouteInfoMenu.followTrackVisible) {
return true;
}
boolean res = false;