From 4cf3db2ee12f1c6ba021ce53822f39659070afc1 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 29 Jan 2016 23:22:15 +0800
Subject: [PATCH] Improve scene animation

---
 .../java/com/hippo/scene/StageActivity.java   | 13 +++---
 ..._translate_in.xml => accelerate_quart.xml} | 13 +++---
 ..._translate_out.xml => accelerate_terz.xml} | 13 +++---
 app/src/main/res/anim/decelerate_quart.xml    | 20 +++++++++
 app/src/main/res/anim/decelerate_quint.xml    | 20 +++++++++
 app/src/main/res/anim/scene_close_enter.xml   | 30 ++++++++++++++
 app/src/main/res/anim/scene_close_exit.xml    | 41 +++++++++++++++++++
 app/src/main/res/anim/scene_open_enter.xml    | 40 ++++++++++++++++++
 app/src/main/res/anim/scene_open_exit.xml     | 31 ++++++++++++++
 9 files changed, 198 insertions(+), 23 deletions(-)
 rename app/src/main/res/anim/{fragment_translate_in.xml => accelerate_quart.xml} (74%)
 rename app/src/main/res/anim/{fragment_translate_out.xml => accelerate_terz.xml} (74%)
 create mode 100644 app/src/main/res/anim/decelerate_quart.xml
 create mode 100644 app/src/main/res/anim/decelerate_quint.xml
 create mode 100644 app/src/main/res/anim/scene_close_enter.xml
 create mode 100644 app/src/main/res/anim/scene_close_exit.xml
 create mode 100644 app/src/main/res/anim/scene_open_enter.xml
 create mode 100644 app/src/main/res/anim/scene_open_exit.xml

diff --git a/app/src/main/java/com/hippo/scene/StageActivity.java b/app/src/main/java/com/hippo/scene/StageActivity.java
index 80074deb1..d6835a050 100644
--- a/app/src/main/java/com/hippo/scene/StageActivity.java
+++ b/app/src/main/java/com/hippo/scene/StageActivity.java
@@ -104,13 +104,12 @@ public abstract class StageActivity extends AppCompatActivity {
         String newTag = Integer.toString(mIdGenerator.nextId());
 
         FragmentTransaction transaction = fragmentManager.beginTransaction();
-        if (transitionHelper != null && currentFragment != null) {
-            transitionHelper.onTransition(this, transaction, currentFragment, newScene);
-        } else {
-            transaction.setCustomAnimations(R.anim.fragment_translate_in, R.anim.fragment_translate_out);
-        }
-        transaction.remove(newScene);
         if (currentFragment != null) {
+            if (false && transitionHelper != null) {
+                transitionHelper.onTransition(this, transaction, currentFragment, newScene);
+            } else {
+                transaction.setCustomAnimations(R.anim.scene_open_enter, R.anim.scene_open_exit);
+            }
             transaction.detach(currentFragment);
         }
         transaction.add(getContainerViewId(), newScene, newTag);
@@ -166,7 +165,7 @@ public abstract class StageActivity extends AppCompatActivity {
         }
 
         FragmentTransaction transaction = fragmentManager.beginTransaction();
-        transaction.setCustomAnimations(R.anim.fragment_translate_in, R.anim.fragment_translate_out);
+        transaction.setCustomAnimations(R.anim.scene_close_enter, R.anim.scene_close_exit);
         transaction.remove(scene);
         if (next != null) {
             if (next.isDetached()) {
diff --git a/app/src/main/res/anim/fragment_translate_in.xml b/app/src/main/res/anim/accelerate_quart.xml
similarity index 74%
rename from app/src/main/res/anim/fragment_translate_in.xml
rename to app/src/main/res/anim/accelerate_quart.xml
index 003ed18d8..89e3a8b4c 100644
--- a/app/src/main/res/anim/fragment_translate_in.xml
+++ b/app/src/main/res/anim/accelerate_quart.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2015 Hippo Seven
+  ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,10 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<set>
-    <alpha
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:duration="300"/>
-</set>
+
+<accelerateInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:factor="2.0"/>
diff --git a/app/src/main/res/anim/fragment_translate_out.xml b/app/src/main/res/anim/accelerate_terz.xml
similarity index 74%
rename from app/src/main/res/anim/fragment_translate_out.xml
rename to app/src/main/res/anim/accelerate_terz.xml
index 63a0f7cea..1ac8e476c 100644
--- a/app/src/main/res/anim/fragment_translate_out.xml
+++ b/app/src/main/res/anim/accelerate_terz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2015 Hippo Seven
+  ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,10 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<set>
-    <alpha
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0"
-        android:duration="300"/>
-</set>
+
+<accelerateInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:factor="1.5"/>
diff --git a/app/src/main/res/anim/decelerate_quart.xml b/app/src/main/res/anim/decelerate_quart.xml
new file mode 100644
index 000000000..e495bc3dc
--- /dev/null
+++ b/app/src/main/res/anim/decelerate_quart.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<decelerateInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:factor="2.0"/>
diff --git a/app/src/main/res/anim/decelerate_quint.xml b/app/src/main/res/anim/decelerate_quint.xml
new file mode 100644
index 000000000..0a975d4ba
--- /dev/null
+++ b/app/src/main/res/anim/decelerate_quint.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<decelerateInterpolator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:factor="2.5"/>
diff --git a/app/src/main/res/anim/scene_close_enter.xml b/app/src/main/res/anim/scene_close_enter.xml
new file mode 100644
index 000000000..16a51fc9c
--- /dev/null
+++ b/app/src/main/res/anim/scene_close_enter.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@anim/accelerate_terz"
+        android:duration="250"/>
+
+</set>
diff --git a/app/src/main/res/anim/scene_close_exit.xml b/app/src/main/res/anim/scene_close_exit.xml
new file mode 100644
index 000000000..5a9230cfe
--- /dev/null
+++ b/app/src/main/res/anim/scene_close_exit.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:interpolator="@android:interpolator/linear"
+        android:fillEnabled="true"
+        android:fillBefore="false"
+        android:fillAfter="true"
+        android:startOffset="100"
+        android:duration="150"/>
+
+    <translate
+        android:fromYDelta="0%"
+        android:toYDelta="8%"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@anim/accelerate_quart"
+        android:duration="250"/>
+
+</set>
diff --git a/app/src/main/res/anim/scene_open_enter.xml b/app/src/main/res/anim/scene_open_enter.xml
new file mode 100644
index 000000000..847f43b5f
--- /dev/null
+++ b/app/src/main/res/anim/scene_open_enter.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:interpolator="@anim/decelerate_quart"
+        android:fillEnabled="true"
+        android:fillBefore="false"
+        android:fillAfter="true"
+        android:duration="200"/>
+
+    <translate
+        android:fromYDelta="8%"
+        android:toYDelta="0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@anim/decelerate_quint"
+        android:duration="350"/>
+
+</set>
diff --git a/app/src/main/res/anim/scene_open_exit.xml b/app/src/main/res/anim/scene_open_exit.xml
new file mode 100644
index 000000000..dc0136110
--- /dev/null
+++ b/app/src/main/res/anim/scene_open_exit.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="#ff000000">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="350"/>
+
+</set>