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

Fix #4266

Browse source
This commit is contained in:
Alexey Kulish 2017-10-18 15:43:19 +03:00
parent dae669788b
commit 162605aa34
7 changed files with 179 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -436,6 +436,35 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/context_menu_zoom_buttons"
android:layout_width="@dimen/fab_size_with_shadow"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:gravity="center"
android:layout_marginRight="@dimen/fab_margin_right"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageButton
android:id="@+id/context_menu_zoom_in_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomIn"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/context_menu_zoom_out_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_marginTop="@dimen/map_button_spacing"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomOut"
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
<ImageView
android:id="@+id/context_menu_fab_view"
android:contentDescription="@string/layer_route"

51
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -368,7 +368,6 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
fragmentRef.get().centerMarkerLocation();
}
}
updateControlsVisibility();
}
public void show(@NonNull LatLon latLon,
@ -377,7 +376,6 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
if (init(latLon, pointDescription, object)) {
showInternal();
}
updateControlsVisibility();
}
private void showInternal() {
@ -450,19 +448,30 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
if (fragmentRef != null) {
fragmentRef.get().dismissMenu();
}
updateControlsVisibility();
}
public void updateControlsVisibility() {
int visibility = shouldShowControls() ? View.VISIBLE : View.GONE;
mapActivity.findViewById(R.id.map_center_info).setVisibility(visibility);
mapActivity.findViewById(R.id.map_left_widgets_panel).setVisibility(visibility);
mapActivity.findViewById(R.id.map_right_widgets_panel).setVisibility(visibility);
public void updateControlsVisibility(boolean menuVisible) {
int topControlsVisibility = shouldShowTopControls(menuVisible) ? View.VISIBLE : View.GONE;
mapActivity.findViewById(R.id.map_center_info).setVisibility(topControlsVisibility);
mapActivity.findViewById(R.id.map_left_widgets_panel).setVisibility(topControlsVisibility);
mapActivity.findViewById(R.id.map_right_widgets_panel).setVisibility(topControlsVisibility);
int bottomControlsVisibility = shouldShowBottomControls(menuVisible) ? View.VISIBLE : View.GONE;
mapActivity.findViewById(R.id.bottom_controls_container).setVisibility(bottomControlsVisibility);
mapActivity.refreshMap();
}
public boolean shouldShowControls() {
return !isVisible() || isLandscapeLayout() || getCurrentMenuState() == MenuController.MenuState.HEADER_ONLY;
public boolean shouldShowTopControls() {
return shouldShowTopControls(isVisible());
}
public boolean shouldShowTopControls(boolean menuVisible) {
return !menuVisible || isLandscapeLayout() || getCurrentMenuState() == MenuController.MenuState.HEADER_ONLY;
}
public boolean shouldShowBottomControls(boolean menuVisible) {
return !menuVisible || isLandscapeLayout();
}
// timeout in msec
@ -710,6 +719,24 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
mapActivity.getMapLayers().getMapControlsLayer().navigateFab();
}
public boolean zoomInPressed() {
WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
if (fragmentRef != null) {
fragmentRef.get().doZoomIn();
return true;
}
return false;
}
public boolean zoomOutPressed() {
WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
if (fragmentRef != null) {
fragmentRef.get().doZoomOut();
return true;
}
return false;
}
public void buttonWaypointPressed() {
if (pointDescription.isDestination()) {
mapActivity.getMapActions().editWaypoints();
@ -1033,6 +1060,10 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
return menuController == null || menuController.fabVisible();
}
public boolean zoomButtonsVisible() {
return menuController == null || menuController.zoomButtonsVisible();
}
public boolean isClosable() {
return menuController == null || menuController.isClosable();
}

112
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -66,7 +66,10 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
private View view;
private View mainView;
ImageView fabView;
private ImageView fabView;
private View zoomButtonsView;
private ImageButton zoomInButtonView;
private ImageButton zoomOutButtonView;
private MapContextMenu menu;
private OnLayoutChangeListener containerLayoutListener;
@ -83,6 +86,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
private int screenHeight;
private int viewHeight;
private int zoomButtonsHeight;
private int fabPaddingTopPx;
private int markerPaddingPx;
@ -257,7 +261,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
if (singleTapDetector.onTouchEvent(event)) {
moving = false;
if (hasMoved) {
applyPosY(getViewY(), false, false, 0, 0);
applyPosY(getViewY(), false, false, 0, 0, 0);
}
openMenuHalfScreen();
return true;
@ -386,6 +390,32 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
fabView.setVisibility(View.GONE);
}
// Zoom buttons
zoomButtonsView = view.findViewById(R.id.context_menu_zoom_buttons);
zoomInButtonView = (ImageButton) view.findViewById(R.id.context_menu_zoom_in_button);
zoomOutButtonView = (ImageButton) view.findViewById(R.id.context_menu_zoom_out_button);
if (menu.zoomButtonsVisible()) {
updateImageButton(zoomInButtonView, R.drawable.map_zoom_in, R.drawable.map_zoom_in_night,
R.drawable.btn_circle_trans, R.drawable.btn_circle_night, nightMode);
updateImageButton(zoomOutButtonView, R.drawable.map_zoom_out, R.drawable.map_zoom_out_night,
R.drawable.btn_circle_trans, R.drawable.btn_circle_night, nightMode);
zoomInButtonView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
menu.zoomInPressed();
}
});
zoomOutButtonView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
menu.zoomOutPressed();
}
});
zoomButtonsView.setVisibility(View.VISIBLE);
} else {
zoomButtonsView.setVisibility(View.GONE);
}
View buttonsTopBorder = view.findViewById(R.id.buttons_top_border);
AndroidUtils.setBackground(getMapActivity(), buttonsTopBorder, nightMode,
R.color.dashboard_divider_light, R.color.dashboard_divider_dark);
@ -481,6 +511,16 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
return view;
}
private void updateImageButton(ImageButton button, int iconLightId, int iconDarkId, int bgLightId, int bgDarkId, boolean night) {
button.setImageDrawable(getMapActivity().getMyApplication().getIconsCache().getIcon(night ? iconDarkId : iconLightId));
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
button.setBackground(getMapActivity().getResources().getDrawable(night ? bgDarkId : bgLightId,
getMapActivity().getTheme()));
} else {
button.setBackgroundDrawable(getMapActivity().getResources().getDrawable(night ? bgDarkId : bgLightId));
}
}
private void processScreenHeight(ViewParent parent) {
View container = (View)parent;
if (Build.VERSION.SDK_INT >= 11) {
@ -525,17 +565,33 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
boolean needMapAdjust = oldMenuState != newMenuState && newMenuState != MenuState.FULL_SCREEN;
if (newMenuState != oldMenuState) {
menu.updateControlsVisibility();
menu.updateControlsVisibility(true);
doBeforeMenuStateChange(oldMenuState, newMenuState);
}
applyPosY(currentY, needCloseMenu, needMapAdjust, oldMenuState, newMenuState);
applyPosY(currentY, needCloseMenu, needMapAdjust, oldMenuState, newMenuState, 0);
}
public void doZoomIn() {
if (!centered) {
centered = true;
calculateCenterLatLon(menu.getLatLon(), getZoom() + 1, true);
}
applyPosY(getViewY(), false, true, 0, 0, 1);
}
public void doZoomOut() {
if (!centered) {
centered = true;
calculateCenterLatLon(menu.getLatLon(), getZoom() - 1, true);
}
applyPosY(getViewY(), false, true, 0, 0, -1);
}
private void applyPosY(final int currentY, final boolean needCloseMenu, boolean needMapAdjust,
final int previousMenuState, final int newMenuState) {
final int previousMenuState, final int newMenuState, int dZoom) {
final int posY = getPosY(needCloseMenu);
if (currentY != posY) {
if (currentY != posY || dZoom != 0) {
if (posY < currentY) {
updateMainViewLayout(posY);
}
@ -574,8 +630,13 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
.setInterpolator(new DecelerateInterpolator())
.start();
zoomButtonsView.animate().y(getZoomButtonsY(posY))
.setDuration(200)
.setInterpolator(new DecelerateInterpolator())
.start();
if (needMapAdjust) {
adjustMapPosition(posY, true, centered);
adjustMapPosition(posY, true, centered, dZoom);
}
} else {
setViewY(posY, false, needMapAdjust);
@ -791,7 +852,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
if (parent != null && containerLayoutListener != null) {
((View) parent).addOnLayoutChangeListener(containerLayoutListener);
}
menu.updateControlsVisibility(true);
}
@Override
@ -805,6 +866,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
if (!wasDrawerDisabled) {
getMapActivity().enableDrawer();
}
menu.updateControlsVisibility(false);
super.onPause();
}
@ -874,6 +936,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
menuTopShadowHeight = view.findViewById(R.id.context_menu_top_shadow).getHeight();
int newMenuTopShadowAllHeight = view.findViewById(R.id.context_menu_top_shadow_all).getHeight();
menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight();
zoomButtonsHeight = zoomButtonsView.getHeight();
int dy = 0;
if (!menu.isLandscapeLayout()) {
@ -960,7 +1023,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
public void centerMarkerLocation() {
centered = true;
showOnMap(menu.getLatLon(), true, true, false);
showOnMap(menu.getLatLon(), true, true, false, getZoom());
}
private int getZoom() {
@ -994,21 +1057,20 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
return new LatLon(flat, flon);
}
private void showOnMap(LatLon latLon, boolean updateCoords, boolean needMove, boolean alreadyAdjusted) {
private void showOnMap(LatLon latLon, boolean updateCoords, boolean needMove, boolean alreadyAdjusted, int zoom) {
AnimateDraggingMapThread thread = map.getAnimatedDraggingThread();
int fZoom = getZoom();
LatLon calcLatLon = calculateCenterLatLon(latLon, fZoom, updateCoords);
LatLon calcLatLon = calculateCenterLatLon(latLon, zoom, updateCoords);
if (updateCoords) {
mapCenter = calcLatLon;
menu.setMapCenter(mapCenter);
}
if (!alreadyAdjusted) {
calcLatLon = getAdjustedMarkerLocation(getPosY(), calcLatLon, true, fZoom);
calcLatLon = getAdjustedMarkerLocation(getPosY(), calcLatLon, true, zoom);
}
if (needMove) {
thread.startMoving(calcLatLon.getLatitude(), calcLatLon.getLongitude(), fZoom, true);
thread.startMoving(calcLatLon.getLatitude(), calcLatLon.getLongitude(), zoom, true);
}
}
@ -1137,30 +1199,36 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
if (!oldAndroid()) {
mainView.setY(y);
fabView.setY(getFabY(y));
zoomButtonsView.setY(getZoomButtonsY(y));
} else {
mainView.setPadding(0, y, 0, 0);
fabView.setPadding(0, getFabY(y), 0, 0);
zoomButtonsView.setPadding(0, getZoomButtonsY(y), 0, 0);
}
if (!customMapCenter) {
if (adjustMapPos) {
adjustMapPosition(y, animated, centered);
adjustMapPosition(y, animated, centered, 0);
}
} else {
customMapCenter = false;
}
}
private void adjustMapPosition(int y, boolean animated, boolean center) {
private void adjustMapPosition(int y, boolean animated, boolean center, int dZoom) {
map.getAnimatedDraggingThread().stopAnimatingSync();
LatLon latlon = getAdjustedMarkerLocation(y, menu.getLatLon(), center, getZoom());
int zoom = getZoom() + dZoom;
LatLon latlon = getAdjustedMarkerLocation(y, menu.getLatLon(), center, zoom);
if (map.getLatitude() == latlon.getLatitude() && map.getLongitude() == latlon.getLongitude()) {
if (map.getLatitude() == latlon.getLatitude() && map.getLongitude() == latlon.getLongitude() && dZoom == 0) {
return;
}
if (animated) {
showOnMap(latlon, false, true, true);
showOnMap(latlon, false, true, true, zoom);
} else {
if (dZoom != 0) {
map.setIntZoom(zoom);
}
map.setLatLon(latlon.getLatitude(), latlon.getLongitude());
}
}
@ -1236,6 +1304,10 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
return fabY;
}
private int getZoomButtonsY(int y) {
return y - zoomButtonsHeight - fabPaddingTopPx;
}
private boolean oldAndroid() {
return (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH);
}
@ -1268,7 +1340,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
if (mapCenter != null) {
map.setLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
}
adjustMapPosition(getPosY(), true, false);
adjustMapPosition(getPosY(), true, false, 0);
} else {
view.setVisibility(View.GONE);
}

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -353,6 +353,10 @@ public abstract class MenuController extends BaseMenuController {
return true;
}
public boolean zoomButtonsVisible() {
return !isLandscapeLayout();
}
public boolean buttonsVisible() {
return true;
}

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

@ -628,12 +628,14 @@ public class MapControlsLayer extends OsmandMapLayer {
zoomInButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mapActivity.getContextMenu().zoomInPressed()) {
return;
}
if (view.isZooming()) {
mapActivity.changeZoom(2, System.currentTimeMillis());
} else {
mapActivity.changeZoom(1, System.currentTimeMillis());
}
}
});
final View.OnLongClickListener listener = MapControlsLayer.getOnClickMagnifierListener(view);
@ -645,6 +647,9 @@ public class MapControlsLayer extends OsmandMapLayer {
zoomOutButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mapActivity.getContextMenu().zoomOutPressed()) {
return;
}
mapActivity.changeZoom(-1, System.currentTimeMillis());
}
});
@ -708,7 +713,7 @@ public class MapControlsLayer extends OsmandMapLayer {
boolean routeFollowingMode = !routePlanningMode && rh.isFollowingMode();
boolean routeDialogOpened = MapRouteInfoMenu.isVisible();
boolean trackDialogOpened = TrackDetailsMenu.isVisible();
boolean contextMenuOpened = mapActivity.getContextMenu().shouldShowControls();
boolean contextMenuOpened = mapActivity.getContextMenu().shouldShowTopControls();
boolean showRouteCalculationControls = routePlanningMode ||
((app.accessibilityEnabled() || (System.currentTimeMillis() - touchEvent < TIMEOUT_TO_SHOW_BUTTONS)) && routeFollowingMode);
updateMyLocation(rh, routeDialogOpened || trackDialogOpened || !contextMenuOpened);
@ -790,8 +795,8 @@ public class MapControlsLayer extends OsmandMapLayer {
private boolean shouldShowCompass() {
float mapRotate = mapActivity.getMapView().getRotate();
return forceShowCompass || mapRotate != 0
|| settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_NONE
|| mapActivity.getMapLayers().getMapInfoLayer().getMapInfoControls().isVisible("compass");
|| settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_NONE
|| mapActivity.getMapLayers().getMapInfoLayer().getMapInfoControls().isVisible("compass");
}
public CompassDrawable getCompassDrawable(Drawable originalDrawable) {
@ -1122,8 +1127,8 @@ public class MapControlsLayer extends OsmandMapLayer {
this.mapQuickActionLayer = mapQuickActionLayer;
}
private boolean isInMovingMarkerMode(){
return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode():
private boolean isInMovingMarkerMode() {
return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode() :
mapQuickActionLayer.isInMovingMarkerMode() || contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode();
}

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -28,8 +28,6 @@ import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointHelper;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
import net.osmand.plus.routing.RouteDirectionInfo;
import net.osmand.plus.routing.RoutingHelper;
@ -813,7 +811,7 @@ public class MapInfoWidgetsFactory {
}
}
}
if (map.isTopToolbarActive() || !map.getContextMenu().shouldShowControls()) {
if (map.isTopToolbarActive() || !map.getContextMenu().shouldShowTopControls()) {
updateVisibility(false);
} else if (!showNextTurn && updateWaypoint()) {
updateVisibility(true);

2
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
View file

@ -200,7 +200,7 @@ public class MapMarkersWidgetsFactory {
|| MapRouteInfoMenu.isVisible()
|| addressTopBar.getVisibility() == View.VISIBLE
|| map.isTopToolbarActive()
|| !map.getContextMenu().shouldShowControls()
|| !map.getContextMenu().shouldShowTopControls()
|| map.getMapLayers().getMapMarkersLayer().isInPlanRouteMode()) {
updateVisibility(false);
return;