From b7d8dc2d2c68c682931c705b3a5cb6cec50870aa Mon Sep 17 00:00:00 2001
From: Trevin Avery <TrevinAvery@gmail.com>
Date: Fri, 14 Dec 2018 12:36:03 -0700
Subject: [PATCH] Fixed shared element transition. The onMeasure() function was
 fitting the image to the view by adding a runnable to the message queue. It
 did this to avoid calculating the image size multiple times as onMeasure() is
 typically called multiple times. However, when using a shared element
 transition, the snapshot was always taken before the message queue reached
 this runnable, so at the time of snapshot, the image size was always 0. This
 caused the image to shrink until it was gone, and then reappear after a new
 touch event. I overrode onSizeChanged(), which immediately after the last
 onMeasure() is called, and moved the content of the runnable to this
 function. It now works perfectly. Fingers crossed.

---
 .../com/ortiz/touchview/TouchImageView.java   | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/touchview/src/main/java/com/ortiz/touchview/TouchImageView.java b/touchview/src/main/java/com/ortiz/touchview/TouchImageView.java
index 382972dd..99bf7352 100644
--- a/touchview/src/main/java/com/ortiz/touchview/TouchImageView.java
+++ b/touchview/src/main/java/com/ortiz/touchview/TouchImageView.java
@@ -651,6 +651,11 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         // Set view dimensions
         //
         setMeasuredDimension(width, height);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
 
         //
         // Fit content within view.
@@ -662,25 +667,18 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         // widthMeasureSpec == "EXACTLY 1404", then back and forth multiple times in quick
         // succession, as the ConstraintLayout tries to solve its constraints.
         //
-        // So we make all changes to class members, such as fitting the image into the new shape of
-        // the TouchImageView, after the final size has been determined. This helps us avoid both
+        // onSizeChanged is called once after the final onMeasure is called. So we make all changes
+        // to class members, such as fitting the image into the new shape of the TouchImageView,
+        // here, after the final size has been determined. This helps us avoid both
         // repeated computations, and making irreversible changes (e.g. making the View temporarily too
         // big or too small, thus making the current zoom fall outside of an automatically-changing
         // minZoom and maxZoom).
         //
-        removeCallbacks(processFinalViewSize);
-        post(processFinalViewSize);
+        viewWidth = w;
+        viewHeight = h;
+        fitImageToView();
     }
 
-    private Runnable processFinalViewSize = new Runnable() {
-        @Override
-        public void run() {
-            viewWidth = getMeasuredWidth();
-            viewHeight = getMeasuredHeight();
-            fitImageToView();
-        }
-    };
-
     /**
      * This function can be called:
      * 1. When the TouchImageView is first loaded (onMeasure).
@@ -779,12 +777,12 @@ private void fitImageToView() {
             // to NaN in newTranslationAfterChange. To avoid this, call savePreviousImageValues
             // to set them equal to the current values.
             //
-        	if (prevMatchViewWidth == 0 || prevMatchViewHeight == 0) {
+            if (prevMatchViewWidth == 0 || prevMatchViewHeight == 0) {
                 savePreviousImageValues();
-        	}
+            }
 
-        	//
-        	// Use the previous matrix as our starting point for the new matrix.
+            //
+            // Use the previous matrix as our starting point for the new matrix.
             //
             prevMatrix.getValues(m);