Skip to content

fix issue#30 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 23, 2014
Merged

fix issue#30 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6229019
add ObjectAnimators to AnimatorSet before call AnimatorSet set* methods
uknownothingsnow Dec 23, 2014
a44fa6d
rm unused args
uknownothingsnow Dec 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion library/src/main/java/com/daimajia/androidanimations/library/BaseViewAnimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
start();
}

Expand Down
3 changes: 2 additions & 1 deletion library/src/main/java/com/daimajia/androidanimations/library/YoYo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ public void stop(boolean reset){
}

private BaseViewAnimator play() {
animator.setTarget(target);
animator.setDuration(duration)
.setInterpolator(interpolator)
.setStartDelay(delay);
Expand All @@ -149,7 +150,7 @@ private BaseViewAnimator play() {
}
}

animator.animate(target);
animator.animate();
return animator;
}

Expand Down