1
0
Fork 0
fenix/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationControlle...

203 lines
6.6 KiB
Kotlin
Raw Normal View History

#4596 migrate collections (#5911) * For #4596: move code from CollectionCreationComponent to CollectionCreationStore Other than adding comments, no changes were made. The code will be updated in a following commit. This is in order to make the commit diff more readable. * For 4596: update CollectionCreateStore to libstate * For 4596: copied CollectionCreationUIView into CollectionCreationView Otherwise, no code was changed. The next commit will update this code. This is in order to make the commit diff more readable. * For 4596: update CollectionCreationView to LibState Note that the minimal changes possible to enable migration were made. Refactoring will happen in a later commit. * For 4596: updated CollectionCreationTabListAdapter to work with the new View * For 4596: updated SaveCollectionListAdapter to work with the new View * For 4596: implemented CollectionCreationController For now, it has an identical interface to the interactor. In a later commit several of its responsibilities will be moved around, some to the interactor and some to the reducer * For 4596: copied over previous reducer code No other changes were made. The code will be updated in the following commit. This is done to make changes more readable for the reviewer * For 4596: update reducer code param names Otherwise, no changes at this time * For 4596: add arguments to CreateCollectionFragment in nav_graph These will be used to replace the current CreateCollectionViewModel, which shares data between fragments in a way that doesn't fit within our architecture. * For 4596: pass arguments to collection via transaction instead of VM The VM will be removed in a later commit * For 4596: update BrowserToolbarController to share state to collection via its Direction * For 4596: removed CreateCollectionViewModel * For 4596: test tab retrieval in CreateCollectionFragment * For 4596: fix crashing CreateCollectionFragmentTest * For 4596: removed classes create collection classes used by old architecture * For 4596: collection interactor rename + kdoc * For 4596: moved collection interactor interface * For 4596: renamed CreateCollectionFragment All related classes followed the pattern of CollectionCreationX * For 4596: kdoc CollectionCreationController There's no effective difference between these calls and their interactor equivalent, so I linked to them * For 4596: fix bug that caused rename to not work * For 4596: removed unused collection actions These were unused before the LibState refactor * For 4596: kdoc StepChanged * For 4596: removed todos about moving logic to the reducer saveTabsToCollection: this could be moved, but that would involve creating a new action. SaveCollectionStep should probably be refactored out, so adding this layer of indirection seemed counterproductive handleBackPress: needs to be able to call dismiss(). The reducer doesn't (and shouldn't) be able to do that, so this needs to live here stepBack: called by handleBackPress. See above * For 4596: wrote tests for CollectionCreationController#stepback * For 4596: fixed tests broken by changes to collections * For 4596: small readability refactor for CollectionController#stepBack No change to functionality (see tests) * For 4596: broke apart CollectionView#update There's probably a lot more that could be done here, but smaller changes were made to reduce scope * For 4596: remove unnecessary todos It looks like we don't follow the suggested pattern in this project * For 4596: test CollectionCreationController#normalSessionSize * For 4596: updated naming in CollectionCreationController per review
2019-10-23 02:33:54 +02:00
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@file:Suppress("TooManyFunctions")
package org.mozilla.fenix.collections
import androidx.annotation.VisibleForTesting
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import mozilla.components.browser.session.SessionManager
import mozilla.components.feature.tab.collections.TabCollection
import mozilla.components.feature.tabs.TabsUseCases
import org.mozilla.fenix.R
import org.mozilla.fenix.components.Analytics
import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.home.sessioncontrol.Tab
import org.mozilla.fenix.home.sessioncontrol.toSessionBundle
interface CollectionCreationController {
fun saveCollectionName(tabs: List<Tab>, name: String)
fun renameCollection(collection: TabCollection, name: String)
/**
* See [CollectionCreationInteractor.onBackPressed]
*/
fun backPressed(fromStep: SaveCollectionStep)
/**
* See [CollectionCreationInteractor.selectAllTapped]
*/
fun selectAllTabs()
/**
* See [CollectionCreationInteractor.deselectAllTapped]
*/
fun deselectAllTabs()
/**
* See [CollectionCreationInteractor.close]
*/
fun close()
fun selectCollection(collection: TabCollection, tabs: List<Tab>)
/**
* See [CollectionCreationInteractor.saveTabsToCollection]
*/
fun saveTabsToCollection(tabs: List<Tab>)
fun addNewCollection()
fun addTabToSelection(tab: Tab)
fun removeTabFromSelection(tab: Tab)
}
class DefaultCollectionCreationController(
private val store: CollectionCreationStore,
private val dismiss: () -> Unit,
private val analytics: Analytics,
private val tabCollectionStorage: TabCollectionStorage,
private val tabsUseCases: TabsUseCases,
private val sessionManager: SessionManager,
private val lifecycleScope: CoroutineScope
) : CollectionCreationController {
override fun saveCollectionName(tabs: List<Tab>, name: String) {
dismiss()
val sessionBundle = tabs.toList().toSessionBundle(sessionManager)
lifecycleScope.launch(Dispatchers.IO) {
tabCollectionStorage.createCollection(name, sessionBundle)
}
analytics.metrics.track(
Event.CollectionSaved(normalSessionSize(sessionManager), sessionBundle.size)
)
closeTabsIfNecessary(tabs, sessionManager, tabsUseCases)
}
override fun renameCollection(collection: TabCollection, name: String) {
dismiss()
lifecycleScope.launch(Dispatchers.IO) {
tabCollectionStorage.renameCollection(collection, name)
analytics.metrics.track(Event.CollectionRenamed)
}
}
override fun backPressed(fromStep: SaveCollectionStep) {
handleBackPress(fromStep)
}
override fun selectAllTabs() {
store.dispatch(CollectionCreationAction.AddAllTabs)
}
override fun deselectAllTabs() {
store.dispatch(CollectionCreationAction.RemoveAllTabs)
}
override fun close() {
dismiss()
}
override fun selectCollection(collection: TabCollection, tabs: List<Tab>) {
dismiss()
val sessionBundle = tabs.toList().toSessionBundle(sessionManager)
lifecycleScope.launch(Dispatchers.IO) {
tabCollectionStorage
.addTabsToCollection(collection, sessionBundle)
}
analytics.metrics.track(
Event.CollectionTabsAdded(normalSessionSize(sessionManager), sessionBundle.size)
)
closeTabsIfNecessary(tabs, sessionManager, tabsUseCases)
}
override fun saveTabsToCollection(tabs: List<Tab>) {
store.dispatch(CollectionCreationAction.StepChanged(
saveCollectionStep = if (store.state.tabCollections.isEmpty()) {
SaveCollectionStep.NameCollection
} else {
SaveCollectionStep.SelectCollection
}
))
}
override fun addNewCollection() {
store.dispatch(CollectionCreationAction.StepChanged(SaveCollectionStep.NameCollection))
}
override fun addTabToSelection(tab: Tab) {
store.dispatch(CollectionCreationAction.TabAdded(tab))
}
override fun removeTabFromSelection(tab: Tab) {
store.dispatch(CollectionCreationAction.TabRemoved(tab))
}
private fun handleBackPress(backFromStep: SaveCollectionStep) {
val newStep = stepBack(backFromStep)
if (newStep != null) {
store.dispatch(CollectionCreationAction.StepChanged(newStep))
} else {
dismiss()
}
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
fun stepBack(
backFromStep: SaveCollectionStep
): SaveCollectionStep? {
/*
Will return the next valid state according to this diagram.
Name Collection -> Select Collection -> Select Tabs -> (dismiss fragment) <- Rename Collection
*/
val tabCollectionCount = store.state.tabCollections.size
val tabCount = store.state.tabs.size
return when (backFromStep) {
SaveCollectionStep.NameCollection -> if (tabCollectionCount > 0) {
SaveCollectionStep.SelectCollection
} else {
stepBack(SaveCollectionStep.SelectCollection)
}
SaveCollectionStep.SelectCollection -> if (tabCount > 1) {
SaveCollectionStep.SelectTabs
} else {
stepBack(SaveCollectionStep.SelectTabs)
}
SaveCollectionStep.SelectTabs, SaveCollectionStep.RenameCollection -> null
}
}
/**
* @return the number of currently active sessions that are neither custom nor private
*/
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
fun normalSessionSize(sessionManager: SessionManager): Int {
return sessionManager.sessions.filter { session ->
(!session.isCustomTabSession() && !session.private)
}.size
}
private fun closeTabsIfNecessary(tabs: List<Tab>, sessionManager: SessionManager, tabsUseCases: TabsUseCases) {
// Only close the tabs if the user is not on the BrowserFragment
if (store.state.previousFragmentId == R.id.browserFragment) { return }
tabs.asSequence()
.mapNotNull { tab -> sessionManager.findSessionById(tab.sessionId) }
.forEach { session -> tabsUseCases.removeTab(session) }
}
}