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

Introduce close button

Browse source
This commit is contained in:
Victor Shcherb 2012-04-27 20:57:41 +02:00
parent 399c5f0a7d
commit d0bb21a03d
2 changed files with 123 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout.LayoutParams; import android.widget.FrameLayout.LayoutParams;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
public class ContextMenuLayer extends OsmandMapLayer { public class ContextMenuLayer extends OsmandMapLayer {
@ -47,10 +48,12 @@ public class ContextMenuLayer extends OsmandMapLayer {
private List<Object> selectedObjects = new ArrayList<Object>(); private List<Object> selectedObjects = new ArrayList<Object>();
private TextView textView; private TextView textView;
private ImageView closeButton;
private DisplayMetrics dm; private DisplayMetrics dm;
private OsmandMapTileView view; private OsmandMapTileView view;
private int BASE_TEXT_SIZE = 170; private int BASE_TEXT_SIZE = 170;
private int SHADOW_OF_LEG = 5; private int SHADOW_OF_LEG = 5;
private int CLOSE_BTN = 3;
private final MapActivity activity; private final MapActivity activity;
private Drawable boxLeg; private Drawable boxLeg;
@ -78,6 +81,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
} }
BASE_TEXT_SIZE = (int) (BASE_TEXT_SIZE * scaleCoefficient); BASE_TEXT_SIZE = (int) (BASE_TEXT_SIZE * scaleCoefficient);
SHADOW_OF_LEG = (int) (SHADOW_OF_LEG * scaleCoefficient); SHADOW_OF_LEG = (int) (SHADOW_OF_LEG * scaleCoefficient);
CLOSE_BTN = (int) (CLOSE_BTN * scaleCoefficient);
boxLeg = view.getResources().getDrawable(R.drawable.box_leg); boxLeg = view.getResources().getDrawable(R.drawable.box_leg);
boxLeg.setBounds(0, 0, boxLeg.getMinimumWidth(), boxLeg.getMinimumHeight()); boxLeg.setBounds(0, 0, boxLeg.getMinimumWidth(), boxLeg.getMinimumHeight());
@ -96,6 +100,12 @@ public class ContextMenuLayer extends OsmandMapLayer {
textView.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free)); textView.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
textPadding = new Rect(); textPadding = new Rect();
textView.getBackground().getPadding(textPadding); textView.getBackground().getPadding(textPadding);
closeButton = new ImageView(view.getContext());
lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
closeButton.setLayoutParams(lp);
closeButton.setImageDrawable(view.getResources().getDrawable(R.drawable.headliner_close));
closeButton.setClickable(true);
} }
@Override @Override
@ -115,6 +125,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
int c = textView.getLineCount(); int c = textView.getLineCount();
textView.draw(canvas); textView.draw(canvas);
canvas.translate(textView.getWidth() - closeButton.getWidth() - CLOSE_BTN, CLOSE_BTN);
closeButton.draw(canvas);
if (c == 0) { if (c == 0) {
// special case relayout after on draw method // special case relayout after on draw method
layoutText(); layoutText();
@ -133,6 +145,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
int h = (int) ((textView.getPaint().getTextSize() + 4) * textView.getLineCount()); int h = (int) ((textView.getPaint().getTextSize() + 4) * textView.getLineCount());
textView.layout(0, -padding.bottom, w, h + padding.top); textView.layout(0, -padding.bottom, w, h + padding.top);
int minw = closeButton.getDrawable().getMinimumWidth();
int minh = closeButton.getDrawable().getMinimumHeight();
closeButton.layout(0, 0, minw, minh);
} }
public void setLocation(LatLon loc, String description){ public void setLocation(LatLon loc, String description){
@ -170,7 +185,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
return true; return true;
} }
if(pressedInTextView(point.x, point.y)){ if(pressedInTextView(point.x, point.y) > 0){
setLocation(null, ""); //$NON-NLS-1$ setLocation(null, ""); //$NON-NLS-1$
view.refreshMap(); view.refreshMap();
return true; return true;
@ -207,18 +222,23 @@ public class ContextMenuLayer extends OsmandMapLayer {
return true; return true;
} }
public boolean pressedInTextView(float px, float py) { public int pressedInTextView(float px, float py) {
if (latLon != null) { if (latLon != null) {
Rect bs = textView.getBackground().getBounds(); Rect bs = textView.getBackground().getBounds();
Rect closes = closeButton.getDrawable().getBounds();
int x = (int) (px - view.getRotatedMapXForPoint(latLon.getLatitude(), latLon.getLongitude())); int x = (int) (px - view.getRotatedMapXForPoint(latLon.getLatitude(), latLon.getLongitude()));
int y = (int) (py - view.getRotatedMapYForPoint(latLon.getLatitude(), latLon.getLongitude())); int y = (int) (py - view.getRotatedMapYForPoint(latLon.getLatitude(), latLon.getLongitude()));
x += bs.width() / 2; x += bs.width() / 2;
y += bs.height() + boxLeg.getMinimumHeight() - SHADOW_OF_LEG; y += bs.height() + boxLeg.getMinimumHeight() - SHADOW_OF_LEG;
if (bs.contains(x, y)) { int dclosex = x - bs.width() + CLOSE_BTN + closes.width();
return true; int dclosey = y + CLOSE_BTN;
if(closes.intersects(dclosex - CLOSE_BTN, dclosey - CLOSE_BTN, dclosex + CLOSE_BTN, dclosey + CLOSE_BTN)) {
return 2;
} else if (bs.contains(x, y)) {
return 1;
} }
} }
return false; return 0;
} }
public String getSelectedObjectName(){ public String getSelectedObjectName(){
@ -250,7 +270,12 @@ public class ContextMenuLayer extends OsmandMapLayer {
@Override @Override
public boolean onSingleTap(PointF point) { public boolean onSingleTap(PointF point) {
boolean nativeMode = view.getSettings().SCROLL_MAP_BY_GESTURES.get(); boolean nativeMode = view.getSettings().SCROLL_MAP_BY_GESTURES.get();
if ((!nativeMode) || pressedInTextView(point.x, point.y)) { int val = pressedInTextView(point.x, point.y);
if (val == 2) {
setLocation(null, ""); //$NON-NLS-1$
view.refreshMap();
return true;
} else if (val == 1 || !nativeMode) {
if (!selectedObjects.isEmpty()) { if (!selectedObjects.isEmpty()) {
showContextMenuForSelectedObjects(); showContextMenuForSelectedObjects();
} else if (nativeMode) { } else if (nativeMode) {
@ -292,9 +317,13 @@ public class ContextMenuLayer extends OsmandMapLayer {
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (latLon != null) { if (latLon != null) {
if (event.getAction() == MotionEvent.ACTION_DOWN) { if (event.getAction() == MotionEvent.ACTION_DOWN) {
if(pressedInTextView(event.getX(), event.getY())){ int vl = pressedInTextView(event.getX(), event.getY());
if(vl == 1){
textView.setPressed(true); textView.setPressed(true);
view.refreshMap(); view.refreshMap();
} else if(vl == 2){
closeButton.setPressed(true);
view.refreshMap();
} }
} }
} }
@ -303,6 +332,10 @@ public class ContextMenuLayer extends OsmandMapLayer {
textView.setPressed(false); textView.setPressed(false);
view.refreshMap(); view.refreshMap();
} }
if(closeButton.isPressed()) {
closeButton.setPressed(false);
view.refreshMap();
}
} }
return false; return false;
} }