- added possibility to use OnViewTapListener which ignores loaded photo

bounds and processed touches from whole the view

Author: httpdispatch

library/src/uk/co/senab/photoview/PhotoView.java

@@ -17,6 +17,7 @@
 
 import uk.co.senab.photoview.PhotoViewAttacher.OnMatrixChangedListener;
 import uk.co.senab.photoview.PhotoViewAttacher.OnPhotoTapListener;
+import uk.co.senab.photoview.PhotoViewAttacher.OnViewTapListener;
 import android.content.Context;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
@@ -121,6 +122,18 @@ public void setOnPhotoTapListener(OnPhotoTapListener listener) {
 		mAttacher.setOnPhotoTapListener(listener);
 	}
 
+	/**
+	 * Register a callback to be invoked when the View
+	 * is tapped with a single tap.
+	 * 
+	 * @param listener
+	 *            - Listener to be registered.
+	 */
+	public void setOnViewTapListener(OnViewTapListener listener)
+	{
+		mAttacher.setOnPhotoTapListener(listener);
+	}
+
 	@Override
 	public void setScaleType(ScaleType scaleType) {
 		mAttacher.setScaleType(scaleType);

library/src/uk/co/senab/photoview/PhotoViewAttacher.java

@@ -15,6 +15,7 @@
  *******************************************************************************/
 package uk.co.senab.photoview;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.Matrix.ScaleToFit;
@@ -77,6 +78,30 @@ public static interface OnPhotoTapListener {
 		void onPhotoTap(View view, float x, float y);
 	}
 
+	/**
+	 * Interface definition for a callback to be invoked when the ImageView is
+	 * tapped with a single tap.
+	 * 
+	 * @author Chris Banes
+	 */
+	public static interface OnViewTapListener
+	{
+
+		/**
+		 * A callback to receive where the user taps on a ImageView. You will
+		 * receive a callback if the user taps anywhere on the view, tapping on
+		 * 'whitespace' will not be ignored.
+		 * 
+		 * @param view
+		 *            - View the user tapped
+		 * @param x
+		 *            - where the user tapped from the left
+		 * @param y
+		 *            - where the user tapped from the top
+		 */
+		void onViewTap(View view, float x, float y);
+	}
+
 	private class FlingRunnable implements Runnable {
 
 		private final ScrollerProxy mScroller;
@@ -236,6 +261,7 @@ private static boolean isSupportedScaleType(final ScaleType scaleType) {
 	// Listeners
 	private OnMatrixChangedListener mMatrixChangeListener;
 	private OnPhotoTapListener mPhotoTapListener;
+	private OnViewTapListener mViewTapListener;
 
 	// Saves us allocating a new float[] when getValue is called
 	private final float[] mMatrixValues = new float[9];
@@ -296,6 +322,7 @@ public final void cleanup() {
 		// Clear listeners too
 		mMatrixChangeListener = null;
 		mPhotoTapListener = null;
+		mViewTapListener = null;
 	}
 
 	/**
@@ -449,6 +476,10 @@ public final boolean onSingleTapConfirmed(MotionEvent e) {
 				}
 			}
 		}
+		if (null != mViewTapListener)
+		{
+			mViewTapListener.onViewTap(mImageView, e.getX(), e.getY());
+		}
 
 		return false;
 	}
@@ -535,6 +566,18 @@ public final void setOnPhotoTapListener(OnPhotoTapListener listener) {
 		mPhotoTapListener = listener;
 	}
 
+	/**
+	 * Register a callback to be invoked when the View
+	 * is tapped with a single tap.
+	 * 
+	 * @param listener
+	 *            - Listener to be registered.
+	 */
+	public final void setOnPhotoTapListener(OnViewTapListener listener)
+	{
+		mViewTapListener = listener;
+	}
+
 	/**
 	 * Allows you to enable/disable the zoom functionality on the ImageView.
 	 * When disable the ImageView reverts to using the FIT_CENTER matrix.