Skip to content

Commit 048ae83

Browse files
ZenluaZenlua
committed
Update
1 parent 10fab10 commit 048ae83

14 files changed

Lines changed: 76 additions & 118 deletions

‎app/src/main/res/anim/activity_close_enter.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
8-
android:fromXDelta="-100%p"
6+
android:interpolator="@android:interpolator/linear_out_slow_in"
7+
android:duration="230"
8+
android:fromXDelta="-30%p"
99
android:toXDelta="0%p" />
1010
<alpha
11-
android:duration="301"
11+
android:interpolator="@android:interpolator/linear_out_slow_in"
12+
android:duration="230"
1213
android:fromAlpha="0.0"
1314
android:toAlpha="1.0" />
1415
</set>

‎app/src/main/res/anim/activity_close_exit.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="bottom">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="230"
88
android:fromXDelta="0%p"
9-
android:toXDelta="100%p" />
10-
<scale
11-
android:duration="301"
12-
android:pivotX="100%"
13-
android:pivotY="50%"
14-
android:fromXScale="1.0"
15-
android:toXScale="0.5"
16-
android:fromYScale="1.0"
17-
android:toYScale="0.5" />
9+
android:toXDelta="30%p" />
1810
<alpha
19-
android:duration="302"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="230"
2013
android:fromAlpha="1.0"
2114
android:toAlpha="0.0" />
2215
</set>

‎app/src/main/res/anim/activity_open_enter.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
8-
android:fromXDelta="100%p"
6+
android:interpolator="@android:interpolator/linear_out_slow_in"
7+
android:duration="230"
8+
android:fromXDelta="30%p"
99
android:toXDelta="0%p" />
1010
<alpha
11-
android:duration="301"
11+
android:interpolator="@android:interpolator/linear_out_slow_in"
12+
android:duration="230"
1213
android:fromAlpha="0.0"
1314
android:toAlpha="1.0" />
1415
</set>

‎app/src/main/res/anim/activity_open_exit.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="bottom">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="230"
88
android:fromXDelta="0%p"
9-
android:toXDelta="-100%p" />
10-
<scale
11-
android:duration="301"
12-
android:pivotX="0%"
13-
android:pivotY="50%"
14-
android:fromXScale="1.0"
15-
android:toXScale="0.5"
16-
android:fromYScale="1.0"
17-
android:toYScale="0.5" />
9+
android:toXDelta="-30%p" />
1810
<alpha
19-
android:duration="302"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="230"
2013
android:fromAlpha="1.0"
2114
android:toAlpha="0.0" />
2215
</set>

‎app/src/main/res/anim/dialog_enter.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
8-
android:fromYDelta="-10%p"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="220"
8+
android:fromYDelta="-4%p"
99
android:toYDelta="0%p" />
1010
<scale
11-
android:interpolator="@android:anim/anticipate_overshoot_interpolator"
12-
android:duration="301"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="220"
1313
android:pivotX="50%"
1414
android:pivotY="50%"
15-
android:fromXScale="0.6"
15+
android:fromXScale="0.92"
1616
android:toXScale="1.0"
17-
android:fromYScale="0.6"
17+
android:fromYScale="0.92"
1818
android:toYScale="1.0" />
1919
<alpha
20-
android:duration="301"
20+
android:duration="220"
2121
android:fromAlpha="0.0"
2222
android:toAlpha="1.0" />
2323
</set>

‎app/src/main/res/anim/dialog_exit.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="200"
88
android:fromYDelta="0%p"
9-
android:toYDelta="-10%p" />
9+
android:toYDelta="-4%p" />
1010
<scale
11-
android:interpolator="@android:anim/anticipate_overshoot_interpolator"
12-
android:duration="302"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="200"
1313
android:pivotX="50%"
1414
android:pivotY="50%"
1515
android:fromXScale="1.0"
16-
android:toXScale="0.5"
16+
android:toXScale="0.92"
1717
android:fromYScale="1.0"
18-
android:toYScale="0.5" />
18+
android:toYScale="0.92" />
1919
<alpha
20-
android:duration="302"
20+
android:duration="200"
2121
android:fromAlpha="1.0"
2222
android:toAlpha="0.0" />
2323
</set>

‎app/src/main/res/anim/input_method_enter.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="220"
88
android:fromYDelta="-10%p"
99
android:toYDelta="0%p" />
1010
<scale
11-
android:interpolator="@android:anim/anticipate_overshoot_interpolator"
12-
android:duration="301"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="220"
1313
android:pivotX="50%"
1414
android:pivotY="50%"
15-
android:fromXScale="0.6"
15+
android:fromXScale="0.92"
1616
android:toXScale="1.0"
17-
android:fromYScale="0.6"
17+
android:fromYScale="0.92"
1818
android:toYScale="1.0" />
1919
<alpha
20-
android:duration="301"
20+
android:duration="220"
2121
android:fromAlpha="0.0"
2222
android:toAlpha="1.0" />
2323
</set>

‎app/src/main/res/anim/input_method_exit.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="200"
88
android:fromYDelta="0%p"
99
android:toYDelta="-10%p" />
1010
<scale
11-
android:interpolator="@android:anim/anticipate_overshoot_interpolator"
12-
android:duration="302"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="200"
1313
android:pivotX="50%"
1414
android:pivotY="50%"
1515
android:fromXScale="1.0"
16-
android:toXScale="0.5"
16+
android:toXScale="0.92"
1717
android:fromYScale="1.0"
18-
android:toYScale="0.5" />
18+
android:toYScale="0.92" />
1919
<alpha
20-
android:duration="302"
20+
android:duration="200"
2121
android:fromAlpha="1.0"
2222
android:toAlpha="0.0" />
2323
</set>

‎app/src/main/res/anim/task_close_enter.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="top">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
8-
android:fromXDelta="-100%p"
6+
android:interpolator="@android:interpolator/linear_out_slow_in"
7+
android:duration="230"
8+
android:fromXDelta="-30%p"
99
android:toXDelta="0%p" />
1010
<alpha
11-
android:duration="301"
11+
android:interpolator="@android:interpolator/linear_out_slow_in"
12+
android:duration="230"
1213
android:fromAlpha="0.0"
1314
android:toAlpha="1.0" />
1415
</set>

‎app/src/main/res/anim/task_close_exit.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
android:shareInterpolator="false"
44
android:zAdjustment="bottom">
55
<translate
6-
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
7-
android:duration="301"
6+
android:interpolator="@android:interpolator/fast_out_slow_in"
7+
android:duration="230"
88
android:fromXDelta="0%p"
9-
android:toXDelta="150%p" />
10-
<scale
11-
android:duration="301"
12-
android:pivotX="100%"
13-
android:pivotY="50%"
14-
android:fromXScale="1.0"
15-
android:toXScale="0.5"
16-
android:fromYScale="1.0"
17-
android:toYScale="0.5" />
9+
android:toXDelta="30%p" />
1810
<alpha
19-
android:duration="301"
11+
android:interpolator="@android:interpolator/fast_out_slow_in"
12+
android:duration="230"
2013
android:fromAlpha="1.0"
2114
android:toAlpha="0.0" />
2215
</set>

0 commit comments

Comments
 (0)