From 6229019b0b394d7d41385e2f6add2cd09f9aa967 Mon Sep 17 00:00:00 2001 From: BruceLee Date: Tue, 23 Dec 2014 17:47:52 +0800 Subject: [PATCH 1/2] add ObjectAnimators to AnimatorSet before call AnimatorSet set* methods --- .../androidanimations/library/BaseViewAnimator.java | 6 +++++- .../java/com/daimajia/androidanimations/library/YoYo.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java index 02a7f11..11e008c 100644 --- a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java @@ -45,9 +45,13 @@ public abstract class BaseViewAnimator { protected abstract void prepare(View target); - public void animate(View target) { + public BaseViewAnimator setTarget(View target) { reset(target); prepare(target); + return this; + } + + public void animate(View target) { start(); } diff --git a/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java b/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java index 47414aa..6f27817 100644 --- a/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java @@ -139,6 +139,7 @@ public void stop(boolean reset){ } private BaseViewAnimator play() { + animator.setTarget(target); animator.setDuration(duration) .setInterpolator(interpolator) .setStartDelay(delay); From a44fa6dfa5c5e41771f70f612c7102c6b0855449 Mon Sep 17 00:00:00 2001 From: BruceLee Date: Tue, 23 Dec 2014 17:54:57 +0800 Subject: [PATCH 2/2] rm unused args --- .../daimajia/androidanimations/library/BaseViewAnimator.java | 2 +- .../main/java/com/daimajia/androidanimations/library/YoYo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java index 11e008c..fb62a92 100644 --- a/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java @@ -51,7 +51,7 @@ public BaseViewAnimator setTarget(View target) { return this; } - public void animate(View target) { + public void animate() { start(); } diff --git a/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java b/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java index 6f27817..4d10582 100644 --- a/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java +++ b/library/src/main/java/com/daimajia/androidanimations/library/YoYo.java @@ -150,7 +150,7 @@ private BaseViewAnimator play() { } } - animator.animate(target); + animator.animate(); return animator; }