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

added methods for work with MapRouteInfoMenu

Browse source
This commit is contained in:
Chumva 2018-03-16 11:07:37 +02:00
parent b3acbb0d32
commit 59e8c42fc0
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/FavouritesBottomSheetMenuFragment.java
View file

@ -45,10 +45,18 @@ public class FavouritesBottomSheetMenuFragment extends MenuBottomSheetDialogFrag
private boolean isSorted = false;
private boolean locationUpdateStarted;
private boolean compassUpdateAllowed = true;
private boolean target;
private boolean intermediate;
private BottomSheetItemWithTitleAndButton title;
@Override
public void createMenuItems(Bundle savedInstanceState) {
Bundle args = getArguments();
if (args != null) {
target = args.getBoolean(TARGET);
intermediate = args.getBoolean(INTERMEDIATE);
}
favouritePoints = getMyApplication().getFavorites().getVisibleFavouritePoints();
recyclerView = new RecyclerView(getContext());
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
@ -101,9 +109,6 @@ public class FavouritesBottomSheetMenuFragment extends MenuBottomSheetDialogFrag
}
private void selectFavorite(FavouritePoint point) {
Bundle args = getArguments();
boolean target = args.getBoolean(TARGET);
boolean intermediate = args.getBoolean(INTERMEDIATE);
TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper();
LatLon ll = new LatLon(point.getLatitude(), point.getLongitude());
if (intermediate) {
@ -113,19 +118,34 @@ public class FavouritesBottomSheetMenuFragment extends MenuBottomSheetDialogFrag
} else {
targetPointsHelper.setStartPoint(ll, true, point.getPointDescription());
}
MapRouteInfoMenu routeMenu = getMapRouteInfoMenu();
if (routeMenu != null) {
setupMapRouteInfoMenuSpinners(routeMenu);
updateMapRouteInfoMenuFromIcon(routeMenu);
}
dismiss();
}
private void setupMapRouteInfoMenuSpinners(MapRouteInfoMenu routeMenu) {
if (routeMenu != null) {
routeMenu.setupSpinners(target, intermediate);
}
}
private void updateMapRouteInfoMenuFromIcon(MapRouteInfoMenu routeMenu) {
if (!intermediate) {
routeMenu.updateFromIcon();
}
}
private MapRouteInfoMenu getMapRouteInfoMenu() {
Activity activity = getActivity();
if (activity instanceof MapActivity) {
MapActivity map = ((MapActivity) activity);
MapRouteInfoMenu routeMenu = map.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
routeMenu.setupSpinners(target, intermediate);
if (!intermediate) {
routeMenu.updateFromIcon();
}
return map.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
} else {
return;
return null;
}
dismiss();
}
@Override
@ -139,6 +159,7 @@ public class FavouritesBottomSheetMenuFragment extends MenuBottomSheetDialogFrag
public void onPause() {
super.onPause();
stopLocationUpdate();
setupMapRouteInfoMenuSpinners(getMapRouteInfoMenu());
}
@Override

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

@ -480,7 +480,6 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
args.putBoolean(FavouritesBottomSheetMenuFragment.INTERMEDIATE, intermediate);
fragment.setArguments(args);
fragment.show(fragmentManager, FavouritesBottomSheetMenuFragment.TAG);
setupSpinners(target, intermediate);
}
public void setupSpinners(final boolean target, final boolean intermediate) {