AboutPageAdapter doesn't use notifyDataSetChanged()
We make the AboutPageAdapter inherit from a ListAdapter so that we don't use notifyDataSetChanged().master
parent
180652deab
commit
3dcfed3761
|
@ -64,7 +64,7 @@ class AboutFragment : Fragment(), AboutPageListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
populateAboutHeader()
|
populateAboutHeader()
|
||||||
aboutPageAdapter.updateData(populateAboutList())
|
aboutPageAdapter.submitList(populateAboutList())
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun populateAboutHeader() {
|
private fun populateAboutHeader() {
|
||||||
|
|
|
@ -6,33 +6,33 @@ package org.mozilla.fenix.settings.about
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.annotation.VisibleForTesting
|
import androidx.recyclerview.widget.DiffUtil
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.ListAdapter
|
||||||
import org.mozilla.fenix.settings.about.viewholders.AboutItemViewHolder
|
import org.mozilla.fenix.settings.about.viewholders.AboutItemViewHolder
|
||||||
|
|
||||||
class AboutPageAdapter(private val listener: AboutPageListener) : RecyclerView.Adapter<AboutItemViewHolder>() {
|
class AboutPageAdapter(private val listener: AboutPageListener) :
|
||||||
|
ListAdapter<AboutPageItem, AboutItemViewHolder>(DiffCallback) {
|
||||||
@VisibleForTesting
|
|
||||||
var aboutList: List<AboutPageItem>? = null
|
|
||||||
|
|
||||||
fun updateData(items: List<AboutPageItem>) {
|
|
||||||
this.aboutList = items
|
|
||||||
notifyDataSetChanged()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AboutItemViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AboutItemViewHolder {
|
||||||
val view = LayoutInflater.from(parent.context)
|
val view = LayoutInflater.from(parent.context)
|
||||||
.inflate(AboutItemViewHolder.LAYOUT_ID, parent, false)
|
.inflate(AboutItemViewHolder.LAYOUT_ID, parent, false)
|
||||||
|
|
||||||
return AboutItemViewHolder(view, listener)
|
return AboutItemViewHolder(view, listener)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getItemCount(): Int = aboutList?.size ?: 0
|
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: AboutItemViewHolder, position: Int) {
|
override fun onBindViewHolder(holder: AboutItemViewHolder, position: Int) {
|
||||||
(aboutList?.get(position) as AboutPageItem.Item).also {
|
holder.bind(getItem(position) as AboutPageItem.Item)
|
||||||
holder.bind(it)
|
}
|
||||||
}
|
|
||||||
|
private object DiffCallback : DiffUtil.ItemCallback<AboutPageItem>() {
|
||||||
|
|
||||||
|
override fun areItemsTheSame(oldItem: AboutPageItem, newItem: AboutPageItem) =
|
||||||
|
oldItem === newItem
|
||||||
|
|
||||||
|
override fun areContentsTheSame(oldItem: AboutPageItem, newItem: AboutPageItem) =
|
||||||
|
when (oldItem) {
|
||||||
|
is AboutPageItem.Item ->
|
||||||
|
newItem is AboutPageItem.Item && oldItem.title == newItem.title
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,20 +38,6 @@ class AboutPageAdapterTest {
|
||||||
)
|
)
|
||||||
private val listener: AboutPageListener = mockk(relaxed = true)
|
private val listener: AboutPageListener = mockk(relaxed = true)
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `updateData should set the new data and call notifyDataSetChanged()`() {
|
|
||||||
val adapter = spyk(AboutPageAdapter(listener), recordPrivateCalls = true)
|
|
||||||
every { adapter.notifyDataSetChanged() } just Runs
|
|
||||||
|
|
||||||
adapter.updateData(aboutList)
|
|
||||||
|
|
||||||
// Wasn't able to test in verify block the 'adapter.aboutList' setter from the updateData method
|
|
||||||
assertThat(adapter.aboutList).isEqualTo(aboutList)
|
|
||||||
verify {
|
|
||||||
adapter.notifyDataSetChanged()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `getItemCount on a default instantiated Adapter should return 0`() {
|
fun `getItemCount on a default instantiated Adapter should return 0`() {
|
||||||
val adapter = AboutPageAdapter(listener)
|
val adapter = AboutPageAdapter(listener)
|
||||||
|
@ -63,7 +49,7 @@ class AboutPageAdapterTest {
|
||||||
fun `getItemCount after updateData() call should return the correct list size`() {
|
fun `getItemCount after updateData() call should return the correct list size`() {
|
||||||
val adapter = AboutPageAdapter(listener)
|
val adapter = AboutPageAdapter(listener)
|
||||||
|
|
||||||
adapter.updateData(aboutList)
|
adapter.submitList(aboutList)
|
||||||
|
|
||||||
assertThat(adapter.itemCount).isEqualTo(2)
|
assertThat(adapter.itemCount).isEqualTo(2)
|
||||||
}
|
}
|
||||||
|
@ -93,9 +79,9 @@ class AboutPageAdapterTest {
|
||||||
} returns viewHolder
|
} returns viewHolder
|
||||||
every { viewHolder.bind(any()) } just Runs
|
every { viewHolder.bind(any()) } just Runs
|
||||||
|
|
||||||
adapter.updateData(aboutList)
|
adapter.submitList(aboutList)
|
||||||
adapter.bindViewHolder(viewHolder, 1)
|
adapter.bindViewHolder(viewHolder, 1)
|
||||||
|
|
||||||
verify { viewHolder.bind(adapter.aboutList?.get(1) as AboutPageItem.Item) }
|
verify { viewHolder.bind(aboutList[1] as AboutPageItem.Item) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue