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

map quick action fab color fix, size change, interpolation

Browse source
This commit is contained in:
Korusn Oleksandr 2017-01-04 18:08:33 +02:00
parent 6690d9d7f7
commit 9404e86f30
2 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/map_hud_quick_actions.xml
View file

@ -9,6 +9,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false"
android:padding="@dimen/map_button_margin"> android:padding="@dimen/map_button_margin">
<ImageButton <ImageButton

34
OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
View file

@ -94,6 +94,9 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
Vibrator vibrator = (Vibrator) mapActivity.getSystemService(Context.VIBRATOR_SERVICE); Vibrator vibrator = (Vibrator) mapActivity.getSystemService(Context.VIBRATOR_SERVICE);
vibrator.vibrate(VIBRATE_SHORT); vibrator.vibrate(VIBRATE_SHORT);
quickActionButton.setScaleX(1.5f);
quickActionButton.setScaleY(1.5f);
quickActionButton.setAlpha(0.95f);
quickActionButton.setOnTouchListener(onQuickActionTouchListener); quickActionButton.setOnTouchListener(onQuickActionTouchListener);
return true; return true;
} }
@ -298,6 +301,10 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
return true; return true;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
quickActionButton.setOnTouchListener(null); quickActionButton.setOnTouchListener(null);
quickActionButton.setPressed(false);
quickActionButton.setScaleX(1);
quickActionButton.setScaleY(1);
quickActionButton.setAlpha(1f);
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams(); FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams();
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) if (AndroidUiHelper.isOrientationPortrait(mapActivity))
settings.setPortraitFabMargin(params.rightMargin, params.bottomMargin); settings.setPortraitFabMargin(params.rightMargin, params.bottomMargin);
@ -308,18 +315,20 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
if (initialMarginX == 0 && initialMarginY == 0 && initialTouchX == 0 && initialTouchY == 0) if (initialMarginX == 0 && initialMarginY == 0 && initialTouchX == 0 && initialTouchY == 0)
setUpInitialValues(v, event); setUpInitialValues(v, event);
int padding = calculateTotalSizePx(R.dimen.map_button_margin);
FrameLayout parent = (FrameLayout) v.getParent();
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) v.getLayoutParams();
int deltaX = (int) (initialTouchX - event.getRawX()); int deltaX = (int) (initialTouchX - event.getRawX());
int deltaY = (int) (initialTouchY - event.getRawY()); int deltaY = (int) (initialTouchY - event.getRawY());
int newMarginX = initialMarginX + deltaX; int newMarginX = interpolate(initialMarginX + deltaX, v.getWidth(), parent.getWidth() - padding * 2);
int newMarginY = initialMarginY + deltaY; int newMarginY = interpolate(initialMarginY + deltaY, v.getHeight(), parent.getHeight() - padding * 2);
FrameLayout parent = (FrameLayout) v.getParent(); if (v.getHeight() + newMarginY <= parent.getHeight() - padding * 2 && newMarginY > 0)
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) v.getLayoutParams();
if (v.getHeight() + newMarginY <= parent.getHeight() && newMarginY > 0)
param.bottomMargin = newMarginY; param.bottomMargin = newMarginY;
if (v.getWidth() + newMarginX <= parent.getWidth() && newMarginX > 0) { if (v.getWidth() + newMarginX <= parent.getWidth() - padding * 2 && newMarginX > 0) {
param.rightMargin = newMarginX; param.rightMargin = newMarginX;
} }
@ -330,6 +339,19 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
return false; return false;
} }
private int interpolate(int value, int divider, int boundsSize) {
int viewSize = divider;
if (value <= divider && value > 0)
return value * value / divider;
else {
int leftMargin = boundsSize - value - viewSize;
if (leftMargin <= divider && value < boundsSize - viewSize)
return leftMargin - (leftMargin * leftMargin / divider) + value;
else
return value;
}
}
private void setUpInitialValues(View v, MotionEvent event) { private void setUpInitialValues(View v, MotionEvent event) {
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams(); FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams();