Refactor ListModel

app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedViewModel.kt

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
@@ -75,7 +76,7 @@ class FeedViewModel @Inject constructor(
 		for (item in this) {
 			val date = timeAgo(item.createdAt)
 			if (prevDate != date) {
-				destination += date
+				destination += ListHeader(date, 0, null)
 			}
 			prevDate = date
 			destination += item.toFeedItem()

app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/FeedAdapter.kt

@@ -2,38 +2,34 @@ package org.koitharu.kotatsu.tracker.ui.feed.adapter
 
 import android.content.Context
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
+import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.errorFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.adapter.relatedDateItemAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.tracker.ui.feed.model.FeedItem
-import kotlin.jvm.internal.Intrinsics
 
 class FeedAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: MangaListListener,
-) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()), FastScroller.SectionIndexer {
+) : AsyncListDifferDelegationAdapter<ListModel>(ListModelDiffCallback), FastScroller.SectionIndexer {
 
 	init {
-		delegatesManager
-			.addDelegate(ITEM_TYPE_FEED, feedItemAD(coil, lifecycleOwner, listener))
+		delegatesManager.addDelegate(ITEM_TYPE_FEED, feedItemAD(coil, lifecycleOwner, listener))
 			.addDelegate(ITEM_TYPE_LOADING_FOOTER, loadingFooterAD())
 			.addDelegate(ITEM_TYPE_LOADING_STATE, loadingStateAD())
 			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(listener))
 			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
+			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD(listener))
 			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, lifecycleOwner, listener))
-			.addDelegate(ITEM_TYPE_DATE_HEADER, relatedDateItemAD())
 	}
 
 	override fun getSectionText(context: Context, position: Int): CharSequence? {
@@ -47,29 +43,6 @@ class FeedAdapter(
 		return null
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
-
-		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel) = when {
-			oldItem is FeedItem && newItem is FeedItem -> {
-				oldItem.id == newItem.id
-			}
-
-			oldItem is DateTimeAgo && newItem is DateTimeAgo -> {
-				oldItem == newItem
-			}
-
-			oldItem is LoadingFooter && newItem is LoadingFooter -> {
-				oldItem.key == newItem.key
-			}
-
-			else -> oldItem.javaClass == newItem.javaClass
-		}
-
-		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
-			return Intrinsics.areEqual(oldItem, newItem)
-		}
-	}
-
 	companion object {
 
 		const val ITEM_TYPE_FEED = 0

app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/model/FeedItem.kt

@@ -3,11 +3,40 @@ package org.koitharu.kotatsu.tracker.ui.feed.model
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
-data class FeedItem(
+class FeedItem(
 	val id: Long,
 	val imageUrl: String,
 	val title: String,
 	val manga: Manga,
 	val count: Int,
 	val isNew: Boolean,
-) : ListModel
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is FeedItem && other.id == id
+	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as FeedItem
+
+		if (id != other.id) return false
+		if (imageUrl != other.imageUrl) return false
+		if (title != other.title) return false
+		if (manga != other.manga) return false
+		if (count != other.count) return false
+		return isNew == other.isNew
+	}
+
+	override fun hashCode(): Int {
+		var result = id.hashCode()
+		result = 31 * result + imageUrl.hashCode()
+		result = 31 * result + title.hashCode()
+		result = 31 * result + manga.hashCode()
+		result = 31 * result + count
+		result = 31 * result + isNew.hashCode()
+		return result
+	}
+}