|
|
|
/* 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/. */
|
|
|
|
|
|
|
|
package org.mozilla.fenix.home.sessioncontrol
|
|
|
|
|
|
|
|
import android.content.Context
|
|
|
|
import android.graphics.Bitmap
|
|
|
|
import android.view.View
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import androidx.recyclerview.widget.RecyclerView
|
|
|
|
import io.reactivex.Observer
|
|
|
|
import mozilla.components.browser.session.Session
|
#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
5 years ago
|
|
|
import mozilla.components.browser.session.SessionManager
|
|
|
|
import mozilla.components.feature.media.state.MediaState
|
|
|
|
import org.mozilla.fenix.ext.components
|
|
|
|
import org.mozilla.fenix.home.Mode
|
|
|
|
import org.mozilla.fenix.mvi.Action
|
|
|
|
import org.mozilla.fenix.mvi.ActionBusFactory
|
|
|
|
import org.mozilla.fenix.mvi.Change
|
|
|
|
import org.mozilla.fenix.mvi.UIComponent
|
|
|
|
import org.mozilla.fenix.mvi.UIComponentViewModelBase
|
|
|
|
import org.mozilla.fenix.mvi.UIComponentViewModelProvider
|
|
|
|
import org.mozilla.fenix.mvi.ViewState
|
|
|
|
import mozilla.components.feature.tab.collections.Tab as ComponentTab
|
|
|
|
import mozilla.components.feature.tab.collections.TabCollection as ACTabCollection
|
|
|
|
|
|
|
|
class SessionControlComponent(
|
|
|
|
private val container: ViewGroup,
|
|
|
|
bus: ActionBusFactory,
|
|
|
|
viewModelProvider: UIComponentViewModelProvider<SessionControlState, SessionControlChange>
|
|
|
|
) :
|
|
|
|
UIComponent<SessionControlState, SessionControlAction, SessionControlChange>(
|
|
|
|
bus.getManagedEmitter(SessionControlAction::class.java),
|
|
|
|
bus.getSafeManagedObservable(SessionControlChange::class.java),
|
|
|
|
viewModelProvider
|
|
|
|
) {
|
|
|
|
|
|
|
|
override fun initView() = SessionControlUIView(container, actionEmitter, changesObservable)
|
|
|
|
|
|
|
|
val view: RecyclerView
|
|
|
|
get() = uiView.view as RecyclerView
|
|
|
|
|
|
|
|
init {
|
|
|
|
bind()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
data class Tab(
|
|
|
|
val sessionId: String,
|
|
|
|
val url: String,
|
|
|
|
val hostname: String,
|
|
|
|
val title: String,
|
|
|
|
val selected: Boolean? = null,
|
|
|
|
var mediaState: MediaState? = null,
|
|
|
|
val icon: Bitmap? = null
|
|
|
|
)
|
|
|
|
|
#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
5 years ago
|
|
|
fun List<Tab>.toSessionBundle(context: Context): MutableList<Session> =
|
|
|
|
this.toSessionBundle(context.components.core.sessionManager)
|
|
|
|
|
|
|
|
fun List<Tab>.toSessionBundle(sessionManager: SessionManager): MutableList<Session> {
|
|
|
|
val sessionBundle = mutableListOf<Session>()
|
|
|
|
this.forEach {
|
#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
5 years ago
|
|
|
sessionManager.findSessionById(it.sessionId)?.let { session ->
|
|
|
|
sessionBundle.add(session)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return sessionBundle
|
|
|
|
}
|
|
|
|
|
|
|
|
data class SessionControlState(
|
|
|
|
val tabs: List<Tab>,
|
|
|
|
val expandedCollections: Set<Long>,
|
|
|
|
val collections: List<TabCollection>,
|
|
|
|
val mode: Mode
|
|
|
|
) : ViewState
|
|
|
|
|
|
|
|
typealias TabCollection = ACTabCollection
|
|
|
|
|
|
|
|
sealed class TabAction : Action {
|
|
|
|
data class SaveTabGroup(val selectedTabSessionId: String?) : TabAction()
|
|
|
|
object ShareTabs : TabAction()
|
|
|
|
data class CloseAll(val private: Boolean) : TabAction()
|
|
|
|
data class Select(val tabView: View, val sessionId: String) : TabAction()
|
|
|
|
data class Close(val sessionId: String) : TabAction()
|
|
|
|
data class Share(val sessionId: String) : TabAction()
|
|
|
|
data class PauseMedia(val sessionId: String) : TabAction()
|
|
|
|
data class PlayMedia(val sessionId: String) : TabAction()
|
|
|
|
object PrivateBrowsingLearnMore : TabAction()
|
|
|
|
}
|
|
|
|
|
|
|
|
sealed class CollectionAction : Action {
|
|
|
|
data class Expand(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class Collapse(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class Delete(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class AddTab(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class Rename(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class OpenTab(val tab: ComponentTab) : CollectionAction()
|
|
|
|
data class OpenTabs(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class ShareTabs(val collection: TabCollection) : CollectionAction()
|
|
|
|
data class RemoveTab(val collection: TabCollection, val tab: ComponentTab) : CollectionAction()
|
|
|
|
}
|
|
|
|
|
|
|
|
sealed class OnboardingAction : Action {
|
|
|
|
object Finish : OnboardingAction()
|
|
|
|
}
|
|
|
|
|
|
|
|
sealed class SessionControlAction : Action {
|
|
|
|
data class Tab(val action: TabAction) : SessionControlAction()
|
|
|
|
data class Collection(val action: CollectionAction) : SessionControlAction()
|
|
|
|
data class Onboarding(val action: OnboardingAction) : SessionControlAction()
|
|
|
|
}
|
|
|
|
|
|
|
|
fun Observer<SessionControlAction>.onNext(tabAction: TabAction) {
|
|
|
|
onNext(SessionControlAction.Tab(tabAction))
|
|
|
|
}
|
|
|
|
|
|
|
|
fun Observer<SessionControlAction>.onNext(collectionAction: CollectionAction) {
|
|
|
|
onNext(SessionControlAction.Collection(collectionAction))
|
|
|
|
}
|
|
|
|
|
|
|
|
fun Observer<SessionControlAction>.onNext(onboardingAction: OnboardingAction) {
|
|
|
|
onNext(SessionControlAction.Onboarding(onboardingAction))
|
|
|
|
}
|
|
|
|
|
|
|
|
sealed class SessionControlChange : Change {
|
|
|
|
data class Change(val tabs: List<Tab>, val mode: Mode, val collections: List<TabCollection>) :
|
|
|
|
SessionControlChange()
|
|
|
|
data class TabsChange(val tabs: List<Tab>) : SessionControlChange()
|
|
|
|
data class ModeChange(val mode: Mode) : SessionControlChange()
|
|
|
|
data class CollectionsChange(val collections: List<TabCollection>) : SessionControlChange()
|
|
|
|
data class ExpansionChange(val collection: TabCollection, val expand: Boolean) : SessionControlChange()
|
|
|
|
}
|
|
|
|
|
|
|
|
class SessionControlViewModel(
|
|
|
|
initialState: SessionControlState
|
|
|
|
) : UIComponentViewModelBase<SessionControlState, SessionControlChange>(initialState, reducer) {
|
|
|
|
companion object {
|
|
|
|
val reducer: (SessionControlState, SessionControlChange) -> SessionControlState = { state, change ->
|
|
|
|
when (change) {
|
|
|
|
is SessionControlChange.CollectionsChange -> state.copy(collections = change.collections)
|
|
|
|
is SessionControlChange.TabsChange -> state.copy(tabs = change.tabs)
|
|
|
|
is SessionControlChange.ModeChange -> state.copy(mode = change.mode)
|
|
|
|
is SessionControlChange.ExpansionChange -> {
|
|
|
|
val newExpandedCollection = state.expandedCollections.toMutableSet()
|
|
|
|
|
|
|
|
if (change.expand) {
|
|
|
|
newExpandedCollection.add(change.collection.id)
|
|
|
|
} else {
|
|
|
|
newExpandedCollection.remove(change.collection.id)
|
|
|
|
}
|
|
|
|
|
|
|
|
state.copy(expandedCollections = newExpandedCollection)
|
|
|
|
}
|
|
|
|
is SessionControlChange.Change -> state.copy(
|
|
|
|
tabs = change.tabs,
|
|
|
|
mode = change.mode,
|
|
|
|
collections = change.collections
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|