Use new feature-contextmenu API.

nightly-build-test
Sebastian Kaspari 5 years ago
parent 24b4a3aaf5
commit b8539ccb33

@ -215,18 +215,20 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
contextMenuFeature.set( contextMenuFeature.set(
feature = ContextMenuFeature( feature = ContextMenuFeature(
requireFragmentManager(), fragmentManager = requireFragmentManager(),
sessionManager, store = store,
FenixContextMenuCandidate.defaultCandidates( candidates = FenixContextMenuCandidate.defaultCandidates(
context, context,
context.components.useCases.tabsUseCases, context.components.useCases.tabsUseCases,
context.components.useCases.contextMenuUseCases,
view, view,
FenixSnackbarDelegate( FenixSnackbarDelegate(
view, view,
if (getSessionById()?.isCustomTabSession() == true) null else nestedScrollQuickAction if (getSessionById()?.isCustomTabSession() == true) null else nestedScrollQuickAction
) )
), ),
view.engineView engineView = view.engineView,
useCases = context.components.useCases.contextMenuUseCases
), ),
owner = this, owner = this,
view = view view = view

@ -7,6 +7,7 @@ package org.mozilla.fenix.browser
import android.content.Context import android.content.Context
import android.view.View import android.view.View
import mozilla.components.feature.contextmenu.ContextMenuCandidate import mozilla.components.feature.contextmenu.ContextMenuCandidate
import mozilla.components.feature.contextmenu.ContextMenuUseCases
import mozilla.components.feature.contextmenu.DefaultSnackbarDelegate import mozilla.components.feature.contextmenu.DefaultSnackbarDelegate
import mozilla.components.feature.tabs.TabsUseCases import mozilla.components.feature.tabs.TabsUseCases
@ -20,6 +21,7 @@ class FenixContextMenuCandidate {
fun defaultCandidates( fun defaultCandidates(
context: Context, context: Context,
tabsUseCases: TabsUseCases, tabsUseCases: TabsUseCases,
contextMenuUseCases: ContextMenuUseCases,
snackBarParentView: View, snackBarParentView: View,
snackbarDelegate: ContextMenuCandidate.SnackbarDelegate = DefaultSnackbarDelegate() snackbarDelegate: ContextMenuCandidate.SnackbarDelegate = DefaultSnackbarDelegate()
): List<ContextMenuCandidate> = listOf( ): List<ContextMenuCandidate> = listOf(
@ -37,7 +39,7 @@ class FenixContextMenuCandidate {
), ),
ContextMenuCandidate.createCopyLinkCandidate(context, snackBarParentView, snackbarDelegate), ContextMenuCandidate.createCopyLinkCandidate(context, snackBarParentView, snackbarDelegate),
ContextMenuCandidate.createShareLinkCandidate(context), ContextMenuCandidate.createShareLinkCandidate(context),
ContextMenuCandidate.createSaveImageCandidate(context), ContextMenuCandidate.createSaveImageCandidate(context, contextMenuUseCases),
ContextMenuCandidate.createCopyImageLocationCandidate(context, snackBarParentView, snackbarDelegate) ContextMenuCandidate.createCopyImageLocationCandidate(context, snackBarParentView, snackbarDelegate)
) )
} }

@ -10,6 +10,7 @@ import mozilla.components.browser.session.SessionManager
import mozilla.components.concept.engine.Settings import mozilla.components.concept.engine.Settings
import mozilla.components.concept.fetch.Client import mozilla.components.concept.fetch.Client
import mozilla.components.feature.app.links.AppLinksUseCases import mozilla.components.feature.app.links.AppLinksUseCases
import mozilla.components.feature.contextmenu.ContextMenuUseCases
import mozilla.components.feature.downloads.DownloadsUseCases import mozilla.components.feature.downloads.DownloadsUseCases
import mozilla.components.feature.pwa.WebAppUseCases import mozilla.components.feature.pwa.WebAppUseCases
import mozilla.components.feature.search.SearchUseCases import mozilla.components.feature.search.SearchUseCases
@ -55,4 +56,6 @@ class UseCases(
val webAppUseCases by lazy { WebAppUseCases(context, sessionManager, httpClient, supportWebApps = false) } val webAppUseCases by lazy { WebAppUseCases(context, sessionManager, httpClient, supportWebApps = false) }
val downloadUseCases by lazy { DownloadsUseCases(sessionManager) } val downloadUseCases by lazy { DownloadsUseCases(sessionManager) }
val contextMenuUseCases by lazy { ContextMenuUseCases(sessionManager) }
} }

Loading…
Cancel
Save