Skip to content

Commit a2167ff

Browse files
committed
Merge branch 'fix'
2 parents 948976e + dc8a136 commit a2167ff

29 files changed

+73
-62
lines changed

demo/src/main/res/layout/activity_my.xml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,24 @@
77
android:paddingTop="@dimen/activity_vertical_margin"
88
android:paddingBottom="@dimen/activity_vertical_margin"
99
tools:context=".MyActivity">
10-
11-
<TextView
12-
android:padding="30dp"
13-
android:textSize="40sp"
14-
android:id="@+id/hello_world"
15-
android:text="@string/hello_world"
16-
android:layout_centerHorizontal="true"
10+
<LinearLayout
11+
android:id="@+id/hello_world_wrapper"
1712
android:layout_width="wrap_content"
18-
android:layout_height="wrap_content" />
13+
android:gravity="center"
14+
android:layout_height="wrap_content">
15+
<TextView
16+
android:padding="30dp"
17+
android:textSize="40sp"
18+
android:id="@+id/hello_world"
19+
android:text="@string/hello_world"
20+
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content" />
23+
</LinearLayout>
24+
1925
<ListView
2026
android:id="@+id/list_items"
21-
android:layout_below="@+id/hello_world"
27+
android:layout_below="@+id/hello_world_wrapper"
2228
android:layout_width="wrap_content"
2329
android:layout_height="wrap_content"/>
2430
</RelativeLayout>

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.8
22-
VERSION_CODE=9
21+
VERSION_NAME=1.1.0
22+
VERSION_CODE=10
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 20
11-
versionCode 9
12-
versionName "1.0.8"
11+
versionCode 10
12+
versionName "1.0.9"
1313
}
1414
buildTypes {
1515
release {

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -129,27 +129,4 @@ public AnimatorSet getAnimatorAgent() {
129129
return mAnimatorSet;
130130
}
131131

132-
public static class Builder{
133-
134-
public static AnimatorSet build(Techniques technique, View target){
135-
return build(technique, target, DURATION, 0);
136-
}
137-
138-
public static AnimatorSet build(Techniques technique, View target, long duration, long delay){
139-
return build(technique, target, duration, delay, null, new AnimatorListener[]{});
140-
}
141-
142-
public static AnimatorSet build(Techniques technique, View target, long duration, long delay, Interpolator interpolator, AnimatorListener... listeners){
143-
BaseViewAnimator baseViewAnimator = technique.getAnimator();
144-
baseViewAnimator.prepare(target);
145-
baseViewAnimator.setStartDelay(delay);
146-
baseViewAnimator.setInterpolator(interpolator);
147-
for(AnimatorListener l : listeners)
148-
baseViewAnimator.addAnimatorListener(l);
149-
baseViewAnimator.setDuration(duration);
150-
return baseViewAnimator.getAnimatorAgent();
151-
}
152-
}
153-
154-
155132
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class FadeInDownAnimator 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, "translationY", -target.getHeight()/4, 0)
3838
);
3939
}
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class FadeInLeftAnimator extends BaseViewAnimator {
3434
public void prepare(View target) {
3535
getAnimatorAgent().playTogether(
3636
ObjectAnimator.ofFloat(target, "alpha", 0, 1),
37-
ObjectAnimator.ofFloat(target, "translationX", -20, 0)
37+
ObjectAnimator.ofFloat(target, "translationX", -target.getWidth()/4, 0)
3838
);
3939
}
4040
}

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, "translationX", 20, 0)
37+
ObjectAnimator.ofFloat(target, "translationX", target.getWidth()/4, 0)
3838
);
3939
}
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class FadeInUpAnimator 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, "translationY", target.getHeight()/4, 0)
3838
);
3939
}
4040
}

library/src/main/java/com/daimajia/androidanimations/library/fading_exits/FadeOutDownAnimator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class FadeOutDownAnimator extends BaseViewAnimator {
3434
public void prepare(View target) {
3535
getAnimatorAgent().playTogether(
3636
ObjectAnimator.ofFloat(target,"alpha",1,0),
37-
ObjectAnimator.ofFloat(target,"translationY",0,20)
37+
ObjectAnimator.ofFloat(target,"translationY",0,target.getHeight()/4)
3838
);
3939
}
4040
}

library/src/main/java/com/daimajia/androidanimations/library/fading_exits/FadeOutLeftAnimator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class FadeOutLeftAnimator extends BaseViewAnimator {
3434
public void prepare(View target) {
3535
getAnimatorAgent().playTogether(
3636
ObjectAnimator.ofFloat(target,"alpha",1,0),
37-
ObjectAnimator.ofFloat(target,"translationX",0,-20)
37+
ObjectAnimator.ofFloat(target,"translationX",0,-target.getWidth()/4)
3838
);
3939
}
4040
}

0 commit comments

Comments
 (0)