Merge pull request #514 from MikeOrtiz/zoom

Revert "SetZoom update the method to calculate the trans"
MikeOrtiz · Jan 23, 2023 · 5b6f2cf · 5b6f2cf
2 parents 2796c2d + 5bbcb08
commit 5b6f2cf
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/app/src/androidTest/java/info/touchimage/demo/MainSmokeTest.kt b/app/src/androidTest/java/info/touchimage/demo/MainSmokeTest.kt
@@ -100,6 +100,7 @@ class MainSmokeTest {
     fun testChangeSize() {
         Espresso.onView(withId(R.id.resize_button)).perform(ViewActions.click())
         Intents.intended(hasComponent(ChangeSizeExampleActivity::class.java.name))
+        Thread.sleep(500)
         Espresso.onView(isRoot())
             .captureToBitmap()
             .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")

diff --git a/app/src/androidTest/java/info/touchimage/demo/TouchTest.kt b/app/src/androidTest/java/info/touchimage/demo/TouchTest.kt
@@ -32,7 +32,7 @@ class TouchTest {
             .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-touch1")
         onView(withId(R.id.imageSingle)).perform(TouchAction(40f, 80f))
         Thread.sleep(300)
-        takeScreenshot()
+        onView(withId(R.id.imageSingle)).captureToBitmap()
             .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-touch2")
     }
 

diff --git a/screenshotsToCompare/MainSmokeTest_testAnimateZoom.png b/screenshotsToCompare/MainSmokeTest_testAnimateZoom.png
diff --git a/screenshotsToCompare/TouchTest_testSingleTouch-touch2.png b/screenshotsToCompare/TouchTest_testSingleTouch-touch2.png
diff --git a/screenshotsToCompare/ZoomTest_zoom-1-init.png b/screenshotsToCompare/ZoomTest_zoom-1-init.png
diff --git a/screenshotsToCompare/ZoomTest_zoom-3-zoom.png b/screenshotsToCompare/ZoomTest_zoom-3-zoom.png
diff --git a/touchview/src/main/java/com/ortiz/touchview/TouchImageView.kt b/touchview/src/main/java/com/ortiz/touchview/TouchImageView.kt
@@ -394,8 +394,8 @@ open class TouchImageView @JvmOverloads constructor(context: Context, attrs: Att
         resetZoom()
         scaleImage(scale.toDouble(), viewWidth / 2.toFloat(), viewHeight / 2.toFloat(), true)
         touchMatrix.getValues(floatMatrix)
-        floatMatrix[Matrix.MTRANS_X] = (viewWidth - matchViewWidth) / 2 - focusX * (scale - 1) * matchViewWidth
-        floatMatrix[Matrix.MTRANS_Y] = (viewHeight - matchViewHeight) / 2 - focusY * (scale - 1) * matchViewHeight
+        floatMatrix[Matrix.MTRANS_X] = -(focusX * imageWidth - viewWidth * 0.5f)
+        floatMatrix[Matrix.MTRANS_Y] = -(focusY * imageHeight - viewHeight * 0.5f)
         touchMatrix.setValues(floatMatrix)
         fixTrans()
         savePreviousImageValues()