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

Issue #21686: Stop using internally stored tabs list in adapters

Browse Source
This commit is contained in:
Roger Yang 2021-10-08 16:27:11 -04:00 committed by mergify[bot]
parent abcc9dfc67
commit 4ad494075a
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapter.kt
View File

@ -106,16 +106,14 @@ class BrowserTabsAdapter(
* display itself. * display itself.
*/ */
override fun onBindViewHolder(holder: AbstractBrowserTabViewHolder, position: Int, payloads: List<Any>) { override fun onBindViewHolder(holder: AbstractBrowserTabViewHolder, position: Int, payloads: List<Any>) {
val tabs = tabs ?: return if (currentList.isEmpty()) return
if (tabs.list.isEmpty()) return
if (payloads.isEmpty()) { if (payloads.isEmpty()) {
onBindViewHolder(holder, position) onBindViewHolder(holder, position)
return return
} }
if (position == tabs.selectedIndex) { if (position == selectedIndex) {
if (payloads.contains(PAYLOAD_HIGHLIGHT_SELECTED_ITEM)) { if (payloads.contains(PAYLOAD_HIGHLIGHT_SELECTED_ITEM)) {
holder.updateSelectedTabIndicator(true) holder.updateSelectedTabIndicator(true)
} else if (payloads.contains(PAYLOAD_DONT_HIGHLIGHT_SELECTED_ITEM)) { } else if (payloads.contains(PAYLOAD_DONT_HIGHLIGHT_SELECTED_ITEM)) {

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

@ -30,12 +30,12 @@ abstract class TabsAdapter<T : TabViewHolder>(
delegate: Observable<TabsTray.Observer> = ObserverRegistry() delegate: Observable<TabsTray.Observer> = ObserverRegistry()
) : ListAdapter<Tab, T>(DiffCallback), TabsTray, Observable<TabsTray.Observer> by delegate { ) : ListAdapter<Tab, T>(DiffCallback), TabsTray, Observable<TabsTray.Observer> by delegate {
protected var tabs: Tabs? = null protected var selectedIndex: Int? = null
protected var styling: TabsTrayStyling = TabsTrayStyling() protected var styling: TabsTrayStyling = TabsTrayStyling()
@CallSuper @CallSuper
override fun updateTabs(tabs: Tabs) { override fun updateTabs(tabs: Tabs) {
this.tabs = tabs this.selectedIndex = tabs.selectedIndex
submitList(tabs.list) submitList(tabs.list)
@ -44,13 +44,10 @@ abstract class TabsAdapter<T : TabViewHolder>(
@CallSuper @CallSuper
override fun onBindViewHolder(holder: T, position: Int) { override fun onBindViewHolder(holder: T, position: Int) {
val tabs = tabs ?: return holder.bind(getItem(position), selectedIndex == position, styling, this)
holder.bind(tabs.list[position], isTabSelected(tabs, position), styling, this)
} }
final override fun isTabSelected(tabs: Tabs, position: Int): Boolean = override fun isTabSelected(tabs: Tabs, position: Int): Boolean = false
tabs.selectedIndex == position
private object DiffCallback : DiffUtil.ItemCallback<Tab>() { private object DiffCallback : DiffUtil.ItemCallback<Tab>() {
override fun areItemsTheSame(oldItem: Tab, newItem: Tab): Boolean { override fun areItemsTheSame(oldItem: Tab, newItem: Tab): Boolean {