Fixed incorrect use of stable ids & improved return transition.

Change-Id: I152416077ac45c0a422ab756934cac799b920e52
thanhcs94 · Nov 5, 2015 · d8ab53a · d8ab53a
1 parent 0773c12
commit d8ab53a
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 18 deletions.
diff --git a/app/src/main/java/io/plaidapp/ui/AboutActivity.java b/app/src/main/java/io/plaidapp/ui/AboutActivity.java
@@ -210,7 +210,6 @@ private static class LibraryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
 
         public LibraryAdapter(Context context) {
             circleCrop = new CircleTransform(context);
-            setHasStableIds(true);
         }
 
         @Override
@@ -243,11 +242,6 @@ public int getItemCount() {
             return libs.length + 1; // + 1 for the static intro view
         }
 
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
         private void bindLibrary(final LibraryHolder holder, final Library lib) {
             holder.name.setText(lib.name);
             Glide.with(holder.image.getContext())

diff --git a/app/src/main/res/layout/about_libs.xml b/app/src/main/res/layout/about_libs.xml
@@ -15,17 +15,30 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.RecyclerView
-    android:id="@+id/libs_list"
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/spacing_normal"
-    android:clipToPadding="false"
-    android:background="@color/grey_200"
-    android:transitionGroup="false"
-    android:scrollbars="vertical"
-    app:layoutManager="android.support.v7.widget.LinearLayoutManager"
-    tools:showIn="@layout/activity_about"/>
+    tools:showIn="@layout/activity_about">
+
+    <!-- we use a parallel view for the background rather than just setting a background on the
+         recycler view for a nicer return transition. i.e. we want the background to fade and the
+         list to slide out separately -->
+    <View
+        android:id="@+id/libs_list_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/grey_200" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/libs_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/spacing_normal"
+        android:clipToPadding="false"
+        android:scrollbars="vertical"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+
+</FrameLayout>
diff --git a/app/src/main/res/transition/about_return.xml b/app/src/main/res/transition/about_return.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2015 Google Inc.
+
+  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.
+  -->
+
+<transitionSet
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:transitionOrdering="together"
+    android:interpolator="@android:interpolator/fast_out_linear_in">
+
+    <slide
+        android:slideEdge="top"
+        android:duration="400">
+        <targets>
+            <target android:excludeId="@android:id/navigationBarBackground" />
+            <target android:excludeId="@android:id/statusBarBackground" />
+        </targets>
+    </slide>
+
+    <fade
+        android:startDelay="200"
+        android:duration="200">
+        <targets>
+            <target android:targetId="@id/libs_list_background" />
+        </targets>
+    </fade>
+
+    <fade android:duration="400">
+        <targets>
+            <target android:targetId="@android:id/navigationBarBackground" />
+            <target android:targetId="@android:id/statusBarBackground" />
+        </targets>
+    </fade>
+
+</transitionSet>
diff --git a/app/src/main/res/transition/about_return_downward.xml b/app/src/main/res/transition/about_return_downward.xml
@@ -18,17 +18,26 @@
 <transitionSet
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:transitionOrdering="together"
-    android:duration="300"
     android:interpolator="@android:interpolator/fast_out_linear_in">
 
-    <slide android:slideEdge="bottom">
+    <slide
+        android:slideEdge="bottom"
+        android:duration="400">
         <targets>
             <target android:excludeId="@android:id/navigationBarBackground" />
             <target android:excludeId="@android:id/statusBarBackground" />
         </targets>
     </slide>
 
-    <fade android:duration="@android:integer/config_mediumAnimTime">
+    <fade
+        android:startDelay="200"
+        android:duration="200">
+        <targets>
+            <target android:targetId="@id/libs_list_background" />
+        </targets>
+    </fade>
+
+    <fade android:duration="400">
         <targets>
             <target android:targetId="@android:id/navigationBarBackground" />
             <target android:targetId="@android:id/statusBarBackground" />

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -113,6 +113,7 @@
 
     <style name="Plaid.Translucent.About">
         <item name="android:windowEnterTransition">@transition/about_enter</item>
+        <item name="android:windowReturnTransition">@transition/about_return</item>
     </style>
 
     <style name="SearchWindowAnimations">