|
|
@ -8,13 +8,17 @@ import android.content.Context
|
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import androidx.recyclerview.widget.RecyclerView
|
|
|
|
import androidx.recyclerview.widget.RecyclerView
|
|
|
|
|
|
|
|
import mozilla.components.browser.state.selector.normalTabs
|
|
|
|
|
|
|
|
import mozilla.components.browser.state.selector.privateTabs
|
|
|
|
|
|
|
|
import mozilla.components.browser.state.selector.selectedTab
|
|
|
|
|
|
|
|
import mozilla.components.browser.state.store.BrowserStore
|
|
|
|
|
|
|
|
import mozilla.components.feature.syncedtabs.view.SyncedTabsView
|
|
|
|
|
|
|
|
import org.mozilla.fenix.sync.SyncedTabsAdapter
|
|
|
|
import org.mozilla.fenix.tabstray.browser.BrowserTabsAdapter
|
|
|
|
import org.mozilla.fenix.tabstray.browser.BrowserTabsAdapter
|
|
|
|
import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
|
|
|
|
import org.mozilla.fenix.tabstray.browser.BrowserTrayInteractor
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.AbstractTrayViewHolder
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.AbstractTrayViewHolder
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.NormalBrowserTabViewHolder
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.NormalBrowserTabViewHolder
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.PrivateBrowserTabViewHolder
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.PrivateBrowserTabViewHolder
|
|
|
|
import mozilla.components.feature.syncedtabs.view.SyncedTabsView
|
|
|
|
|
|
|
|
import org.mozilla.fenix.sync.SyncedTabsAdapter
|
|
|
|
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.SyncedTabViewHolder
|
|
|
|
import org.mozilla.fenix.tabstray.viewholders.SyncedTabViewHolder
|
|
|
|
|
|
|
|
|
|
|
|
class TrayPagerAdapter(
|
|
|
|
class TrayPagerAdapter(
|
|
|
@ -22,7 +26,8 @@ class TrayPagerAdapter(
|
|
|
|
private val store: TabsTrayStore,
|
|
|
|
private val store: TabsTrayStore,
|
|
|
|
private val browserInteractor: BrowserTrayInteractor,
|
|
|
|
private val browserInteractor: BrowserTrayInteractor,
|
|
|
|
private val syncedTabsInteractor: SyncedTabsView.Listener,
|
|
|
|
private val syncedTabsInteractor: SyncedTabsView.Listener,
|
|
|
|
private val interactor: TabsTrayInteractor
|
|
|
|
private val interactor: TabsTrayInteractor,
|
|
|
|
|
|
|
|
private val browserStore: BrowserStore
|
|
|
|
) : RecyclerView.Adapter<AbstractTrayViewHolder>() {
|
|
|
|
) : RecyclerView.Adapter<AbstractTrayViewHolder>() {
|
|
|
|
|
|
|
|
|
|
|
|
private val normalAdapter by lazy { BrowserTabsAdapter(context, browserInteractor, store) }
|
|
|
|
private val normalAdapter by lazy { BrowserTabsAdapter(context, browserInteractor, store) }
|
|
|
@ -32,21 +37,31 @@ class TrayPagerAdapter(
|
|
|
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractTrayViewHolder {
|
|
|
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractTrayViewHolder {
|
|
|
|
val itemView = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
|
|
|
|
val itemView = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val selectedTab = browserStore.state.selectedTab
|
|
|
|
|
|
|
|
|
|
|
|
return when (viewType) {
|
|
|
|
return when (viewType) {
|
|
|
|
NormalBrowserTabViewHolder.LAYOUT_ID -> NormalBrowserTabViewHolder(
|
|
|
|
NormalBrowserTabViewHolder.LAYOUT_ID -> {
|
|
|
|
itemView,
|
|
|
|
NormalBrowserTabViewHolder(
|
|
|
|
store,
|
|
|
|
itemView,
|
|
|
|
interactor
|
|
|
|
store,
|
|
|
|
)
|
|
|
|
interactor,
|
|
|
|
PrivateBrowserTabViewHolder.LAYOUT_ID -> PrivateBrowserTabViewHolder(
|
|
|
|
browserStore.state.normalTabs.indexOf(selectedTab)
|
|
|
|
itemView,
|
|
|
|
)
|
|
|
|
store,
|
|
|
|
}
|
|
|
|
interactor
|
|
|
|
PrivateBrowserTabViewHolder.LAYOUT_ID -> {
|
|
|
|
)
|
|
|
|
PrivateBrowserTabViewHolder(
|
|
|
|
SyncedTabViewHolder.LAYOUT_ID -> SyncedTabViewHolder(
|
|
|
|
itemView,
|
|
|
|
itemView,
|
|
|
|
store,
|
|
|
|
syncedTabsInteractor
|
|
|
|
interactor,
|
|
|
|
)
|
|
|
|
browserStore.state.privateTabs.indexOf(selectedTab)
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
SyncedTabViewHolder.LAYOUT_ID -> {
|
|
|
|
|
|
|
|
SyncedTabViewHolder(
|
|
|
|
|
|
|
|
itemView,
|
|
|
|
|
|
|
|
syncedTabsInteractor
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
else -> throw IllegalStateException("Unknown viewType.")
|
|
|
|
else -> throw IllegalStateException("Unknown viewType.")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -58,7 +73,6 @@ class TrayPagerAdapter(
|
|
|
|
POSITION_SYNCED_TABS -> syncedTabsAdapter
|
|
|
|
POSITION_SYNCED_TABS -> syncedTabsAdapter
|
|
|
|
else -> throw IllegalStateException("View type does not exist.")
|
|
|
|
else -> throw IllegalStateException("View type does not exist.")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
viewHolder.bind(adapter, browserInteractor.getLayoutManagerForPosition(context, position))
|
|
|
|
viewHolder.bind(adapter, browserInteractor.getLayoutManagerForPosition(context, position))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|