Skip to content

Commit

Permalink
Merge pull request #3 from Norkart/shoveExample
Browse files Browse the repository at this point in the history
Added Shove Gesture to example activity
  • Loading branch information
Almeros committed Oct 13, 2013
2 parents 3646c8c + 4525ce2 commit 6e8c46c
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions src/com/almeros/android/multitouch/TouchActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import com.almeros.android.multitouch.gesturedetectors.MoveGestureDetector;
import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
import com.almeros.android.multitouch.gesturedetectors.ShoveGestureDetector;

/**
* Test activity for testing the different GestureDetectors.
Expand All @@ -28,11 +29,13 @@ public class TouchActivity extends Activity implements OnTouchListener {
private float mRotationDegrees = 0.f;
private float mFocusX = 0.f;
private float mFocusY = 0.f;
private int mAlpha = 255;
private int mImageHeight, mImageWidth;

private ScaleGestureDetector mScaleDetector;
private RotateGestureDetector mRotateDetector;
private MoveGestureDetector mMoveDetector;
private ShoveGestureDetector mShoveDetector;

@Override
public void onCreate(Bundle savedInstanceState) {
Expand All @@ -56,12 +59,14 @@ public void onCreate(Bundle savedInstanceState) {
mScaleDetector = new ScaleGestureDetector(getApplicationContext(), new ScaleListener());
mRotateDetector = new RotateGestureDetector(getApplicationContext(), new RotateListener());
mMoveDetector = new MoveGestureDetector(getApplicationContext(), new MoveListener());
mShoveDetector = new ShoveGestureDetector(getApplicationContext(), new ShoveListener());
}

public boolean onTouch(View v, MotionEvent event) {
mScaleDetector.onTouchEvent(event);
mRotateDetector.onTouchEvent(event);
mMoveDetector.onTouchEvent(event);
mShoveDetector.onTouchEvent(event);

float scaledImageCenterX = (mImageWidth*mScaleFactor)/2;
float scaledImageCenterY = (mImageHeight*mScaleFactor)/2;
Expand All @@ -73,6 +78,7 @@ public boolean onTouch(View v, MotionEvent event) {

ImageView view = (ImageView) v;
view.setImageMatrix(mMatrix);
view.setAlpha(mAlpha);

return true; // indicate event was handled
}
Expand Down Expand Up @@ -109,5 +115,18 @@ public boolean onMove(MoveGestureDetector detector) {
return true;
}
}

private class ShoveListener extends ShoveGestureDetector.SimpleOnShoveGestureListener {
@Override
public boolean onShove(ShoveGestureDetector detector) {
mAlpha += detector.getShovePixelsDelta();
if (mAlpha > 255)
mAlpha = 255;
else if (mAlpha < 0)
mAlpha = 0;

return true;
}
}

}

0 comments on commit 6e8c46c

Please sign in to comment.