Merge branch 'owurman-tapListener'

Author: barteksc

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/DragPinchManager.java

@@ -22,6 +22,7 @@
 import android.view.View;
 
 import com.github.barteksc.pdfviewer.scroll.ScrollHandle;
+import com.github.barteksc.pdfviewer.listener.OnTapListener;
 
 import static com.github.barteksc.pdfviewer.util.Constants.Pinch.MAXIMUM_ZOOM;
 import static com.github.barteksc.pdfviewer.util.Constants.Pinch.MINIMUM_ZOOM;
@@ -81,12 +82,15 @@ public void setSwipeVertical(boolean swipeVertical) {
 
     @Override
     public boolean onSingleTapConfirmed(MotionEvent e) {
-        ScrollHandle ps = pdfView.getScrollHandle();
-        if (ps != null && !pdfView.documentFitsView()) {
-            if (!ps.shown()) {
-                ps.show();
-            } else {
-                ps.hide();
+        OnTapListener onTapListener = pdfView.getOnTapListener();
+        if (onTapListener == null || !onTapListener.onTap(e)) {
+            ScrollHandle ps = pdfView.getScrollHandle();
+            if (ps != null && !pdfView.documentFitsView()) {
+                if (!ps.shown()) {
+                    ps.show();
+                } else {
+                    ps.hide();
+                }
             }
         }
         pdfView.performClick();

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java

@@ -39,6 +39,7 @@
 import com.github.barteksc.pdfviewer.listener.OnPageChangeListener;
 import com.github.barteksc.pdfviewer.listener.OnPageScrollListener;
 import com.github.barteksc.pdfviewer.listener.OnRenderListener;
+import com.github.barteksc.pdfviewer.listener.OnTapListener;
 import com.github.barteksc.pdfviewer.model.PagePart;
 import com.github.barteksc.pdfviewer.scroll.ScrollHandle;
 import com.github.barteksc.pdfviewer.source.AssetSource;
@@ -232,6 +233,11 @@ enum ScrollDir {
      */
     private OnRenderListener onRenderListener;
 
+    /**
+     * Call back object to call when the user does a tap gesture
+     */
+    private OnTapListener onTapListener;
+
     /**
      * Paint object for drawing
      */
@@ -505,6 +511,14 @@ OnRenderListener getOnRenderListener() {
         return this.onRenderListener;
     }
 
+    private void setOnTapListener(OnTapListener onTapListener) {
+        this.onTapListener = onTapListener;
+    }
+
+    OnTapListener getOnTapListener() {
+        return this.onTapListener;
+    }
+
     private void setOnDrawListener(OnDrawListener onDrawListener) {
         this.onDrawListener = onDrawListener;
     }
@@ -1343,6 +1357,8 @@ public class Configurator {
 
         private OnRenderListener onRenderListener;
 
+        private OnTapListener onTapListener;
+
         private int defaultPage = 0;
 
         private boolean swipeHorizontal = false;
@@ -1416,6 +1432,11 @@ public Configurator onRender(OnRenderListener onRenderListener) {
             return this;
         }
 
+        public Configurator onTap(OnTapListener onTapListener) {
+            this.onTapListener = onTapListener;
+            return this;
+        }
+
         public Configurator defaultPage(int defaultPage) {
             this.defaultPage = defaultPage;
             return this;
@@ -1453,6 +1474,7 @@ public void load() {
             PDFView.this.setOnPageChangeListener(onPageChangeListener);
             PDFView.this.setOnPageScrollListener(onPageScrollListener);
             PDFView.this.setOnRenderListener(onRenderListener);
+            PDFView.this.setOnTapListener(onTapListener);
             PDFView.this.enableSwipe(enableSwipe);
             PDFView.this.enableDoubletap(enableDoubletap);
             PDFView.this.setDefaultPage(defaultPage);

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/OnTapListener.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2017 Bartosz Schiller
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.barteksc.pdfviewer.listener;
+
+import android.view.MotionEvent;
+
+/**
+ * Implement this interface to receive events from PDFView
+ * when view has been touched
+ */
+public interface OnTapListener {
+
+    /**
+     * Called when the user has a tap gesture, before processing scroll handle toggling
+     *
+     * @param e MotionEvent that registered as a confirmed single tap
+     * @return true if the single tap was handled, false to toggle scroll handle
+     */
+    boolean onTap(MotionEvent e);
+}