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

Context menu: close on slide down

Browse source
This commit is contained in:
Alexey Kulish 2015-10-13 19:55:46 +03:00
parent 9884a65428
commit cfcfe20daa
1 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.GestureDetector;
import android.view.GestureDetector.OnGestureListener;
@ -153,7 +154,7 @@ public class MapContextMenuFragment extends Fragment {
showOnMap(menu.getLatLon());
if (hasMoved) {
applyPosY(getViewY());
applyPosY(getViewY(), false);
}
return true;
}
@ -204,15 +205,15 @@ public class MapContextMenuFragment extends Fragment {
velocity.recycle();
if (menu.isExtended()) {
if (menuBottomViewHeight > 0 && slidingUp) {
menu.slideUp();
} else if (slidingDown) {
menu.slideDown();
}
boolean needCloseMenu = false;
if (menuBottomViewHeight > 0 && slidingUp) {
menu.slideUp();
} else if (slidingDown) {
needCloseMenu = !menu.slideDown();
}
applyPosY(currentY);
applyPosY(currentY, needCloseMenu);
break;
@ -220,8 +221,8 @@ public class MapContextMenuFragment extends Fragment {
return true;
}
private void applyPosY(int currentY) {
final int posY = getPosY();
private void applyPosY(final int currentY, final boolean needCloseMenu) {
final int posY = getPosY(needCloseMenu);
if (currentY != posY) {
if (posY < currentY) {
updateMainViewLayout(posY);
@ -234,12 +235,20 @@ public class MapContextMenuFragment extends Fragment {
.setListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationCancel(Animator animation) {
updateMainViewLayout(posY);
if (needCloseMenu) {
menu.close();
} else {
updateMainViewLayout(posY);
}
}
@Override
public void onAnimationEnd(Animator animation) {
updateMainViewLayout(posY);
if (needCloseMenu) {
menu.close();
} else {
updateMainViewLayout(posY);
}
}
})
.start();
@ -450,6 +459,14 @@ public class MapContextMenuFragment extends Fragment {
}
private int getPosY() {
return getPosY(false);
}
private int getPosY(boolean needCloseMenu) {
if (needCloseMenu) {
return getScreenHeight();
}
int destinationState;
int minHalfY;
if (menu.isExtended()) {
@ -580,5 +597,11 @@ public class MapContextMenuFragment extends Fragment {
r.getDisplayMetrics()
);
}
private int getScreenHeight() {
DisplayMetrics dm = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
return dm.heightPixels;
}
}