Skip to content

Commit 681d4dc

Browse files
committed
Merge pull request #48 from dashhunds/master
fix FlipInY thanks to @dashhunds
2 parents 0b40f23 + 2ba1f66 commit 681d4dc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

library/src/main/java/com/daimajia/androidanimations/library/Techniques.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import com.daimajia.androidanimations.library.fading_exits.FadeOutRightAnimator;
5252
import com.daimajia.androidanimations.library.fading_exits.FadeOutUpAnimator;
5353
import com.daimajia.androidanimations.library.flippers.FlipInXAnimator;
54+
import com.daimajia.androidanimations.library.flippers.FlipInYAnimator;
5455
import com.daimajia.androidanimations.library.flippers.FlipOutXAnimator;
5556
import com.daimajia.androidanimations.library.flippers.FlipOutYAnimator;
5657
import com.daimajia.androidanimations.library.rotating_entrances.RotateInAnimator;
@@ -129,7 +130,7 @@ public enum Techniques {
129130

130131
FlipInX(FlipInXAnimator.class),
131132
FlipOutX(FlipOutXAnimator.class),
132-
133+
FlipInY(FlipInYAnimator.class),
133134
FlipOutY(FlipOutYAnimator.class),
134135
RotateIn(RotateInAnimator.class),
135136
RotateInDownLeft(RotateInDownLeftAnimator.class),

library/src/main/java/com/daimajia/androidanimations/library/flippers/FlipYAnimator.java renamed to library/src/main/java/com/daimajia/androidanimations/library/flippers/FlipInYAnimator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.daimajia.androidanimations.library.BaseViewAnimator;
3030
import com.nineoldandroids.animation.ObjectAnimator;
3131

32-
public class FlipYAnimator extends BaseViewAnimator {
32+
public class FlipInYAnimator extends BaseViewAnimator {
3333
@Override
3434
public void prepare(View target) {
3535
getAnimatorAgent().playTogether(

0 commit comments

Comments
 (0)