blallo
/
fenix
1
0
Fork 0
Code Releases Activity

AboutPageAdapter doesn't use notifyDataSetChanged() 

We make the AboutPageAdapter inherit from a ListAdapter so that we don't use notifyDataSetChanged().
master
Amaan Marfatia 2020-03-20 12:03:45 -04:00 committed by Emily Kager
parent 180652deab
commit 3dcfed3761
3 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
View File

@ -64,7 +64,7 @@ class AboutFragment : Fragment(), AboutPageListener {
}
populateAboutHeader()
aboutPageAdapter.updateData(populateAboutList())
aboutPageAdapter.submitList(populateAboutList())
}
private fun populateAboutHeader() {

34
app/src/main/java/org/mozilla/fenix/settings/about/AboutPageAdapter.kt
View File

@ -6,33 +6,33 @@ package org.mozilla.fenix.settings.about
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.annotation.VisibleForTesting
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import org.mozilla.fenix.settings.about.viewholders.AboutItemViewHolder
class AboutPageAdapter(private val listener: AboutPageListener) : RecyclerView.Adapter<AboutItemViewHolder>() {
@VisibleForTesting
var aboutList: List<AboutPageItem>? = null
fun updateData(items: List<AboutPageItem>) {
this.aboutList = items
notifyDataSetChanged()
}
class AboutPageAdapter(private val listener: AboutPageListener) :
ListAdapter<AboutPageItem, AboutItemViewHolder>(DiffCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AboutItemViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(AboutItemViewHolder.LAYOUT_ID, parent, false)
return AboutItemViewHolder(view, listener)
}
override fun getItemCount(): Int = aboutList?.size ?: 0
override fun onBindViewHolder(holder: AboutItemViewHolder, position: Int) {
(aboutList?.get(position) as AboutPageItem.Item).also {
holder.bind(it)
}
holder.bind(getItem(position) as AboutPageItem.Item)
}
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
}
}
}

20
app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt
View File

@ -38,20 +38,6 @@ class AboutPageAdapterTest {
)
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
fun `getItemCount on a default instantiated Adapter should return 0`() {
val adapter = AboutPageAdapter(listener)
@ -63,7 +49,7 @@ class AboutPageAdapterTest {
fun `getItemCount after updateData() call should return the correct list size`() {
val adapter = AboutPageAdapter(listener)
adapter.updateData(aboutList)
adapter.submitList(aboutList)
assertThat(adapter.itemCount).isEqualTo(2)
}
@ -93,9 +79,9 @@ class AboutPageAdapterTest {
} returns viewHolder
every { viewHolder.bind(any()) } just Runs
adapter.updateData(aboutList)
adapter.submitList(aboutList)
adapter.bindViewHolder(viewHolder, 1)
verify { viewHolder.bind(adapter.aboutList?.get(1) as AboutPageItem.Item) }
verify { viewHolder.bind(aboutList[1] as AboutPageItem.Item) }
}
}