From 5ddf8beea7432826e20ca4e46e8bba29338f0ef2 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Thu, 30 Jul 2020 14:44:41 -0700
Subject: [PATCH] Fix suggestions, extract layout for tab history

---
 .../org/mozilla/fenix/tabhistory/TabHistoryAdapter.kt |  2 +-
 .../org/mozilla/fenix/tabhistory/TabHistoryView.kt    |  1 -
 .../mozilla/fenix/tabhistory/TabHistoryViewHolder.kt  |  6 ++++--
 app/src/main/res/layout/tab_history_list_item.xml     | 11 +++++++++++
 .../fenix/tabhistory/TabHistoryViewHolderTest.kt      |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout/tab_history_list_item.xml

diff --git a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryAdapter.kt
index d47519ea7..96e130079 100644
--- a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryAdapter.kt
@@ -23,7 +23,7 @@ class TabHistoryAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TabHistoryViewHolder {
         val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.history_list_item, parent, false)
+            .inflate(R.layout.tab_history_list_item, parent, false)
         return TabHistoryViewHolder(view, interactor)
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryView.kt b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryView.kt
index cb87a40a5..c7e2e3004 100644
--- a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryView.kt
@@ -57,7 +57,6 @@ class TabHistoryView(
     init {
         tabHistoryRecyclerView.adapter = adapter
         tabHistoryRecyclerView.layoutManager = layoutManager
-        tabHistoryRecyclerView.itemAnimator = null
     }
 
     fun updateState(state: BrowserState) {
diff --git a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolder.kt
index 1db9bdada..cfa2cc81a 100644
--- a/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolder.kt
@@ -7,7 +7,8 @@ package org.mozilla.fenix.tabhistory
 import android.view.View
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
-import kotlinx.android.synthetic.main.history_list_item.*
+import androidx.core.view.isVisible
+import kotlinx.android.synthetic.main.tab_history_list_item.*
 import org.mozilla.fenix.library.LibrarySiteItemView
 import org.mozilla.fenix.utils.view.ViewHolder
 
@@ -19,13 +20,14 @@ class TabHistoryViewHolder(
     private lateinit var item: TabHistoryItem
 
     init {
-        itemView.setOnClickListener { interactor.goToHistoryItem(item) }
+        history_layout.setOnClickListener { interactor.goToHistoryItem(item) }
     }
 
     fun bind(item: TabHistoryItem) {
         this.item = item
 
         history_layout.displayAs(LibrarySiteItemView.ItemType.SITE)
+        history_layout.overflowView.isVisible = false
         history_layout.urlView.text = item.url
         history_layout.loadFavicon(item.url)
 
diff --git a/app/src/main/res/layout/tab_history_list_item.xml b/app/src/main/res/layout/tab_history_list_item.xml
new file mode 100644
index 000000000..3bdef8369
--- /dev/null
+++ b/app/src/main/res/layout/tab_history_list_item.xml
@@ -0,0 +1,11 @@
+<?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/. -->
+<org.mozilla.fenix.library.LibrarySiteItemView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/history_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/library_item_height" />
+
diff --git a/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolderTest.kt
index e3013d60e..e6598c1b9 100644
--- a/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryViewHolderTest.kt
@@ -28,7 +28,7 @@ class TabHistoryViewHolderTest {
         MockKAnnotations.init(this)
         onClick = slot()
 
-        every { view.setOnClickListener(capture(onClick)) } just Runs
+        every { siteItemView.setOnClickListener(capture(onClick)) } just Runs
         every { view.findViewById<LibrarySiteItemView>(R.id.history_layout) } returns siteItemView
 
         holder = TabHistoryViewHolder(view, interactor)