parent
f671490197
commit
385dfd2f15
|
@ -172,50 +172,56 @@ class BrowserFragment : Fragment(), BackHandler {
|
||||||
ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
|
ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
|
||||||
}
|
}
|
||||||
|
|
||||||
browserInteractor = BrowserInteractor(
|
getSessionById()?.let { session ->
|
||||||
context = context!!,
|
browserInteractor = BrowserInteractor(
|
||||||
store = browserStore,
|
|
||||||
browserToolbarController = DefaultBrowserToolbarController(
|
|
||||||
context!!,
|
|
||||||
findNavController(),
|
|
||||||
findInPageLauncher = { findInPageIntegration.withFeature { it.launch() } },
|
|
||||||
nestedScrollQuickActionView = nestedScrollQuickAction,
|
|
||||||
engineView = engineView,
|
|
||||||
currentSession = getSessionById() ?: requireComponents.core.sessionManager.selectedSessionOrThrow,
|
|
||||||
viewModel = viewModel
|
|
||||||
),
|
|
||||||
quickActionSheetController = DefaultQuickActionSheetController(
|
|
||||||
context = context!!,
|
context = context!!,
|
||||||
navController = findNavController(),
|
store = browserStore,
|
||||||
currentSession = getSessionById() ?: requireComponents.core.sessionManager.selectedSessionOrThrow,
|
browserToolbarController = DefaultBrowserToolbarController(
|
||||||
appLinksUseCases = requireComponents.useCases.appLinksUseCases,
|
context!!,
|
||||||
bookmarkTapped = {
|
findNavController(),
|
||||||
lifecycleScope.launch { bookmarkTapped(it) }
|
findInPageLauncher = { findInPageIntegration.withFeature { it.launch() } },
|
||||||
}
|
nestedScrollQuickActionView = nestedScrollQuickAction,
|
||||||
),
|
engineView = engineView,
|
||||||
readerModeController = DefaultReaderModeController(readerViewFeature),
|
currentSession = session,
|
||||||
currentSession = getSessionById() ?: requireComponents.core.sessionManager.selectedSessionOrThrow
|
viewModel = viewModel
|
||||||
)
|
),
|
||||||
|
quickActionSheetController = DefaultQuickActionSheetController(
|
||||||
|
context = context!!,
|
||||||
|
navController = findNavController(),
|
||||||
|
currentSession = session,
|
||||||
|
appLinksUseCases = requireComponents.useCases.appLinksUseCases,
|
||||||
|
bookmarkTapped = {
|
||||||
|
lifecycleScope.launch { bookmarkTapped(it) }
|
||||||
|
}
|
||||||
|
),
|
||||||
|
readerModeController = DefaultReaderModeController(readerViewFeature),
|
||||||
|
currentSession = session
|
||||||
|
)
|
||||||
|
|
||||||
browserToolbarView = BrowserToolbarView(
|
browserToolbarView = BrowserToolbarView(
|
||||||
container = view.browserLayout,
|
container = view.browserLayout,
|
||||||
interactor = browserInteractor,
|
interactor = browserInteractor,
|
||||||
currentSession = getSessionById() ?: requireComponents.core.sessionManager.selectedSessionOrThrow
|
currentSession = session
|
||||||
)
|
)
|
||||||
|
|
||||||
toolbarIntegration.set(
|
toolbarIntegration.set(
|
||||||
feature = browserToolbarView.toolbarIntegration,
|
feature = browserToolbarView.toolbarIntegration,
|
||||||
owner = this,
|
owner = this,
|
||||||
view = view
|
view = view
|
||||||
)
|
)
|
||||||
|
|
||||||
findInPageIntegration.set(
|
findInPageIntegration.set(
|
||||||
feature = FindInPageIntegration(
|
feature = FindInPageIntegration(
|
||||||
requireComponents.core.sessionManager, customTabSessionId, view.findInPageView, view.engineView, toolbar
|
sessionManager = requireComponents.core.sessionManager,
|
||||||
),
|
sessionId = customTabSessionId,
|
||||||
owner = this,
|
view = view.findInPageView,
|
||||||
view = view
|
engineView = view.engineView,
|
||||||
)
|
toolbar = toolbar
|
||||||
|
),
|
||||||
|
owner = this,
|
||||||
|
view = view
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
quickActionSheetView = QuickActionSheetView(view.nestedScrollQuickAction, browserInteractor)
|
quickActionSheetView = QuickActionSheetView(view.nestedScrollQuickAction, browserInteractor)
|
||||||
|
|
||||||
|
@ -475,6 +481,7 @@ class BrowserFragment : Fragment(), BackHandler {
|
||||||
|
|
||||||
getSessionById()?.let { updateBookmarkState(it) }
|
getSessionById()?.let { updateBookmarkState(it) }
|
||||||
|
|
||||||
|
// See #4387 for why we're popping here
|
||||||
if (getSessionById() == null) findNavController(this).popBackStack(R.id.homeFragment, false)
|
if (getSessionById() == null) findNavController(this).popBackStack(R.id.homeFragment, false)
|
||||||
context?.components?.core?.let {
|
context?.components?.core?.let {
|
||||||
val preferredColorScheme = it.getPreferredColorScheme()
|
val preferredColorScheme = it.getPreferredColorScheme()
|
||||||
|
|
Loading…
Reference in New Issue