[fenix] For https://github.com/mozilla-mobile/fenix/issues/15112 - Still show recently closed when history empty

app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt

@@ -12,8 +12,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import kotlinx.android.synthetic.main.component_history.*
 import kotlinx.android.synthetic.main.component_history.view.*
+import kotlinx.android.synthetic.main.recently_closed_nav_item.*
 import mozilla.components.support.base.feature.UserInteractionHandler
 import org.mozilla.fenix.R
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.library.LibraryPageView
 import org.mozilla.fenix.library.SelectionInteractor
 import org.mozilla.fenix.theme.ThemeManager
@@ -164,6 +166,19 @@ class HistoryView(
     fun updateEmptyState(userHasHistory: Boolean) {
         history_list.isVisible = userHasHistory
         history_empty_view.isVisible = !userHasHistory
+        recently_closed_nav_empty.apply {
+            setOnClickListener {
+                interactor.onRecentlyClosedClicked()
+            }
+            val numRecentTabs = view.context.components.core.store.state.closedTabs.size
+            recently_closed_tabs_description.text = String.format(
+                view.context.getString(
+                    if (numRecentTabs == 1)
+                        R.string.recently_closed_tab else R.string.recently_closed_tabs
+                ), numRecentTabs
+            )
+            isVisible = !userHasHistory
+        }
         if (!userHasHistory) {
             history_empty_view.announceForAccessibility(context.getString(R.string.history_empty_message))
         }

app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt

@@ -5,10 +5,12 @@
 package org.mozilla.fenix.library.history.viewholders
 
 import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.history_list_item.view.*
 import kotlinx.android.synthetic.main.library_site_item.view.*
+import kotlinx.android.synthetic.main.recently_closed_nav_item.view.*
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.hideAndDisable
@@ -41,7 +43,7 @@ class HistoryListItemViewHolder(
             }
         }
 
-        itemView.recently_closed.setOnClickListener {
+        itemView.findViewById<ConstraintLayout>(R.id.recently_closed_nav).setOnClickListener {
             historyInteractor.onRecentlyClosedClicked()
         }
     }
@@ -115,9 +117,9 @@ class HistoryListItemViewHolder(
                         R.string.recently_closed_tab else R.string.recently_closed_tabs
                 ), numRecentTabs
             )
-            itemView.recently_closed.isVisible = true
+            itemView.findViewById<ConstraintLayout>(R.id.recently_closed_nav).isVisible = true
         } else {
-            itemView.recently_closed.visibility = View.GONE
+            itemView.findViewById<ConstraintLayout>(R.id.recently_closed_nav).visibility = View.GONE
             itemView.delete_button.visibility = View.GONE
         }
     }

app/src/main/res/layout/component_history.xml

@@ -2,23 +2,30 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/history_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <ProgressBar
         android:id="@+id/progress_bar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:indeterminate="true"
         android:layout_width="match_parent"
         android:layout_height="8dp"
+        android:indeterminate="true"
         android:translationY="-3dp"
         android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/recently_closed_nav_empty"
+        layout="@layout/recently_closed_nav_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/progress_bar" />
 
     <TextView
         android:id="@+id/history_empty_view"
@@ -29,21 +36,24 @@
         android:textColor="?secondaryText"
         android:textSize="16sp"
         android:visibility="gone"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recently_closed_nav_empty" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recently_closed_nav_empty">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/history_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scrollbars="vertical"
-            tools:listitem="@layout/history_list_item"/>
+            android:visibility="gone"
+            tools:listitem="@layout/history_list_item" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/history_list_item.xml

@@ -3,7 +3,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <LinearLayout 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"
@@ -16,63 +15,7 @@
         android:text="@string/history_delete_all"
         android:visibility="gone" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:visibility="gone"
-        android:id="@+id/recently_closed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:minHeight="@dimen/library_item_height">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/icon"
-            android:layout_width="@dimen/history_favicon_width_height"
-            android:layout_height="@dimen/history_favicon_width_height"
-            android:layout_marginStart="20dp"
-            android:importantForAccessibility="no"
-            android:padding="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_multiple_tabs" />
-
-        <TextView
-            android:id="@+id/recently_closed_tabs_header"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:text="@string/library_recently_closed_tabs"
-            android:textAlignment="viewStart"
-            android:textColor="?primaryText"
-            android:textSize="18sp"
-            app:layout_constraintBottom_toTopOf="@+id/recently_closed_tabs_description"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/icon"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_goneMarginEnd="@dimen/library_item_icon_margin_horizontal" />
-
-        <TextView
-            android:id="@+id/recently_closed_tabs_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:textAlignment="viewStart"
-            android:textColor="?secondaryText"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/icon"
-            app:layout_constraintTop_toBottomOf="@id/recently_closed_tabs_header"
-            app:layout_goneMarginEnd="@dimen/library_item_icon_margin_horizontal"
-            tools:text="2 tabs" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <include layout="@layout/recently_closed_nav_item" />
 
     <TextView
         android:id="@+id/header_title"

app/src/main/res/layout/recently_closed_nav_item.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/recently_closed_nav"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:minHeight="@dimen/library_item_height"
+    android:visibility="gone"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/history_favicon_width_height"
+        android:layout_height="@dimen/history_favicon_width_height"
+        android:layout_marginStart="20dp"
+        android:importantForAccessibility="no"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_multiple_tabs" />
+
+    <TextView
+        android:id="@+id/recently_closed_tabs_header"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/library_recently_closed_tabs"
+        android:textAlignment="viewStart"
+        android:textColor="?primaryText"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/recently_closed_tabs_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginEnd="@dimen/library_item_icon_margin_horizontal" />
+
+    <TextView
+        android:id="@+id/recently_closed_tabs_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAlignment="viewStart"
+        android:textColor="?secondaryText"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintTop_toBottomOf="@id/recently_closed_tabs_header"
+        app:layout_goneMarginEnd="@dimen/library_item_icon_margin_horizontal"
+        tools:text="2 tabs" />
+</androidx.constraintlayout.widget.ConstraintLayout>