From 0d219e4b6d1d4c3c333f2cfec896b0d8a28f96d3 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 22 Nov 2022 18:15:25 +0800
Subject: [PATCH] =?UTF-8?q?act=E8=BF=9B=E5=85=A5=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/anim/in_from_right.xml    |  7 +++++
 .../src/main/res/anim/in_from_right_abit.xml  |  7 +++++
 common/src/main/res/anim/out_from_right.xml   |  7 +++++
 common/src/main/res/anim/out_to_right.xml     |  7 +++++
 .../src/main/res/anim/out_to_right_abit.xml   |  7 +++++
 common/src/main/res/values/style.xml          | 28 +++++++++++++------
 6 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 common/src/main/res/anim/in_from_right.xml
 create mode 100644 common/src/main/res/anim/in_from_right_abit.xml
 create mode 100644 common/src/main/res/anim/out_from_right.xml
 create mode 100644 common/src/main/res/anim/out_to_right.xml
 create mode 100644 common/src/main/res/anim/out_to_right_abit.xml

diff --git a/common/src/main/res/anim/in_from_right.xml b/common/src/main/res/anim/in_from_right.xml
new file mode 100644
index 000000000..7729bdc16
--- /dev/null
+++ b/common/src/main/res/anim/in_from_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="100%"
+        android:toXDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/common/src/main/res/anim/in_from_right_abit.xml b/common/src/main/res/anim/in_from_right_abit.xml
new file mode 100644
index 000000000..0901efc3c
--- /dev/null
+++ b/common/src/main/res/anim/in_from_right_abit.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0"
+        android:toXDelta="-15%" />
+</set>
\ No newline at end of file
diff --git a/common/src/main/res/anim/out_from_right.xml b/common/src/main/res/anim/out_from_right.xml
new file mode 100644
index 000000000..3b2030e82
--- /dev/null
+++ b/common/src/main/res/anim/out_from_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="3000"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/common/src/main/res/anim/out_to_right.xml b/common/src/main/res/anim/out_to_right.xml
new file mode 100644
index 000000000..4344ae837
--- /dev/null
+++ b/common/src/main/res/anim/out_to_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="100%" />
+</set>
\ No newline at end of file
diff --git a/common/src/main/res/anim/out_to_right_abit.xml b/common/src/main/res/anim/out_to_right_abit.xml
new file mode 100644
index 000000000..57bffad36
--- /dev/null
+++ b/common/src/main/res/anim/out_to_right_abit.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="-15%"
+        android:toXDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/common/src/main/res/values/style.xml b/common/src/main/res/values/style.xml
index 8198d657c..f58f596c4 100644
--- a/common/src/main/res/values/style.xml
+++ b/common/src/main/res/values/style.xml
@@ -6,9 +6,9 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:colorBackground">@color/background</item>
-        <item name="android:windowAnimationStyle">@style/Animation</item>
+        <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" >@color/colorPrimary</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
     </style>
 
     <style name="dialog" parent="AppTheme">
@@ -35,6 +35,7 @@
         <!--显示区域以外是否使用黑色半透明背景-->
         <item name="android:backgroundDimEnabled">true</item>
     </style>
+
     <style name="dialog4" parent="AppTheme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -44,6 +45,7 @@
         <!--显示区域以外是否使用黑色半透明背景-->
         <item name="android:backgroundDimEnabled">false</item>
     </style>
+
     <style name="dialog3" parent="AppTheme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -69,10 +71,12 @@
         <item name="android:windowEnterAnimation">@anim/left_anim_enter</item>
         <item name="android:windowExitAnimation">@anim/left_anim_exit</item>
     </style>
+
     <style name="RightLeftToAnim" parent="android:Animation">
         <item name="android:windowEnterAnimation">@anim/right_anim_enter</item>
         <item name="android:windowExitAnimation">@anim/right_anim_exit</item>
     </style>
+
     <style name="groupLast" parent="AppTheme">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
@@ -93,6 +97,7 @@
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
     </style>
+
     <style name="Theme.PayssionTrans" parent="Theme.AppCompat.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -107,15 +112,22 @@
     <style name="Animation">
         <item name="android:activityOpenEnterAnimation">@null</item>
         <item name="android:activityOpenExitAnimation">@null</item>
-        <item name="android:activityCloseEnterAnimation">@null</item>
-        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_from_right</item>
         <item name="android:taskOpenEnterAnimation">@null</item>
         <item name="android:taskOpenExitAnimation">@null</item>
-        <item name="android:taskCloseEnterAnimation">@null</item>
-        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskCloseExitAnimation">@anim/out_from_right</item>
         <item name="android:taskToFrontEnterAnimation">@null</item>
         <item name="android:taskToFrontExitAnimation">@null</item>
-        <item name="android:taskToBackEnterAnimation">@null</item>
-        <item name="android:taskToBackExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@anim/out_from_right</item>
+        <item name="android:taskToBackExitAnimation">@anim/out_from_right</item>
+    </style>
+    <!-- 页面弹出（入场出场）动画 -->
+    <style name="AnimationActivity" parent="@android:style/Animation">
+        <item name="android:activityOpenEnterAnimation">@anim/in_from_right</item>
+        <item name="android:activityOpenExitAnimation">@anim/in_from_right_abit</item>
+        <item name="android:activityCloseEnterAnimation">@anim/out_to_right_abit</item>
+        <item name="android:activityCloseExitAnimation">@anim/out_to_right</item>
     </style>
 </resources>
\ No newline at end of file