From 02207f6cfd9c396889aa1570dc62abb7aa447dbc Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 22 Apr 2020 09:14:30 -0400
Subject: [PATCH] Make entire history item card clickable

---
 .../tachiyomi/ui/recent/history/HistoryAdapter.kt   |  8 +++-----
 .../ui/recent/history/HistoryController.kt          |  4 ++--
 .../tachiyomi/ui/recent/history/HistoryHolder.kt    | 13 +++++++------
 app/src/main/res/layout/history_item.xml            |  4 ++--
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt
index 9bcbce4b43..432b9768c4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt
@@ -20,10 +20,8 @@ class HistoryAdapter(controller: HistoryController) :
     val sourceManager by injectLazy<SourceManager>()
 
     val resumeClickListener: OnResumeClickListener = controller
-
     val removeClickListener: OnRemoveClickListener = controller
-
-    val coverClickListener: OnCoverClickListener = controller
+    val itemClickListener: OnItemClickListener = controller
 
     /**
      * DecimalFormat used to display correct chapter number
@@ -44,7 +42,7 @@ class HistoryAdapter(controller: HistoryController) :
         fun onRemoveClick(position: Int)
     }
 
-    interface OnCoverClickListener {
-        fun onCoverClick(position: Int)
+    interface OnItemClickListener {
+        fun onItemClick(position: Int)
     }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
index c307f46fc3..2c0a4808d6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
@@ -28,7 +28,7 @@ class HistoryController : NucleusController<HistoryControllerBinding, HistoryPre
         FlexibleAdapter.OnUpdateListener,
         HistoryAdapter.OnRemoveClickListener,
         HistoryAdapter.OnResumeClickListener,
-        HistoryAdapter.OnCoverClickListener,
+        HistoryAdapter.OnItemClickListener,
         RemoveHistoryDialog.Listener {
 
     /**
@@ -105,7 +105,7 @@ class HistoryController : NucleusController<HistoryControllerBinding, HistoryPre
         RemoveHistoryDialog(this, manga, history).showDialog(router)
     }
 
-    override fun onCoverClick(position: Int) {
+    override fun onItemClick(position: Int) {
         val manga = adapter?.getItem(position)?.mch?.manga ?: return
         router.pushController(MangaController(manga).withFadeTransaction())
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt
index 5c46149be1..88c9bc10d4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt
@@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.lang.toTimestampString
 import java.util.Date
 import kotlinx.android.synthetic.main.history_item.cover
+import kotlinx.android.synthetic.main.history_item.holder
 import kotlinx.android.synthetic.main.history_item.manga_subtitle
 import kotlinx.android.synthetic.main.history_item.manga_title
 import kotlinx.android.synthetic.main.history_item.remove
@@ -30,16 +31,16 @@ class HistoryHolder(
 ) : BaseFlexibleViewHolder(view, adapter) {
 
     init {
+        holder.setOnClickListener {
+            adapter.itemClickListener.onItemClick(bindingAdapterPosition)
+        }
+
         remove.setOnClickListener {
-            adapter.removeClickListener.onRemoveClick(adapterPosition)
+            adapter.removeClickListener.onRemoveClick(bindingAdapterPosition)
         }
 
         resume.setOnClickListener {
-            adapter.resumeClickListener.onResumeClick(adapterPosition)
-        }
-
-        cover.setOnClickListener {
-            adapter.coverClickListener.onCoverClick(adapterPosition)
+            adapter.resumeClickListener.onResumeClick(bindingAdapterPosition)
         }
     }
 
diff --git a/app/src/main/res/layout/history_item.xml b/app/src/main/res/layout/history_item.xml
index a849691347..acc8a3c2c6 100644
--- a/app/src/main/res/layout/history_item.xml
+++ b/app/src/main/res/layout/history_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/holder"
     style="@style/Theme.Widget.CardView.Item"
     android:padding="0dp">
 
@@ -12,9 +13,7 @@
             android:id="@+id/cover"
             android:layout_width="85dp"
             android:layout_height="match_parent"
-            android:clickable="true"
             android:contentDescription="@string/description_cover"
-            android:focusable="true"
             android:scaleType="centerCrop" />
 
         <RelativeLayout
@@ -32,6 +31,7 @@
                     android:id="@+id/manga_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:ellipsize="end"
                     android:maxLines="2"
                     android:textAppearance="@style/TextAppearance.Medium.Title" />