From 4cbc6392fbc7ea3cccdb77955e030b08c53186ff Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 17 Nov 2021 19:23:08 +0200 Subject: [PATCH] Update AdapterDelegates library --- app/build.gradle | 4 +-- .../kotatsu/base/ui/list/AdapterUpdater.kt | 26 ------------------- .../details/ui/adapter/ChaptersAdapter.kt | 4 --- .../list/ui/adapter/MangaListAdapter.kt | 4 --- .../reader/ui/pager/BaseReaderAdapter.kt | 4 --- 5 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterUpdater.kt diff --git a/app/build.gradle b/app/build.gradle index 9210057d4..bf5d626a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,8 +93,8 @@ dependencies { implementation 'com.squareup.okio:okio:2.10.0' implementation 'org.jsoup:jsoup:1.14.3' - implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.0' - implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.0' + implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.1' + implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.1' implementation 'io.insert-koin:koin-android:3.1.3' implementation 'io.coil-kt:coil-base:1.4.0' diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterUpdater.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterUpdater.kt deleted file mode 100644 index 9e238487a..000000000 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/AdapterUpdater.kt +++ /dev/null @@ -1,26 +0,0 @@ -package org.koitharu.kotatsu.base.ui.list - -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import java.util.* - -@Deprecated("") -class AdapterUpdater(oldList: List, newList: List, getId: (T) -> Long) { - - private val diff = DiffUtil.calculateDiff(object : DiffUtil.Callback() { - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = - getId(oldList[oldItemPosition]) == getId(newList[newItemPosition]) - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = - Objects.equals(oldList[oldItemPosition], newList[newItemPosition]) - - override fun getOldListSize() = oldList.size - - override fun getNewListSize() = newList.size - }) - - operator fun invoke(adapter: RecyclerView.Adapter<*>) { - diff.dispatchUpdatesTo(adapter) - } -} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt index 46dc930d1..855f0f4e9 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/adapter/ChaptersAdapter.kt @@ -19,10 +19,6 @@ class ChaptersAdapter( return items[position].chapter.id } - fun setItems(newItems: List, callback: Runnable) { - differ.submitList(newItems, callback) - } - private class DiffCallback : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: ChapterListItem, newItem: ChapterListItem): Boolean { diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt index cc4c80967..61cd60c03 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt @@ -43,10 +43,6 @@ class MangaListAdapter( .addDelegate(ITEM_TYPE_FILTER, currentFilterAD(onTagRemoveClick)) } - fun setItems(list: List, commitCallback: Runnable) { - differ.submitList(list, commitCallback) - } - private class DiffCallback : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel) = when { diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt index c44a5a1c0..b6adc87b1 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt @@ -47,10 +47,6 @@ abstract class BaseReaderAdapter>( viewType: Int ): H = onCreateViewHolder(parent, loader, settings, exceptionResolver) - fun setItems(items: List, callback: Runnable) { - differ.submitList(items, callback) - } - suspend fun setItems(items: List) = suspendCoroutine { cont -> differ.submitList(items) { cont.resume(Unit)