From 69a621963490dee51552ffe687a5eee9e853abae Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Sat, 4 Apr 2020 11:57:15 -0400
Subject: [PATCH] remove concept of zoom steps from API

---
 .../grapheneos/pdfviewer/GestureHelper.java   |  8 ++++----
 .../org/grapheneos/pdfviewer/PdfViewer.java   | 20 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java b/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java
index 5241565..5e623d7 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/GestureHelper.java
@@ -15,8 +15,8 @@ class GestureHelper {
     public interface GestureListener {
         boolean onTapUp();
         // Can be replaced with ratio when supported
-        void onZoomIn(int steps);
-        void onZoomOut(int steps);
+        void onZoomIn(float value);
+        void onZoomOut(float value);
         void onZoomEnd();
     }
 
@@ -52,9 +52,9 @@ class GestureHelper {
                         if (curNbStep != prevNbStep) {
                             int stepDiff = curNbStep - prevNbStep;
                             if (stepDiff > 0) {
-                                listener.onZoomOut(stepDiff);
+                                listener.onZoomOut(stepDiff * 0.25f);
                             } else {
-                                listener.onZoomIn(Math.abs(stepDiff));
+                                listener.onZoomIn(Math.abs(stepDiff * 0.25f));
                             }
                             prevNbStep = curNbStep;
                         }
diff --git a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
index 08cfa10..566ae51 100644
--- a/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
+++ b/app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
@@ -253,13 +253,13 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
                     }
 
                     @Override
-                    public void onZoomIn(int steps) {
-                        zoomIn(steps);
+                    public void onZoomIn(float value) {
+                        zoomIn(value);
                     }
 
                     @Override
-                    public void onZoomOut(int steps) {
-                        zoomOut(steps);
+                    public void onZoomOut(float value) {
+                        zoomOut(value);
                     }
 
                     @Override
@@ -349,17 +349,17 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
         startActivityForResult(intent, ACTION_OPEN_DOCUMENT_REQUEST_CODE);
     }
 
-    private void zoomIn(int steps) {
+    private void zoomIn(float value) {
         if (mZoomRatio < MAX_ZOOM_RATIO) {
-            mZoomRatio += 0.25f * steps;
+            mZoomRatio += value;
             renderPage(true);
             invalidateOptionsMenu();
         }
     }
 
-    private void zoomOut(int steps) {
+    private void zoomOut(float value) {
         if (mZoomRatio > MIN_ZOOM_RATIO) {
-            mZoomRatio -= 0.25f * steps;
+            mZoomRatio -= value;
             renderPage(true);
             invalidateOptionsMenu();
         }
@@ -503,11 +503,11 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
                 return super.onOptionsItemSelected(item);
 
             case R.id.action_zoom_out:
-                zoomOut(1);
+                zoomOut(0.25f);
                 return true;
 
             case R.id.action_zoom_in:
-                zoomIn(1);
+                zoomIn(0.25f);
                 return true;
 
             case R.id.action_rotate_clockwise: