combine side tapping and multitouch zoom

2 files changed, 14 insertions, 6 deletions

diff --git a/src/org/fox/ttcomics/ComicFragment.java b/src/org/fox/ttcomics/ComicFragment.java
index f064397..4acd732 100644
--- a/src/org/fox/ttcomics/ComicFragment.java
+++ b/src/org/fox/ttcomics/ComicFragment.java
@@ -93,7 +93,7 @@ public class ComicFragment extends Fragment {
 				}

 			});

 

-			image.setOnTouchListener(new View.OnTouchListener() {

+			image.setCustomOnTouchListener(new View.OnTouchListener() {

 				int m_x;

 				int m_y;

 

@@ -116,11 +116,9 @@ public class ComicFragment extends Fragment {
 							} else if (x >= width-(width/6)) {

 								onRightSideTapped();

 							}

-						}

-						

+						}						

 						break;

-					}

-					

+					}					

 					return false;

 				}

 			});

diff --git a/src/org/fox/ttcomics/TouchImageView.java b/src/org/fox/ttcomics/TouchImageView.java
index 5390216..9a9efe6 100644
--- a/src/org/fox/ttcomics/TouchImageView.java
+++ b/src/org/fox/ttcomics/TouchImageView.java
@@ -26,6 +26,7 @@ public class TouchImageView extends ImageView {
 	}

 	

 	OnScaleChangedListener mScaleChangedListener;

+	View.OnTouchListener mCustomOnTouchListener;

 	

     Matrix matrix = new Matrix();

 

@@ -73,7 +74,7 @@ public class TouchImageView extends ImageView {
         setScaleType(ScaleType.MATRIX);

         

         setOnTouchListener(new OnTouchListener() {

-

+        	@Override

         	public boolean onTouch(View v, MotionEvent event) {

             	mScaleDetector.onTouchEvent(event);

 

@@ -136,6 +137,11 @@ public class TouchImageView extends ImageView {
             	}

                 setImageMatrix(matrix);

                 invalidate();

+                

+                if (mCustomOnTouchListener != null) {

+                	mCustomOnTouchListener.onTouch(v, event);

+                }

+                

                 return true; // indicate event was handled

             }

 

@@ -256,4 +262,8 @@ public class TouchImageView extends ImageView {
     public void setOnScaleChangedListener(OnScaleChangedListener listener) {

     	mScaleChangedListener = listener;

     }

+    

+    public void setCustomOnTouchListener(View.OnTouchListener listener) {

+    	mCustomOnTouchListener = listener;

+    }

 }