Skip to content
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

Jump to bottom

Added in swipe gestures to navigate pages #383

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added in swipe gestures to navigate pages #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3cc174
Added in swipe to change pdf page.
Aug 15, 2024
30f9613
Removed unnecessary log message.
Aug 15, 2024
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
18 changes: 17 additions & 1 deletion app/src/main/java/app/grapheneos/pdfviewer/GestureHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@
import android.view.ScaleGestureDetector;
import android.view.View;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

/*
The GestureHelper present a simple gesture api for the PdfViewer
*/

class GestureHelper {
public interface GestureListener {
boolean onTapUp();
boolean onFling(@Nullable MotionEvent e1, @NonNull MotionEvent e2, float velocityX, float velocityY);
boolean onDown();
// Can be replaced with ratio when supported
void onZoomIn(float value);
void onZoomOut(float value);
Expand All @@ -26,9 +31,20 @@ static void attach(Context context, View gestureView, GestureListener listener)
final GestureDetector detector = new GestureDetector(context,
new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onSingleTapUp(MotionEvent motionEvent) {
public boolean onSingleTapUp(@NonNull MotionEvent motionEvent) {
return listener.onTapUp();
}

@Override
public boolean onFling(@Nullable MotionEvent e1, @NonNull MotionEvent e2, float velocityX, float velocityY) {
return listener.onFling(e1, e2, velocityX, velocityY);
}

@Override
public boolean onDown(@NonNull MotionEvent motionEvent){
return listener.onDown();
}

});

final ScaleGestureDetector scaleDetector = new ScaleGestureDetector(context,
Expand Down
31 changes: 31 additions & 0 deletions app/src/main/java/app/grapheneos/pdfviewer/PdfViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.CookieManager;
Expand All @@ -28,6 +29,7 @@
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
Expand Down Expand Up @@ -362,6 +364,35 @@ public boolean onTapUp() {
return false;
}

// investigate more into the onFlight method for gestures in android. The interface will also be required to link in with the listener and gestures
@Override
public boolean onFling(@Nullable MotionEvent e1, @NonNull MotionEvent e2, float velocityX, float velocityY) {
float deltaX = e2.getX() - e1.getX();
float deltaY = e2.getY() - e1.getY();

if (Math.abs(deltaX) > Math.abs(deltaY)){
if (deltaX > 0) {
Log.d("Horizontal", "Right movement Position");
onJumpToPageInDocument(mPage - 1);
} else {
Log.d("Horizontal", "Left movement Position");
onJumpToPageInDocument(mPage + 1);
}
} else {
if (deltaY > 0) {
Log.d("Vertical", "Down movement Position");
} else {
Log.d("Horizontal", "Up movement Position");
}
}
return true;
}

@Override
public boolean onDown() {
return true;
}

@Override
public void onZoomIn(float value) {
zoomIn(value, false);
Expand Down