ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue #21686: Move submitList calls into TabsAdapter

Browse Source 
Co-authored-by: Roger Yang <royang@mozilla.com>
This commit is contained in:
Jonathan Almeida 2021-10-07 16:30:06 -04:00 committed by mergify[bot]
parent 8c1a64a5e8
commit 74fd043290
5 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/tabstray/browser/InactiveTabsAdapter.kt
View File

@ -105,10 +105,6 @@ class InactiveTabsAdapter(
}
override fun isTabSelected(tabs: Tabs, position: Int): Boolean = false
override fun onTabsChanged(position: Int, count: Int) = Unit
override fun onTabsInserted(position: Int, count: Int) = Unit
override fun onTabsMoved(fromPosition: Int, toPosition: Int) = Unit
override fun onTabsRemoved(position: Int, count: Int) = Unit
private object DiffCallback : DiffUtil.ItemCallback<Item>() {
override fun areItemsTheSame(oldItem: Item, newItem: Item): Boolean {

4
app/src/main/java/org/mozilla/fenix/tabstray/browser/TabGroupAdapter.kt
View File

@ -109,10 +109,6 @@ class TabGroupAdapter(
* Not implemented; handled by nested [RecyclerView].
*/
override fun isTabSelected(tabs: Tabs, position: Int): Boolean = false
override fun onTabsChanged(position: Int, count: Int) = Unit
override fun onTabsInserted(position: Int, count: Int) = Unit
override fun onTabsMoved(fromPosition: Int, toPosition: Int) = Unit
override fun onTabsRemoved(position: Int, count: Int) = Unit
private object DiffCallback : DiffUtil.ItemCallback<Group>() {
override fun areItemsTheSame(oldItem: Group, newItem: Group) = oldItem.title == newItem.title

9
app/src/main/java/org/mozilla/fenix/tabstray/browser/TabSorter.kt
View File

@ -46,19 +46,10 @@ class TabSorter(
// Normal tabs.
val totalNormalTabs = (normalTabs + remainderTabs)
val selectedTabIndex = totalNormalTabs.findSelectedIndex(selectedTabId)
// N.B: For regular tabs, we cannot use submitList alone, because the `TabsAdapter` needs to have a reference
// to the new tabs in it. We considered moving the call within `updateTabs` but this would have the side-effect
// of notifying the adapter twice for private tabs which shared the `TabsAdapter`.
concatAdapter.browserAdapter.updateTabs(Tabs(totalNormalTabs, selectedTabIndex))
concatAdapter.browserAdapter.submitList(totalNormalTabs)
}
override fun isTabSelected(tabs: Tabs, position: Int): Boolean = false
override fun onTabsChanged(position: Int, count: Int) = Unit
override fun onTabsInserted(position: Int, count: Int) = Unit
override fun onTabsMoved(fromPosition: Int, toPosition: Int) = Unit
override fun onTabsRemoved(position: Int, count: Int) = Unit
}
private fun List<Tab>.findSelectedIndex(tabId: String?): Int {

16
app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsAdapter.kt
View File

@ -37,6 +37,8 @@ abstract class TabsAdapter<T : TabViewHolder>(
override fun updateTabs(tabs: Tabs) {
this.tabs = tabs
submitList(tabs.list)
notifyObservers { onTabsUpdated() }
}
@ -47,23 +49,9 @@ abstract class TabsAdapter<T : TabViewHolder>(
holder.bind(tabs.list[position], isTabSelected(tabs, position), styling, this)
}
override fun getItemCount(): Int = tabs?.list?.size ?: 0
final override fun isTabSelected(tabs: Tabs, position: Int): Boolean =
tabs.selectedIndex == position
final override fun onTabsChanged(position: Int, count: Int) =
notifyItemRangeChanged(position, count)
final override fun onTabsInserted(position: Int, count: Int) =
notifyItemRangeInserted(position, count)
final override fun onTabsMoved(fromPosition: Int, toPosition: Int) =
notifyItemMoved(fromPosition, toPosition)
final override fun onTabsRemoved(position: Int, count: Int) =
notifyItemRangeRemoved(position, count)
private object DiffCallback : DiffUtil.ItemCallback<Tab>() {
override fun areItemsTheSame(oldItem: Tab, newItem: Tab): Boolean {
return oldItem.id == newItem.id

2
app/src/test/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolderTest.kt
View File

@ -51,7 +51,6 @@ class AbstractBrowserPageViewHolderTest {
selectedIndex = 0
)
)
adapter.onTabsInserted(0, 1)
assertTrue(trayList.visibility == VISIBLE)
assertTrue(emptyList.visibility == GONE)
@ -74,7 +73,6 @@ class AbstractBrowserPageViewHolderTest {
selectedIndex = 0
)
)
adapter.onTabsInserted(0, 0)
assertTrue(trayList.visibility == GONE)
assertTrue(emptyList.visibility == VISIBLE)