From 4fcffb571cbf7a19501865d78978e6c7c1d7fa2f Mon Sep 17 00:00:00 2001
From: Abhijit Valluri <avalluri2@bloomberg.net>
Date: Tue, 1 Sep 2020 14:58:42 +0100
Subject: [PATCH] Tweak tabs tray layout, use reverse layout for top sheet

---
 .../java/org/mozilla/fenix/tabtray/TabTrayView.kt |  3 +++
 .../main/res/layout/component_tabstray_bottom.xml |  3 ++-
 app/src/main/res/layout/tab_tray_item.xml         | 15 +++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index d76c1ea50..c8be8b158 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -280,6 +280,9 @@ class TabTrayView(
     fun updateTabsTrayLayout() {
         view.tabsTray.apply {
             val gridLayoutManager = GridLayoutManager(container.context, gridViewNumberOfCols(container.context))
+            if (container.context.settings().toolbarPosition == ToolbarPosition.BOTTOM) {
+                gridLayoutManager.reverseLayout = true
+            }
             gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
                 override fun getSpanSize(position: Int): Int {
                     val numTabs = tabsAdapter.itemCount
diff --git a/app/src/main/res/layout/component_tabstray_bottom.xml b/app/src/main/res/layout/component_tabstray_bottom.xml
index ccb1065d9..e359c273e 100644
--- a/app/src/main/res/layout/component_tabstray_bottom.xml
+++ b/app/src/main/res/layout/component_tabstray_bottom.xml
@@ -168,11 +168,12 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/tabsTray"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:clipToPadding="false"
         android:scrollbars="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/divider" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index 0659f01c0..c237b8752 100644
--- a/app/src/main/res/layout/tab_tray_item.xml
+++ b/app/src/main/res/layout/tab_tray_item.xml
@@ -7,7 +7,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tab_item"
     android:layout_width="match_parent"
-    android:layout_height="175dp"
+    android:layout_height="165dp"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?android:selectableItemBackground">
@@ -16,8 +16,7 @@
         android:id="@+id/play_pause_button"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="5dp"
+        android:layout_marginTop="23dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/mozac_feature_media_notification_action_pause"
         android:elevation="10dp"
@@ -30,8 +29,8 @@
         android:id="@+id/mozac_browser_tabstray_card"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_tray_thumbnail_height"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="40dp"
+        android:layout_marginHorizontal="7dp"
+        android:layout_marginTop="30dp"
         android:backgroundTint="?tabTrayThumbnailItemBackground"
         app:cardBackgroundColor="@color/photonWhite"
         app:layout_constraintStart_toStartOf="parent"
@@ -80,11 +79,11 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:requiresFadingEdge="horizontal"
-        android:fadingEdgeLength="30dp"
+        android:fadingEdgeLength="25dp"
         android:ellipsize="none"
         android:singleLine="true"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="10dp"
+        android:paddingHorizontal="7dp"
+        android:paddingVertical="5dp"
         android:textColor="@color/tab_tray_item_text_normal_theme"
         android:textSize="14sp"
         android:visibility="visible"