For 10503 - Update save to collection flow in tab tray (#10523)
parent
58df38105b
commit
86dabe09c8
|
@ -177,8 +177,12 @@ class TabTrayFragment : Fragment(R.layout.fragment_tab_tray), TabsTray.Observer,
|
||||||
val tabs = getListOfSessions()
|
val tabs = getListOfSessions()
|
||||||
val tabIds = tabs.map { it.id }.toList().toTypedArray()
|
val tabIds = tabs.map { it.id }.toList().toTypedArray()
|
||||||
val tabCollectionStorage = (activity as HomeActivity).components.core.tabCollectionStorage
|
val tabCollectionStorage = (activity as HomeActivity).components.core.tabCollectionStorage
|
||||||
|
val navController = findNavController()
|
||||||
|
|
||||||
val step = when {
|
val step = when {
|
||||||
|
// Show the SelectTabs fragment if there are multiple opened tabs to select which tabs
|
||||||
|
// you want to save to a collection.
|
||||||
|
tabs.size > 1 -> SaveCollectionStep.SelectTabs
|
||||||
// If there is an existing tab collection, show the SelectCollection fragment to save
|
// If there is an existing tab collection, show the SelectCollection fragment to save
|
||||||
// the selected tab to a collection of your choice.
|
// the selected tab to a collection of your choice.
|
||||||
tabCollectionStorage.cachedTabCollections.isNotEmpty() -> SaveCollectionStep.SelectCollection
|
tabCollectionStorage.cachedTabCollections.isNotEmpty() -> SaveCollectionStep.SelectCollection
|
||||||
|
@ -186,17 +190,15 @@ class TabTrayFragment : Fragment(R.layout.fragment_tab_tray), TabsTray.Observer,
|
||||||
else -> SaveCollectionStep.NameCollection
|
else -> SaveCollectionStep.NameCollection
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (navController.currentDestination?.id == R.id.collectionCreationFragment) return
|
||||||
|
|
||||||
val directions = TabTrayFragmentDirections.actionTabTrayFragmentToCreateCollectionFragment(
|
val directions = TabTrayFragmentDirections.actionTabTrayFragmentToCreateCollectionFragment(
|
||||||
tabIds = tabIds,
|
tabIds = tabIds,
|
||||||
previousFragmentId = R.id.tabTrayFragment,
|
previousFragmentId = R.id.tabTrayFragment,
|
||||||
saveCollectionStep = step,
|
saveCollectionStep = step,
|
||||||
selectedTabIds = tabIds,
|
selectedTabIds = tabIds
|
||||||
selectedTabCollectionId = -1
|
|
||||||
)
|
)
|
||||||
|
navController.nav(R.id.tabTrayFragment, directions)
|
||||||
view?.let {
|
|
||||||
findNavController().navigate(directions)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onStart() {
|
override fun onStart() {
|
||||||
|
|
Loading…
Reference in New Issue