Merge pull request nickbutcher#97 from wasdennnoch/master

Fix FabTransform circular reveal calculation
liuhuibin · Jul 5, 2016 · 434be26 · 434be26
2 parents 77ce671 + 5fded59
commit 434be26
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/io/plaidapp/ui/transitions/FabTransform.java b/app/src/main/java/io/plaidapp/ui/transitions/FabTransform.java
@@ -198,14 +198,14 @@ public Animator createAnimator(final ViewGroup sceneRoot,
                     view.getWidth() / 2,
                     view.getHeight() / 2,
                     startBounds.width() / 2,
-                    (float) Math.hypot(endBounds.width() / 2, endBounds.width() / 2));
+                    (float) Math.hypot(endBounds.width() / 2, endBounds.height() / 2));
             circularReveal.setInterpolator(
                     AnimUtils.getFastOutLinearInInterpolator(sceneRoot.getContext()));
         } else {
             circularReveal = ViewAnimationUtils.createCircularReveal(view,
                     view.getWidth() / 2,
                     view.getHeight() / 2,
-                    (float) Math.hypot(startBounds.width() / 2, startBounds.width() / 2),
+                    (float) Math.hypot(startBounds.width() / 2, startBounds.height() / 2),
                     endBounds.width() / 2);
             circularReveal.setInterpolator(
                     AnimUtils.getLinearOutSlowInInterpolator(sceneRoot.getContext()));