Tweaked LiftOff transitions timings.

luoyiqi · May 14, 2016 · 992fe2d · 992fe2d
1 parent 9cbc1df
commit 992fe2d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/app/src/main/res/transition/designer_news_story_shared_enter.xml b/app/src/main/res/transition/designer_news_story_shared_enter.xml
@@ -18,20 +18,22 @@
 <transitionSet
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:interpolator="@android:interpolator/fast_out_slow_in"
-    android:transitionOrdering="together"
-    android:duration="300">
+    android:transitionOrdering="together">
 
     <transitionSet>
-        <changeBounds />
+        <changeBounds android:duration="300" />
         <transition
             class="io.plaidapp.ui.transitions.LiftOff"
+            android:duration="400"
             android:elevation="@dimen/touch_raise" />
         <targets>
             <target android:targetId="@id/comments_container" />
         </targets>
     </transitionSet>
 
-    <transition class="io.plaidapp.ui.transitions.StoryTitleSharedEnter">
+    <transition
+        class="io.plaidapp.ui.transitions.StoryTitleSharedEnter"
+        android:duration="300">
         <targets>
             <target android:targetId="@id/story_title_background" />
         </targets>

diff --git a/app/src/main/res/transition/designer_news_story_shared_return.xml b/app/src/main/res/transition/designer_news_story_shared_return.xml
@@ -17,21 +17,21 @@
 
 <transitionSet
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
     android:interpolator="@android:interpolator/fast_out_slow_in"
     android:transitionOrdering="together">
 
     <transitionSet>
-        <changeBounds />
+        <changeBounds android:duration="300" />
         <transition
             class="io.plaidapp.ui.transitions.LiftOff"
+            android:duration="400"
             android:elevation="@dimen/touch_raise" />
         <targets>
             <target android:targetId="@id/comments_container" />
         </targets>
     </transitionSet>
 
-    <changeBounds>
+    <changeBounds android:duration="300">
         <targets>
             <target android:targetId="@id/story_title_background" />
         </targets>

diff --git a/app/src/main/res/transition/dribbble_player_shared_enter.xml b/app/src/main/res/transition/dribbble_player_shared_enter.xml
@@ -17,16 +17,16 @@
 
 <transitionSet
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
     android:interpolator="@android:interpolator/fast_out_slow_in"
     android:transitionOrdering="together">
 
-    <changeBounds />
+    <changeBounds android:duration="300" />
     <pathMotion
         class="io.plaidapp.ui.transitions.GravityArcMotion"
         android:maximumAngle="50" />
     <transition
         class="io.plaidapp.ui.transitions.LiftOff"
+        android:duration="400"
         android:elevation="@dimen/touch_raise" />
 
 </transitionSet>
diff --git a/app/src/main/res/transition/dribbble_shot_shared_enter.xml b/app/src/main/res/transition/dribbble_shot_shared_enter.xml
@@ -17,22 +17,23 @@
 
 <transitionSet
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="300"
     android:interpolator="@android:interpolator/fast_out_slow_in"
     android:transitionOrdering="together">
 
     <transitionSet>
-        <changeBounds />
+        <changeBounds android:duration="300" />
         <transition
             class="io.plaidapp.ui.transitions.LiftOff"
+            android:duration="400"
             android:elevation="@dimen/touch_raise" />
         <targets>
             <target android:targetId="@id/container" />
         </targets>
     </transitionSet>
 
     <transition
-        class="io.plaidapp.ui.transitions.ShotSharedEnter">
+        class="io.plaidapp.ui.transitions.ShotSharedEnter"
+        android:duration="300">
         <targets>
             <target android:targetId="@id/shot" />
         </targets>