Skip to content

Commit ad22a5f

Browse files
committed
fix #4
1 parent faff867 commit ad22a5f

File tree

5 files changed

+47
-5
lines changed

5 files changed

+47
-5
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# org.gradle.parallel=true
1919

2020

21-
VERSION_NAME=1.0.2
22-
VERSION_CODE=3
21+
VERSION_NAME=1.0.3
22+
VERSION_CODE=4
2323
GROUP=com.daimajia.androidanimations
2424

2525
POM_DESCRIPTION=Collect android animations

library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.daimajia.androidanimations.library"
99
minSdkVersion 8
1010
targetSdkVersion 19
11-
versionCode 3
12-
versionName "1.0.2"
11+
versionCode 4
12+
versionName "1.0.3"
1313
}
1414
buildTypes {
1515
release {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import com.daimajia.androidanimations.library.fading_entrances.FadeInDownAnimator;
4848
import com.daimajia.androidanimations.library.fading_entrances.FadeInLeftAnimator;
4949
import com.daimajia.androidanimations.library.fading_entrances.FadeInRightAnimator;
50+
import com.daimajia.androidanimations.library.fading_entrances.FadeInUpAnimator;
5051
import com.daimajia.androidanimations.library.fading_exits.FadeOutAnimator;
5152
import com.daimajia.androidanimations.library.fading_exits.FadeOutDownAnimator;
5253
import com.daimajia.androidanimations.library.fading_exits.FadeOutLeftAnimator;
@@ -112,6 +113,7 @@ public static enum Techniques {
112113
BounceInUp(BounceInUpAnimator.class),
113114

114115
FadeIn(FadeInAnimator.class),
116+
FadeInUp(FadeInUpAnimator.class),
115117
FadeInDown(FadeInDownAnimator.class),
116118
FadeInLeft(FadeInLeftAnimator.class),
117119
FadeInRight(FadeInRightAnimator.class),

library/src/main/java/com/daimajia/androidanimations/library/fading_entrances/FadeInRightAnimator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class FadeInRightAnimator extends BaseViewAnimator {
3434
public void prepare(View target) {
3535
getAnimatorAgent().playTogether(
3636
ObjectAnimator.ofFloat(target, "alpha", 0, 1),
37-
ObjectAnimator.ofFloat(target, "translationY", 20, 0)
37+
ObjectAnimator.ofFloat(target, "translationX", 20, 0)
3838
);
3939
}
4040
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2014 daimajia
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
*/
24+
25+
package com.daimajia.androidanimations.library.fading_entrances;
26+
27+
import android.view.View;
28+
29+
import com.daimajia.androidanimations.library.BaseViewAnimator;
30+
import com.nineoldandroids.animation.ObjectAnimator;
31+
32+
public class FadeInUpAnimator extends BaseViewAnimator {
33+
@Override
34+
protected void prepare(View target) {
35+
getAnimatorAgent().playTogether(
36+
ObjectAnimator.ofFloat(target, "alpha", 0, 1),
37+
ObjectAnimator.ofFloat(target, "translationY", 20, 0)
38+
);
39+
}
40+
}

0 commit comments

Comments
 (0)