hardcoresushi
/
libpdfviewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

remove concept of zoom steps from API

This commit is contained in:
Daniel Micay 2020-04-04 11:57:15 -04:00
parent 0f05f9e1f4
commit 69a6219634
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java
View File

@ -15,8 +15,8 @@ class GestureHelper {
public interface GestureListener { public interface GestureListener {
boolean onTapUp(); boolean onTapUp();
// Can be replaced with ratio when supported // Can be replaced with ratio when supported
void onZoomIn(int steps); void onZoomIn(float value);
void onZoomOut(int steps); void onZoomOut(float value);
void onZoomEnd(); void onZoomEnd();
} }
@ -52,9 +52,9 @@ class GestureHelper {
if (curNbStep != prevNbStep) { if (curNbStep != prevNbStep) {
int stepDiff = curNbStep - prevNbStep; int stepDiff = curNbStep - prevNbStep;
if (stepDiff > 0) { if (stepDiff > 0) {
listener.onZoomOut(stepDiff); listener.onZoomOut(stepDiff * 0.25f);
} else { } else {
listener.onZoomIn(Math.abs(stepDiff)); listener.onZoomIn(Math.abs(stepDiff * 0.25f));
} }
prevNbStep = curNbStep; prevNbStep = curNbStep;
} }

20
app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
View File

@ -253,13 +253,13 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
} }
@Override @Override
public void onZoomIn(int steps) { public void onZoomIn(float value) {
zoomIn(steps); zoomIn(value);
} }
@Override @Override
public void onZoomOut(int steps) { public void onZoomOut(float value) {
zoomOut(steps); zoomOut(value);
} }
@Override @Override
@ -349,17 +349,17 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
startActivityForResult(intent, ACTION_OPEN_DOCUMENT_REQUEST_CODE); startActivityForResult(intent, ACTION_OPEN_DOCUMENT_REQUEST_CODE);
} }
private void zoomIn(int steps) { private void zoomIn(float value) {
if (mZoomRatio < MAX_ZOOM_RATIO) { if (mZoomRatio < MAX_ZOOM_RATIO) {
mZoomRatio += 0.25f * steps; mZoomRatio += value;
renderPage(true); renderPage(true);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }
} }
private void zoomOut(int steps) { private void zoomOut(float value) {
if (mZoomRatio > MIN_ZOOM_RATIO) { if (mZoomRatio > MIN_ZOOM_RATIO) {
mZoomRatio -= 0.25f * steps; mZoomRatio -= value;
renderPage(true); renderPage(true);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }
@ -503,11 +503,11 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
case R.id.action_zoom_out: case R.id.action_zoom_out:
zoomOut(1); zoomOut(0.25f);
return true; return true;
case R.id.action_zoom_in: case R.id.action_zoom_in:
zoomIn(1); zoomIn(0.25f);
return true; return true;
case R.id.action_rotate_clockwise: case R.id.action_rotate_clockwise: