Adjust the removing animation of the first and the last item.

mozilla-mobile · Apr 13, 2018 · e2bb2b6 · e2bb2b6
1 parent 92cd479
commit e2bb2b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 40 deletions.
diff --git a/app/src/main/java/org/mozilla/focus/tabs/tabtray/TabTrayFragment.java b/app/src/main/java/org/mozilla/focus/tabs/tabtray/TabTrayFragment.java
@@ -8,7 +8,6 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
@@ -418,9 +417,6 @@ private void initRecyclerViewStyle(RecyclerView recyclerView) {
         recyclerView.setLayoutManager(layoutManager = new LinearLayoutManager(context,
                 LinearLayoutManager.VERTICAL, false));
 
-        recyclerView.addItemDecoration(new ItemSpaceDecoration(context));
-        recyclerView.addItemDecoration(new TabTrayPaddingDecoration(context, this));
-
         RecyclerView.ItemAnimator animator = recyclerView.getItemAnimator();
         if (animator instanceof SimpleItemAnimator) {
             ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false);
@@ -616,40 +612,4 @@ private void onSlide(float slideOffset) {
             }
         }
     }
-
-    public static class ItemSpaceDecoration extends RecyclerView.ItemDecoration {
-        private int margin;
-
-        ItemSpaceDecoration(Context context) {
-            this.margin = context.getResources().getDimensionPixelSize(R.dimen.tab_tray_item_space);
-        }
-
-        @Override
-        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-            int itemPosition = parent.getChildAdapterPosition(view);
-            outRect.top = itemPosition == 0 ? 0 : margin;
-        }
-    }
-
-    public static class TabTrayPaddingDecoration extends RecyclerView.ItemDecoration {
-        private TabTrayFragment fragment;
-        private int padding;
-
-        TabTrayPaddingDecoration(Context context, TabTrayFragment fragment) {
-            this.fragment = fragment;
-            this.padding = context.getResources().getDimensionPixelSize(R.dimen.tab_tray_padding);
-        }
-
-        @Override
-        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-            int itemPosition = parent.getChildAdapterPosition(view);
-            outRect.left = outRect.right = padding;
-
-            if (itemPosition == 0) {
-                outRect.top = padding;
-            } else if (itemPosition == fragment.adapter.getItemCount() - 1) {
-                outRect.bottom = fragment.newTabBtn.getMeasuredHeight() + padding;
-            }
-        }
-    }
 }
diff --git a/app/src/main/res/layout/fragment_tab_tray.xml b/app/src/main/res/layout/fragment_tab_tray.xml
@@ -32,6 +32,10 @@
             android:layout_height="match_parent"
             android:background="@color/tabTrayForeground"
             android:clipToPadding="false"
+            android:paddingStart="@dimen/tab_tray_padding"
+            android:paddingTop="@dimen/tab_tray_padding"
+            android:paddingEnd="@dimen/tab_tray_padding"
+            android:paddingBottom="@dimen/tab_tray_new_tab_btn_height"
             app:layout_behavior="org.mozilla.focus.tabs.tabtray.InterceptBehavior"
             app:behavior_hideable="true"
             app:behavior_peekHeight="@dimen/tab_tray_peekHeight"

diff --git a/app/src/main/res/layout/item_tab_tray.xml b/app/src/main/res/layout/item_tab_tray.xml
@@ -12,6 +12,7 @@
     android:background="@drawable/tab_tray_item_bkg"
     android:outlineProvider="background"
     android:elevation="1dp"
+    android:layout_marginBottom="@dimen/tab_tray_item_space"
     tools:ignore="contentDescription">
     <ImageView
         android:id="@+id/website_icon"