diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt index b55ae1fa73..f54055aaf2 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt @@ -193,13 +193,11 @@ class TabTrayView( tabsAdapter.tabTrayInteractor = interactor tabsAdapter.onTabsUpdated = { if (view.context.settings().gridTabView) { + concatAdapter.addAdapter(syncedTabsController.adapter) concatAdapter.addAdapter(collectionsButtonAdapter) - concatAdapter.addAdapter(syncedTabsController.adapter) } else { - // Put the 'Add to collections' button after the tabs have loaded. - concatAdapter.addAdapter(0, collectionsButtonAdapter) - // Put the Synced Tabs adapter at the end. concatAdapter.addAdapter(syncedTabsController.adapter) + concatAdapter.addAdapter(collectionsButtonAdapter) } if (hasAccessibilityEnabled) { @@ -442,10 +440,7 @@ class TabTrayView( private fun setupListTabView() { view.tabsTray.apply { - layoutManager = LinearLayoutManager(container.context).apply { - reverseLayout = true - stackFromEnd = true - } + layoutManager = LinearLayoutManager(container.context) } } @@ -730,19 +725,11 @@ class TabTrayView( view.context.components.core.store.state.normalTabs } - val selectedBrowserTabIndex = if (sessionId != null) { + return if (sessionId != null) { tabs.indexOfFirst { it.id == sessionId } } else { tabs.indexOfFirst { it.id == view.context.components.core.store.state.selectedTabId } } - - // We offset the tab index by the number of items in the other adapters. - // We add the offset, because the layoutManager is initialized with `reverseLayout`. - return if (view.context.settings().listTabView) { - selectedBrowserTabIndex + collectionsButtonAdapter.itemCount + syncedTabsController.adapter.itemCount - } else { - selectedBrowserTabIndex - } } companion object {