Refactor adapters

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -47,6 +47,7 @@ import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.image.ui.ImageActivity
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.adapter.mangaGridItemAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaItemModel
 import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
@@ -207,7 +208,9 @@ class DetailsFragment :
 			return
 		}
 		val rv = viewBinding?.recyclerViewRelated ?: return
-		val adapter = (rv.adapter as? BaseListAdapter) ?: BaseListAdapter(
+
+		@Suppress("UNCHECKED_CAST")
+		val adapter = (rv.adapter as? BaseListAdapter<ListModel>) ?: BaseListAdapter(
 			mangaGridItemAD(
 				coil, viewLifecycleOwner,
 				StaticItemSizeResolver(resources.getDimensionPixelSize(R.dimen.smaller_grid_width)),

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt

@@ -1,16 +1,14 @@
 package org.koitharu.kotatsu.details.ui.adapter
 
 import android.content.Context
-import androidx.recyclerview.widget.DiffUtil
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
-import kotlin.jvm.internal.Intrinsics
 
 class ChaptersAdapter(
 	onItemClickListener: OnListItemClickListener<ChapterListItem>,
-) : AsyncListDifferDelegationAdapter<ChapterListItem>(DiffCallback()), FastScroller.SectionIndexer {
+) : BaseListAdapter<ChapterListItem>(), FastScroller.SectionIndexer {
 
 	init {
 		setHasStableIds(true)
@@ -21,27 +19,6 @@ class ChaptersAdapter(
 		return items[position].chapter.id
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<ChapterListItem>() {
-
-		override fun areItemsTheSame(oldItem: ChapterListItem, newItem: ChapterListItem): Boolean {
-			return oldItem.chapter.id == newItem.chapter.id
-		}
-
-		override fun areContentsTheSame(
-			oldItem: ChapterListItem,
-			newItem: ChapterListItem
-		): Boolean {
-			return Intrinsics.areEqual(oldItem, newItem)
-		}
-
-		override fun getChangePayload(oldItem: ChapterListItem, newItem: ChapterListItem): Any? {
-			if (oldItem.flags != newItem.flags && oldItem.chapter == newItem.chapter) {
-				return newItem.flags
-			}
-			return null
-		}
-	}
-
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
 		val item = items.getOrNull(position) ?: return null
 		return item.chapter.number.toString()

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt

@@ -1,13 +1,14 @@
 package org.koitharu.kotatsu.details.ui.model
 
 import android.text.format.DateUtils
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
 class ChapterListItem(
 	val chapter: MangaChapter,
 	val flags: Int,
 	private val uploadDateMs: Long,
-) {
+) : ListModel {
 
 	var uploadDate: CharSequence? = null
 		private set
@@ -50,6 +51,21 @@ class ChapterListItem(
 		return (flags and flag) == flag
 	}
 
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is ChapterListItem && chapter.id == other.chapter.id
+	}
+
+	override fun getChangePayload(previousState: ListModel): Any? {
+		if (previousState !is ChapterListItem) {
+			return super.getChangePayload(previousState)
+		}
+		return if (chapter == previousState.chapter && flags != previousState.flags) {
+			flags
+		} else {
+			super.getChangePayload(previousState)
+		}
+	}
+
 	override fun equals(other: Any?): Boolean {
 		if (this === other) return true
 		if (javaClass != other?.javaClass) return false

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrollingInfoAdapter.kt

@@ -3,15 +3,14 @@ package org.koitharu.kotatsu.details.ui.scrobbling
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class ScrollingInfoAdapter(
 	lifecycleOwner: LifecycleOwner,
 	coil: ImageLoader,
 	fragmentManager: FragmentManager,
-) : AsyncListDifferDelegationAdapter<ListModel>(ListModelDiffCallback) {
+) : BaseListAdapter<ListModel>() {
 
 	init {
 		delegatesManager.addDelegate(scrobblingInfoAD(lifecycleOwner, coil, fragmentManager))