From 9df4610c837a6689d601c124c7d2123ee7f74fce Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 29 Nov 2017 21:47:11 -0500 Subject: [PATCH] Fixed DiffUtilCallback --- .../common/util/AbstractDiffUtilCallback.kt | 33 ------------------- .../presentation/base/FlowableAdapter.kt | 2 +- .../moez/QKSMS/presentation/base/QkAdapter.kt | 31 ++++++++++++----- .../presentation/compose/ChipsAdapter.kt | 6 +++- .../presentation/compose/ContactAdapter.kt | 6 +++- .../presentation/main/ConversationsAdapter.kt | 6 +++- 6 files changed, 39 insertions(+), 45 deletions(-) delete mode 100644 qksms/src/main/java/com/moez/QKSMS/common/util/AbstractDiffUtilCallback.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/AbstractDiffUtilCallback.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/AbstractDiffUtilCallback.kt deleted file mode 100644 index e0a0c535..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/AbstractDiffUtilCallback.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.moez.QKSMS.common.util - -import android.support.v7.util.DiffUtil - -/** - * Abstract implementation of DiffUtil.Callback, which can be used when we don't need - * a detailed change payload - * - * If we need a detailed change payload, this class can be extended and #areContentsTheSame - * and #getChangePayload should overridden - */ -class AbstractDiffUtilCallback( - private val oldList: List, - private val newList: List) : - DiffUtil.Callback() { - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - return oldList[oldItemPosition] === newList[newItemPosition] - } - - override fun getOldListSize(): Int { - return oldList.size - } - - override fun getNewListSize(): Int { - return newList.size - } - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - return oldList[oldItemPosition] == newList[newItemPosition] - } - -} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt index a75e6c7b..3cadb77d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/FlowableAdapter.kt @@ -8,7 +8,7 @@ import io.reactivex.disposables.Disposable * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as * data list handing and item animations */ -abstract class FlowableAdapter(private val flowable: Flowable>) : QkAdapter() { +abstract class FlowableAdapter(private val flowable: Flowable>) : QkAdapter() { private var disposable: Disposable? = null diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt index e6a70747..6c4478c3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt @@ -2,17 +2,16 @@ package com.moez.QKSMS.presentation.base import android.support.v7.util.DiffUtil import android.support.v7.widget.RecyclerView -import com.moez.QKSMS.common.util.AbstractDiffUtilCallback /** * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as * data list handing and item animations */ -abstract class QkAdapter : RecyclerView.Adapter() { +abstract class QkAdapter : RecyclerView.Adapter() { var data: List = ArrayList() set(value) { - val diff = DiffUtil.calculateDiff(provideDiffUtilCallback(field, value)) + val diff = DiffUtil.calculateDiff(getDiffUtilCallback(field, value)) field = value diff.dispatchUpdatesTo(this) onDatasetChanged() @@ -26,16 +25,32 @@ abstract class QkAdapter : RecyclerView.Adapter return data.size } - open fun onDatasetChanged() { - - } + open fun onDatasetChanged() {} /** * Allows the adapter implementation to provide a custom DiffUtil.Callback * If not, then the abstract implementation will be used */ - open fun provideDiffUtilCallback(oldData: List, newData: List): DiffUtil.Callback { - return AbstractDiffUtilCallback(oldData, newData) + private fun getDiffUtilCallback(oldData: List, newData: List): DiffUtil.Callback { + return object : DiffUtil.Callback() { + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = + areItemsTheSame(oldData[oldItemPosition], newData[newItemPosition]) + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = + areContentsTheSame(oldData[oldItemPosition], newData[newItemPosition]) + + override fun getOldListSize() = oldData.size + + override fun getNewListSize() = newData.size + } + } + + open protected fun areItemsTheSame(old: T, new: T): Boolean { + return old == new + } + + open protected fun areContentsTheSame(old: T, new: T): Boolean { + return old == new } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index 0b0707b1..137b71df 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -26,7 +26,7 @@ import kotlinx.android.synthetic.main.contact_chip.view.* class ChipsAdapter( private val context: Context, private val view: RecyclerView) - : QkAdapter() { + : QkAdapter() { companion object { private val TYPE_EDIT_TEXT = 0 @@ -118,4 +118,8 @@ class ChipsAdapter( detailedChipView.hide() } } + + override fun areItemsTheSame(old: Contact, new: Contact): Boolean { + return old.recipientId == new.recipientId + } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt index ecb350a6..ba3af366 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt @@ -12,7 +12,7 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.contact_list_item.view.* -class ContactAdapter(private val context: Context) : QkAdapter() { +class ContactAdapter(private val context: Context) : QkAdapter() { val contactSelected: Subject = PublishSubject.create() @@ -34,4 +34,8 @@ class ContactAdapter(private val context: Context) : QkAdapter>) : FlowableAdapter(flowable) { +class ConversationsAdapter(flowable: Flowable>) : FlowableAdapter(flowable) { @Inject lateinit var context: Context @Inject lateinit var navigator: Navigator @@ -61,4 +61,8 @@ class ConversationsAdapter(flowable: Flowable>) : override fun getItemViewType(position: Int): Int { return if (getItem(position).message.read) 0 else 1 } + + override fun areItemsTheSame(old: ConversationMessagePair, new: ConversationMessagePair): Boolean { + return old.conversation.id == new.conversation.id + } } \ No newline at end of file