Skip to content

Fix triggering of single/double tap action when performing system navigation gesture #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix triggering of single/double tap action when performing system navigation gesture #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/org/quantumbadger/redreader/views/imageview/BasicGestureHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void onFingersMoved() {
}

@Override
public void onFingerUp(final FingerTracker.Finger finger) {
public void onFingerUp(final FingerTracker.Finger finger, final boolean cancelled) {

mCurrentFingerCount--;

Expand All @@ -80,7 +80,8 @@ public void onFingerUp(final FingerTracker.Finger finger) {
mListener.onHorizontalSwipeEnd();

// TODO
if(mFirstFinger.mDownDuration < 300
if(!cancelled
&& mFirstFinger.mDownDuration < 300
&& mFirstFinger.mPosDifference.x < 20
&& mFirstFinger.mPosDifference.y < 20) {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/quantumbadger/redreader/views/imageview/FingerTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface FingerListener {

void onFingersMoved();

void onFingerUp(Finger finger);
void onFingerUp(Finger finger, boolean cancelled);
}

private final Finger[] mFingers = new Finger[10];
Expand Down Expand Up @@ -85,7 +85,7 @@ public void onTouchEvent(final MotionEvent event) {
for(final Finger f : mFingers) {
if(f.mActive && f.mAndroidId == id) {
f.onUp(event);
mListener.onFingerUp(f);
mListener.onFingerUp(f, false);
break;
}
}
Expand All @@ -101,7 +101,7 @@ public void onTouchEvent(final MotionEvent event) {
for(final Finger f : mFingers) {
if(f.mActive) {
f.onUp(event);
mListener.onFingerUp(f);
mListener.onFingerUp(f, true);
}
}

Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/quantumbadger/redreader/views/imageview/ImageViewDisplayListManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,10 @@ public synchronized void onFingersMoved() {
}

@Override
public synchronized void onFingerUp(final FingerTracker.Finger finger) {
public synchronized void onFingerUp(
final FingerTracker.Finger finger,
final boolean cancelled
) {

if(mScrollbars == null) {
return;
Expand All @@ -498,7 +501,7 @@ public synchronized void onFingerUp(final FingerTracker.Finger finger) {

case DOUBLE_TAP_ONE_FINGER_DOWN:

if(finger.mDownDuration < TAP_MAX_DURATION_MS) {
if(!cancelled && finger.mDownDuration < TAP_MAX_DURATION_MS) {
onDoubleTap(finger.mCurrentPos);
}

Expand All @@ -508,7 +511,7 @@ public synchronized void onFingerUp(final FingerTracker.Finger finger) {

case ONE_FINGER_DOWN:

if(finger.mDownDuration < TAP_MAX_DURATION_MS) {
if(!cancelled && finger.mDownDuration < TAP_MAX_DURATION_MS) {

// Maybe a single tap
mDoubleTapGapTimer.startTimer();
Expand Down