fixing merge conflicts

okaybroda · May 15, 2017 · e0e930e · e0e930e
2 parents b9d5d5a + c6db3dd
commit e0e930e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ allprojects {
 Then add ImageZoom library
 ```gradle
 dependencies {
-  compile 'com.github.okaybroda:ImageZoom:1.0.6'
+  compile 'com.github.okaybroda:ImageZoom:1.0.7'
 }
 ```
 ## Usage

diff --git a/library/src/main/java/com/viven/imagezoom/ImageZoomHelper.java b/library/src/main/java/com/viven/imagezoom/ImageZoomHelper.java
@@ -33,7 +33,7 @@ public class ImageZoomHelper {
     private double originalDistance;
     private int[] twoPointCenter;
     private int[] originalXY;
-
+    private int pivotX = 0, pivotY = 0;
     private WeakReference<Activity> activityWeakReference;
 
     private boolean isAnimatingDismiss = false;
@@ -151,6 +151,10 @@ public void run() {
                             (int) ((pointerCoords2.y + pointerCoords1.y) / 2)
                     };
 
+                    //storing pivot point for zooming image from its touch coordinates
+                    pivotX = (int)ev.getRawX() - originalXY[0];
+                    pivotY = (int)ev.getRawY() - originalXY[1];
+
                     sendZoomEventToListeners(zoomableView, true);
                     return true;
                 }
@@ -170,6 +174,9 @@ public void run() {
                         pointerCoords1.y, pointerCoords2.y);
                 double pctIncrease = (currentDistance - originalDistance) / originalDistance;
 
+                zoomableView.setPivotX(pivotX);
+                zoomableView.setPivotY(pivotY);
+
                 zoomableView.setScaleX((float) (1 + pctIncrease));
                 zoomableView.setScaleY((float) (1 + pctIncrease));
 
@@ -272,8 +279,6 @@ public void run() {
                     finalZoomView.invalidate();
                 }
             });
-
-            zoomableView = null;
         } else {
             dismissDialog();
         }
@@ -305,6 +310,14 @@ private void dismissDialog() {
         }
 
         darkView = null;
+        resetOriginalViewAfterZoom();
+    }
+
+    private void resetOriginalViewAfterZoom() {
+        if (zoomableView != null) {
+            zoomableView.invalidate();
+            zoomableView = null;
+        }
     }
 
     /**