diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraListener.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraListener.java index fafe244f..c6d9094b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraListener.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraListener.java @@ -168,21 +168,5 @@ public abstract class CameraListener { */ @UiThread public void onShutter() {} - - /** - * Notifies that a finger gesture just triggered a swipe left event. - * This can be used to exchange between different filters or to - * swap between front and back cameras. - */ - @UiThread - public void onSwipeLeft() {} - - /** - * Notifies that a finger gesture just triggered a swipe right event. - * This can be used to exchange between different filters or to - * swap between front and back cameras. - */ - @UiThread - public void onSwipeRight() {} } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 28894132..eb745722 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -152,8 +152,6 @@ public class CameraView extends FrameLayout implements LifecycleObserver { @VisibleForTesting PinchGestureFinder mPinchGestureFinder; @VisibleForTesting TapGestureFinder mTapGestureFinder; @VisibleForTesting ScrollGestureFinder mScrollGestureFinder; - private float x1,x2; - static final int MIN_SWIPE_DISTANCE = 150; // Views @VisibleForTesting GridLinesLayout mGridLinesLayout; @@ -657,22 +655,6 @@ public class CameraView extends FrameLayout implements LifecycleObserver { onGesture(mTapGestureFinder, options); } - if(event.getAction() == MotionEvent.ACTION_DOWN) x1 = event.getX(); - if(event.getAction() == MotionEvent.ACTION_UP) { - x2 = event.getX(); - float deltaX = x2 - x1; - if(deltaX > MIN_SWIPE_DISTANCE) { - for (CameraListener listener : mListeners) { - listener.onSwipeRight(); - } - } - if (deltaX < MIN_SWIPE_DISTANCE) { - for (CameraListener listener : mListeners) { - listener.onSwipeLeft(); - } - } - } - return true; } @@ -2250,9 +2232,14 @@ public class CameraView extends FrameLayout implements LifecycleObserver { if (shouldPlaySound && mPlaySounds) { playSound(MediaActionSound.SHUTTER_CLICK); } - for (CameraListener listener : mListeners) { - listener.onShutter(); - } + mUiHandler.post(new Runnable() { + @Override + public void run() { + for (CameraListener listener : mListeners) { + listener.onShutter(); + } + } + }); } @Override diff --git a/cameraview/src/main/res/values/attrs.xml b/cameraview/src/main/res/values/attrs.xml index fb6bc1b7..9a27f115 100644 --- a/cameraview/src/main/res/values/attrs.xml +++ b/cameraview/src/main/res/values/attrs.xml @@ -40,36 +40,38 @@ + + - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/demo/src/main/kotlin/com/otaliastudios/cameraview/demo/CameraActivity.kt b/demo/src/main/kotlin/com/otaliastudios/cameraview/demo/CameraActivity.kt index 282edcc2..5c5311ce 100644 --- a/demo/src/main/kotlin/com/otaliastudios/cameraview/demo/CameraActivity.kt +++ b/demo/src/main/kotlin/com/otaliastudios/cameraview/demo/CameraActivity.kt @@ -221,21 +221,6 @@ class CameraActivity : AppCompatActivity(), View.OnClickListener, OptionView.Cal super.onZoomChanged(newValue, bounds, fingers) message("Zoom:$newValue", false) } - - override fun onShutter() { - super.onShutter() - LOG.w("Shutter Triggered!") - } - - override fun onSwipeLeft() { - super.onSwipeLeft() - LOG.w("Swipe Left!") - } - - override fun onSwipeRight() { - super.onSwipeRight() - LOG.w("Swipe Right!") - } } override fun onClick(view: View) {