Implement click events for chapter download icons

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt

@@ -1,15 +1,15 @@
 package eu.kanade.tachiyomi.ui.recent.updates
 
 import android.content.Context
-import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.manga.chapter.base.BaseChaptersAdapter
 import eu.kanade.tachiyomi.util.system.getResourceColor
 
 class UpdatesAdapter(
     val controller: UpdatesController,
     context: Context
-) : FlexibleAdapter<IFlexible<*>>(null, controller, true) {
+) : BaseChaptersAdapter<IFlexible<*>>(controller) {
 
     var readColor = context.getResourceColor(R.attr.colorOnSurface, 0.38f)
     var unreadColor = context.getResourceColor(R.attr.colorOnSurface)

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt

@@ -13,6 +13,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.download.DownloadService
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService
 import eu.kanade.tachiyomi.data.notification.Notifications
@@ -23,6 +24,7 @@ import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.ui.manga.chapter.base.BaseChaptersAdapter
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.system.notificationManager
 import eu.kanade.tachiyomi.util.system.toast
@@ -45,6 +47,7 @@ class UpdatesController :
     FlexibleAdapter.OnItemClickListener,
     FlexibleAdapter.OnItemLongClickListener,
     FlexibleAdapter.OnUpdateListener,
+    BaseChaptersAdapter.OnChapterClickListener,
     ConfirmDeleteChaptersDialog.Listener,
     UpdatesAdapter.OnCoverClickListener {
 
@@ -291,6 +294,22 @@ class UpdatesController :
         Timber.e(error)
     }
 
+    override fun downloadChapter(position: Int) {
+        val item = adapter?.getItem(position) as? UpdatesItem ?: return
+        if (item.status == Download.State.ERROR) {
+            DownloadService.start(activity!!)
+        } else {
+            downloadChapters(listOf(item))
+        }
+        adapter?.updateItem(item)
+    }
+
+    override fun deleteChapter(position: Int) {
+        val item = adapter?.getItem(position) as? UpdatesItem ?: return
+        deleteChapters(listOf(item))
+        adapter?.updateItem(item)
+    }
+
     /**
      * Called when ActionMode created.
      * @param mode the ActionMode object

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt

@@ -6,12 +6,12 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
-import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
 import eu.kanade.tachiyomi.databinding.UpdatesItemBinding
 import eu.kanade.tachiyomi.source.LocalSource
+import eu.kanade.tachiyomi.ui.manga.chapter.base.BaseChapterHolder
 
 /**
  * Holder that contains chapter item
@@ -23,7 +23,7 @@ import eu.kanade.tachiyomi.source.LocalSource
  * @constructor creates a new recent chapter holder.
  */
 class UpdatesHolder(private val view: View, private val adapter: UpdatesAdapter) :
-    FlexibleViewHolder(view, adapter) {
+    BaseChapterHolder(view, adapter) {
 
     private val binding = UpdatesItemBinding.bind(view)
 
@@ -31,6 +31,8 @@ class UpdatesHolder(private val view: View, private val adapter: UpdatesAdapter)
         binding.mangaCover.setOnClickListener {
             adapter.coverClickListener.onCoverClick(bindingAdapterPosition)
         }
+
+        binding.download.setOnClickListener { onDownloadClick(it) }
     }
 
     fun bind(item: UpdatesItem) {

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesItem.kt

@@ -3,37 +3,15 @@ package eu.kanade.tachiyomi.ui.recent.updates
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.download.model.Download
-import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.ui.manga.chapter.base.BaseChapterItem
 import eu.kanade.tachiyomi.ui.recent.DateSectionItem
 
-class UpdatesItem(val chapter: Chapter, val manga: Manga, header: DateSectionItem) :
-    AbstractSectionableItem<UpdatesHolder, DateSectionItem>(header) {
-
-    private var _status: Download.State = Download.State.NOT_DOWNLOADED
-
-    var status: Download.State
-        get() = download?.status ?: _status
-        set(value) {
-            _status = value
-        }
-
-    val progress: Int
-        get() {
-            val pages = download?.pages ?: return 0
-            return pages.map(Page::progress).average().toInt()
-        }
-
-    @Transient
-    var download: Download? = null
-
-    val isDownloaded: Boolean
-        get() = status == Download.State.DOWNLOADED
+class UpdatesItem(chapter: Chapter, val manga: Manga, header: DateSectionItem) :
+    BaseChapterItem<UpdatesHolder, DateSectionItem>(chapter, header) {
 
     override fun getLayoutRes(): Int {
         return R.layout.updates_item
@@ -51,16 +29,4 @@ class UpdatesItem(val chapter: Chapter, val manga: Manga, header: DateSectionIte
     ) {
         holder.bind(this)
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other is UpdatesItem) {
-            return chapter.id!! == other.chapter.id!!
-        }
-        return false
-    }
-
-    override fun hashCode(): Int {
-        return chapter.id!!.hashCode()
-    }
 }