From cca38ac76b46eebf9b3ac783384f6ced1aa2defc Mon Sep 17 00:00:00 2001 From: Jesse A Date: Wed, 16 Aug 2017 21:50:00 +1000 Subject: [PATCH] Fix few animations reseting already rotated views --- .../androidanimations/library/attention/SwingAnimator.java | 2 +- .../androidanimations/library/attention/TadaAnimator.java | 2 +- .../androidanimations/library/attention/WaveAnimator.java | 2 +- .../androidanimations/library/attention/WobbleAnimator.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 library/src/main/java/com/daimajia/androidanimations/library/attention/SwingAnimator.java mode change 100644 => 100755 library/src/main/java/com/daimajia/androidanimations/library/attention/TadaAnimator.java mode change 100644 => 100755 library/src/main/java/com/daimajia/androidanimations/library/attention/WaveAnimator.java mode change 100644 => 100755 library/src/main/java/com/daimajia/androidanimations/library/attention/WobbleAnimator.java diff --git a/library/src/main/java/com/daimajia/androidanimations/library/attention/SwingAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/attention/SwingAnimator.java old mode 100644 new mode 100755 index 8c772cb..937e6e6 --- a/library/src/main/java/com/daimajia/androidanimations/library/attention/SwingAnimator.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/attention/SwingAnimator.java @@ -33,7 +33,7 @@ public class SwingAnimator extends BaseViewAnimator { @Override public void prepare(View target) { getAnimatorAgent().playTogether( - ObjectAnimator.ofFloat(target, "rotation", 0, 10, -10, 6, -6, 3, -3, 0) + ObjectAnimator.ofFloat(target, "rotation", target.getTranslationX() + 0, target.getTranslationX() + 10, target.getTranslationX() - 10, target.getTranslationX() + 6, target.getTranslationX() - 6, target.getTranslationX() + 3, target.getTranslationX() - 3, target.getTranslationX() + 0) ); } } diff --git a/library/src/main/java/com/daimajia/androidanimations/library/attention/TadaAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/attention/TadaAnimator.java old mode 100644 new mode 100755 index 3263251..40de464 --- a/library/src/main/java/com/daimajia/androidanimations/library/attention/TadaAnimator.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/attention/TadaAnimator.java @@ -35,7 +35,7 @@ public void prepare(View target) { getAnimatorAgent().playTogether( ObjectAnimator.ofFloat(target, "scaleX", 1, 0.9f, 0.9f, 1.1f, 1.1f, 1.1f, 1.1f, 1.1f, 1.1f, 1), ObjectAnimator.ofFloat(target, "scaleY", 1, 0.9f, 0.9f, 1.1f, 1.1f, 1.1f, 1.1f, 1.1f, 1.1f, 1), - ObjectAnimator.ofFloat(target, "rotation", 0, -3, -3, 3, -3, 3, -3, 3, -3, 0) + ObjectAnimator.ofFloat(target, "rotation", target.getTranslationX() + 0, target.getTranslationX() - 3, target.getTranslationX() - 3, target.getTranslationX() + 3, target.getTranslationX() - 3, target.getTranslationX() + 3, target.getTranslationX() - 3, target.getTranslationX() + 3, target.getTranslationX() - 3, target.getTranslationX() + 0) ); } } diff --git a/library/src/main/java/com/daimajia/androidanimations/library/attention/WaveAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/attention/WaveAnimator.java old mode 100644 new mode 100755 index f95e993..f97ec05 --- a/library/src/main/java/com/daimajia/androidanimations/library/attention/WaveAnimator.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/attention/WaveAnimator.java @@ -36,7 +36,7 @@ public void prepare(View target) { + target.getPaddingLeft(); float y = target.getHeight() - target.getPaddingBottom(); getAnimatorAgent().playTogether( - ObjectAnimator.ofFloat(target, "rotation", 12, -12, 3, -3, 0), + ObjectAnimator.ofFloat(target, "rotation", target.getRotation() + 12, target.getRotation() - 12, target.getRotation() + 3, target.getRotation() - 3, target.getRotation() + 0), ObjectAnimator.ofFloat(target, "pivotX", x, x, x, x, x), ObjectAnimator.ofFloat(target, "pivotY", y, y, y, y, y) ); diff --git a/library/src/main/java/com/daimajia/androidanimations/library/attention/WobbleAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/attention/WobbleAnimator.java old mode 100644 new mode 100755 index 383e7ca..b406cc0 --- a/library/src/main/java/com/daimajia/androidanimations/library/attention/WobbleAnimator.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/attention/WobbleAnimator.java @@ -35,8 +35,8 @@ public void prepare(View target) { float width = target.getWidth(); float one = (float) (width / 100.0); getAnimatorAgent().playTogether( - ObjectAnimator.ofFloat(target, "translationX", 0 * one, -25 * one, 20 * one, -15 * one, 10 * one, -5 * one, 0 * one, 0), - ObjectAnimator.ofFloat(target, "rotation", 0, -5, 3, -3, 2, -1, 0) + ObjectAnimator.ofFloat(target, "translationX", target.getTranslationX() + (0 * one), target.getTranslationX() + (-25 * one), target.getTranslationX() + (20 * one), target.getTranslationX() + (-15 * one), target.getTranslationX() + (10 * one), target.getTranslationX() + (-5 * one), target.getTranslationX() + (0 * one), target.getTranslationX() + 0), + ObjectAnimator.ofFloat(target, "rotation", target.getRotation() + 0, target.getRotation() - 5, target.getRotation() + 3, target.getRotation() - 3, target.getRotation() + 2, target.getRotation() - 1, target.getRotation() + 0) ); } }