From 340e8ca82f9a6a1b6147054988998770d03b6d0f Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Tue, 5 Nov 2019 01:51:00 +0100
Subject: [PATCH] Show the header when the history is empty (#2148)

---
 .../vrbrowser/ui/views/HistoryView.java       |  3 +-
 app/src/main/res/layout/bookmarks.xml         | 58 ++++++++--------
 app/src/main/res/layout/bookmarks_narrow.xml  |  7 +-
 app/src/main/res/layout/bookmarks_wide.xml    |  7 +-
 app/src/main/res/layout/history.xml           | 66 +++++++++----------
 app/src/main/res/layout/history_narrow.xml    | 10 +--
 app/src/main/res/layout/history_wide.xml      | 10 +--
 7 files changed, 69 insertions(+), 92 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java
index e94e1c784..bcc344a22 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java
@@ -277,14 +277,13 @@ private void updateHistory() {
         date.set(Calendar.SECOND, 0);
         date.set(Calendar.MILLISECOND, 0);
 
-        long currentTime = System.currentTimeMillis();
         long todayLimit = date.getTimeInMillis();
         long yesterdayLimit = todayLimit - SystemUtils.ONE_DAY_MILLIS;
         long oneWeekLimit = todayLimit - SystemUtils.ONE_WEEK_MILLIS;
 
         SessionStore.get().getHistoryStore().getDetailedHistory().thenAcceptAsync((items) -> {
             List<VisitInfo> orderedItems = items.stream()
-                    .sorted(Comparator.comparing((VisitInfo mps) -> mps.getVisitTime())
+                    .sorted(Comparator.comparing(VisitInfo::getVisitTime)
                     .reversed())
                     .collect(Collectors.toList());
 
diff --git a/app/src/main/res/layout/bookmarks.xml b/app/src/main/res/layout/bookmarks.xml
index dee36fd90..3e34adb8c 100644
--- a/app/src/main/res/layout/bookmarks.xml
+++ b/app/src/main/res/layout/bookmarks.xml
@@ -47,6 +47,34 @@
         android:paddingTop="30dp"
         android:paddingBottom="30dp">
 
+        <include layout="@layout/bookmarks_narrow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="20dp"
+            app:isEmpty="@{isEmpty}"
+            app:isSignedIn="@{isSignedIn}"
+            app:isSyncEnabled="@{isSyncEnabled}"
+            app:lastSync="@{lastSync}"
+            app:isSyncing="@{isSyncing}"
+            app:isNarrow="@{isNarrow}"
+            app:callback="@{callback}"/>
+
+        <include layout="@layout/bookmarks_wide"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="20dp"
+            app:isEmpty="@{isEmpty}"
+            app:isSignedIn="@{isSignedIn}"
+            app:isSyncEnabled="@{isSyncEnabled}"
+            app:lastSync="@{lastSync}"
+            app:isSyncing="@{isSyncing}"
+            app:isNarrow="@{isNarrow}"
+            app:callback="@{callback}"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -101,36 +129,6 @@
             android:visibility="gone"
             app:visibleGone="@{isLoading}" />
 
-        <include layout="@layout/bookmarks_narrow"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="50dp"
-            android:layout_marginBottom="20dp"
-            app:isLoading="@{isLoading}"
-            app:isEmpty="@{isEmpty}"
-            app:isSignedIn="@{isSignedIn}"
-            app:isSyncEnabled="@{isSyncEnabled}"
-            app:lastSync="@{lastSync}"
-            app:isSyncing="@{isSyncing}"
-            app:isNarrow="@{isNarrow}"
-            app:callback="@{callback}"/>
-
-        <include layout="@layout/bookmarks_wide"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="50dp"
-            android:layout_marginBottom="20dp"
-            app:isLoading="@{isLoading}"
-            app:isEmpty="@{isEmpty}"
-            app:isSignedIn="@{isSignedIn}"
-            app:isSyncEnabled="@{isSyncEnabled}"
-            app:lastSync="@{lastSync}"
-            app:isSyncing="@{isSyncing}"
-            app:isNarrow="@{isNarrow}"
-            app:callback="@{callback}"/>
-
         <org.mozilla.vrbrowser.ui.views.CustomRecyclerView
             android:id="@+id/bookmarks_list"
             style="@style/customRecyclerViewStyle"
diff --git a/app/src/main/res/layout/bookmarks_narrow.xml b/app/src/main/res/layout/bookmarks_narrow.xml
index ee10c5220..cf2c2da19 100644
--- a/app/src/main/res/layout/bookmarks_narrow.xml
+++ b/app/src/main/res/layout/bookmarks_narrow.xml
@@ -3,11 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
-        <variable
-            name="isLoading"
-            type="boolean" />
-
         <variable
             name="isEmpty"
             type="boolean" />
@@ -41,7 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:visibleGone="@{isNarrow &amp;&amp; !isLoading &amp;&amp; !isEmpty}">
+        app:visibleGone="@{isNarrow}">
 
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bookmarks_wide.xml b/app/src/main/res/layout/bookmarks_wide.xml
index b19c07e79..822cc6e8e 100644
--- a/app/src/main/res/layout/bookmarks_wide.xml
+++ b/app/src/main/res/layout/bookmarks_wide.xml
@@ -3,11 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
-        <variable
-            name="isLoading"
-            type="boolean" />
-
         <variable
             name="isEmpty"
             type="boolean" />
@@ -40,7 +35,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:visibleGone="@{!isNarrow &amp;&amp; !isLoading &amp;&amp; !isEmpty}">
+        app:visibleGone="@{!isNarrow}">
 
         <FrameLayout
             android:id="@+id/buttons_layout"
diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml
index f63521a13..66d0b24f3 100644
--- a/app/src/main/res/layout/history.xml
+++ b/app/src/main/res/layout/history.xml
@@ -46,6 +46,38 @@
         android:paddingTop="30dp"
         android:paddingBottom="30dp">
 
+        <include
+            android:id="@+id/history_narrow"
+            layout="@layout/history_narrow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="20dp"
+            app:isEmpty="@{isEmpty}"
+            app:isSignedIn="@{isSignedIn}"
+            app:isSyncEnabled="@{isSyncEnabled}"
+            app:lastSync="@{lastSync}"
+            app:isSyncing="@{isSyncing}"
+            app:isNarrow="@{isNarrow}"
+            app:callback="@{callback}" />
+
+        <include
+            android:id="@+id/history_wide"
+            layout="@layout/history_wide"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="20dp"
+            app:isEmpty="@{isEmpty}"
+            app:isSignedIn="@{isSignedIn}"
+            app:isSyncEnabled="@{isSyncEnabled}"
+            app:lastSync="@{lastSync}"
+            app:isSyncing="@{isSyncing}"
+            app:isNarrow="@{isNarrow}"
+            app:callback="@{callback}" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -97,40 +129,6 @@
             android:visibility="gone"
             app:visibleGone="@{isLoading}" />
 
-        <include
-            android:id="@+id/history_narrow"
-            layout="@layout/history_narrow"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="50dp"
-            android:layout_marginBottom="20dp"
-            app:isLoading="@{isLoading}"
-            app:isEmpty="@{isEmpty}"
-            app:isSignedIn="@{isSignedIn}"
-            app:isSyncEnabled="@{isSyncEnabled}"
-            app:lastSync="@{lastSync}"
-            app:isSyncing="@{isSyncing}"
-            app:isNarrow="@{isNarrow}"
-            app:callback="@{callback}" />
-
-        <include
-            android:id="@+id/history_wide"
-            layout="@layout/history_wide"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginEnd="50dp"
-            android:layout_marginBottom="20dp"
-            app:isLoading="@{isLoading}"
-            app:isEmpty="@{isEmpty}"
-            app:isSignedIn="@{isSignedIn}"
-            app:isSyncEnabled="@{isSyncEnabled}"
-            app:lastSync="@{lastSync}"
-            app:isSyncing="@{isSyncing}"
-            app:isNarrow="@{isNarrow}"
-            app:callback="@{callback}" />
-
         <org.mozilla.vrbrowser.ui.views.CustomRecyclerView
             android:id="@+id/history_list"
             style="@style/customRecyclerViewStyle"
diff --git a/app/src/main/res/layout/history_narrow.xml b/app/src/main/res/layout/history_narrow.xml
index eac8c2b08..d66ac4b89 100644
--- a/app/src/main/res/layout/history_narrow.xml
+++ b/app/src/main/res/layout/history_narrow.xml
@@ -3,11 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
-        <variable
-            name="isLoading"
-            type="boolean" />
-
         <variable
             name="isEmpty"
             type="boolean" />
@@ -41,7 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:visibleGone="@{isNarrow &amp;&amp; !isLoading &amp;&amp; !isEmpty}">
+        app:visibleGone="@{isNarrow}">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -87,7 +82,8 @@
                 android:text="@string/history_clear"
                 android:textColor="@color/library_panel_button_text_color"
                 android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:enabled="@{!isEmpty}"/>
         </RelativeLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/history_wide.xml b/app/src/main/res/layout/history_wide.xml
index 03600f818..ea6cd42ba 100644
--- a/app/src/main/res/layout/history_wide.xml
+++ b/app/src/main/res/layout/history_wide.xml
@@ -3,11 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
-        <variable
-            name="isLoading"
-            type="boolean" />
-
         <variable
             name="isEmpty"
             type="boolean" />
@@ -41,7 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:visibleGone="@{!isNarrow &amp;&amp; !isLoading &amp;&amp; !isEmpty}">
+        app:visibleGone="@{!isNarrow}">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -174,7 +169,8 @@
                 android:text="@string/history_clear"
                 android:textColor="@color/library_panel_button_text_color"
                 android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:enabled="@{!isEmpty}"/>
         </RelativeLayout>
 
     </LinearLayout>