Skip to content

Commit b5489ea

Browse files
动画修改
1 parent a5968ee commit b5489ea

File tree

5 files changed

+29
-51
lines changed

5 files changed

+29
-51
lines changed
Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android">
3-
<scale
3+
<translate
44
android:duration="300"
5-
android:fromXScale="0.1"
6-
android:fromYScale="0.1"
7-
android:pivotX="50%p"
8-
android:pivotY="50%p"
9-
android:toXScale="1.0"
10-
android:toYScale="1.0" />
11-
<alpha
12-
android:duration="300"
13-
android:fromAlpha="0.1"
14-
android:toAlpha="1.0" />
15-
5+
android:fromXDelta="100%"
6+
android:toXDelta="0" />
167
</set>
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android">
3-
<scale
4-
android:duration="300"
5-
android:fromXScale="0.1"
6-
android:fromYScale="0.1"
7-
android:pivotX="50%p"
8-
android:pivotY="50%p"
9-
android:toXScale="1.0"
10-
android:toYScale="1.0" />
11-
<alpha
12-
android:duration="300"
13-
android:fromAlpha="0.1"
14-
android:toAlpha="1.0" />
3+
<translate
4+
android:duration="200"
5+
android:fromXDelta="-100%"
6+
android:toXDelta="0" />
157
</set>
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android">
3-
<scale
3+
<translate
44
android:duration="300"
5-
android:fromXScale="1.0"
6-
android:fromYScale="1.0"
7-
android:pivotX="50%p"
8-
android:pivotY="50%p"
9-
android:toXScale=".5"
10-
android:toYScale=".5" />
11-
<alpha
12-
android:duration="300"
13-
android:fromAlpha="1.0"
14-
android:toAlpha="0" />
5+
android:fromXDelta="0"
6+
android:toXDelta="-100%" />
157
</set>
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android">
3-
<scale
3+
<translate
44
android:duration="300"
5-
android:fromXScale="1.0"
6-
android:fromYScale="1.0"
7-
android:pivotX="50%p"
8-
android:pivotY="50%p"
9-
android:toXScale=".5"
10-
android:toYScale=".5" />
11-
<alpha
12-
android:duration="300"
13-
android:fromAlpha="1.0"
14-
android:toAlpha="0" />
5+
android:fromXDelta="0"
6+
android:toXDelta="100%" />
157
</set>
Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22

3-
<style name="AnimationActivity" parent="@android:style/Animation.Activity">
4-
<item name="android:activityOpenEnterAnimation">@android:anim/fade_in</item>
5-
<item name="android:activityOpenExitAnimation">@android:anim/fade_in</item>
6-
<item name="android:activityCloseEnterAnimation">@android:anim/fade_out</item>
7-
<item name="android:activityCloseExitAnimation">@android:anim/fade_out</item>
3+
<style name="AnimationActivityZoom" parent="@android:style/Animation.Activity">
4+
<item name="android:activityOpenEnterAnimation">@anim/slide_in_zoom</item>
5+
<item name="android:activityOpenExitAnimation">@anim/slide_in_zoom</item>
6+
<item name="android:activityCloseEnterAnimation">@anim/slide_out_zoom</item>
7+
<item name="android:activityCloseExitAnimation">@anim/slide_out_zoom</item>
8+
</style>
9+
10+
<style name="AnimationActivityLeftRight" parent="@android:style/Animation.Activity">
11+
<!-- A 打开 B,B 的出现动画 -->
12+
<item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
13+
<!-- A 打开 B,A 的消失动画 -->
14+
<item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>
15+
<!-- B 关闭到 A,A 的出现动画 *时长要小于 B 的消失动画,否则会闪烁* -->
16+
<item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item>
17+
<!-- B 关闭到 A,B 的消失动画 *时长要小于 B 的消失动画,否则会闪烁* -->
18+
<item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
819
</style>
920

1021
</resources>

0 commit comments

Comments
 (0)