use onSingleTapUp to switch pages faster

2 files changed, 56 insertions, 56 deletions

diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 9929e6e..3905efa 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="org.fox.ttcomics2"

-    android:versionCode="80"

-    android:versionName="1.38" >

+    android:versionCode="81"

+    android:versionName="1.39" >

 

     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
index 8a77f84..4a0eef5 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;

 import android.preference.PreferenceManager;

 import android.support.v7.app.ActionBar;

+import android.util.Log;

 import android.view.GestureDetector;

 import android.view.LayoutInflater;

 import android.view.MotionEvent;

@@ -22,7 +23,7 @@ import java.io.IOException;
 import icepick.State;

 import it.sephiroth.android.library.imagezoom.ImageViewTouch;

 

-public class ComicFragment extends StateSavedFragment implements GestureDetector.OnDoubleTapListener {

+public class ComicFragment extends StateSavedFragment {

 	private final String TAG = this.getClass().getSimpleName();

 	

 	private SharedPreferences m_prefs;

@@ -93,16 +94,6 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 		}

 	}

 

-	/*public boolean canScroll(int direction) {

-		ImageViewTouch image = getView().findViewById(R.id.comic_image);

-		

-		if (image != null) {

-			return image.canScroll(direction);

-		} else {

-			return false;

-		}

-	}*/

-	

 	private void onRightSideTapped() {

 		ImageViewTouch image = getView().findViewById(R.id.comic_image);

 		

@@ -133,7 +124,19 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 			

 			@Override

 			public boolean onSingleTapUp(MotionEvent e) {

-				// TODO Auto-generated method stub

+				int width = getView().getWidth();

+				int x = Math.round(e.getX());

+

+				if (x <= width/10) {

+					onLeftSideTapped();

+

+					return true;

+				} else if (x >= width-(width/10)) {

+					onRightSideTapped();

+

+					return true;

+				}

+

 				return false;

 			}

 			

@@ -169,56 +172,53 @@ public class ComicFragment extends StateSavedFragment implements GestureDetector
 				return false;

 			}

 		});

-		

-		m_detector.setOnDoubleTapListener(this);

-	}

-	

-	@Override

-	public boolean onDoubleTap(MotionEvent e) {

-		// TODO Auto-generated method stub

-		return false;

-	}

 

-	@Override

-	public boolean onDoubleTapEvent(MotionEvent e) {

-		// TODO Auto-generated method stub

-		return false;

-	}

+		m_detector.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {

+			@Override

+			public boolean onSingleTapConfirmed(MotionEvent e) {

 

-	@Override

-	public boolean onSingleTapConfirmed(MotionEvent e) {

-		

-		int width = getView().getWidth();

-		

-		int x = Math.round(e.getX());

-		

-		if (x <= width/10) {

-			onLeftSideTapped();

-		} else if (x >= width-(width/10)) {

-			onRightSideTapped();

-		} else {

-			ActionBar bar = m_activity.getSupportActionBar();

-			

-			if (bar.isShowing()) {

-				bar.hide();

-                m_activity.hideSeekBar(true);

+				int width = getView().getWidth();

+				int x = Math.round(e.getX());

+				boolean fullScreenMode = m_prefs.getBoolean("use_full_screen", false);

+

+				if (x > width/10 && x < width-(width/10)) {

+					ActionBar bar = m_activity.getSupportActionBar();

 

-                if (m_prefs.getBoolean("use_full_screen", false)) {

-                    m_activity.hideSystemUI(true);

-                }

+					if (bar.isShowing()) {

+						bar.hide();

+						m_activity.hideSeekBar(true);

 

-			} else {

-                m_activity.hideSeekBar(false);

+						if (fullScreenMode) {

+							m_activity.hideSystemUI(true);

+						}

 

-                if (m_prefs.getBoolean("use_full_screen", false)) {

-                    m_activity.hideSystemUI(false);

-                }

+					} else {

+						m_activity.hideSeekBar(false);

 

-				bar.show();

+						if (fullScreenMode) {

+							m_activity.hideSystemUI(false);

+						}

+

+						bar.show();

+					}

+

+					return true;

+				}

+

+				return false;

 			}

-		}

 

-		return false;

+			@Override

+			public boolean onDoubleTap(MotionEvent e) {

+				return false;

+			}

+

+			@Override

+			public boolean onDoubleTapEvent(MotionEvent e) {

+				return false;

+			}

+		});

+

 	}

 

 }