|
|
@ -17,7 +17,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
|
|
|
|
import androidx.core.content.ContextCompat
|
|
|
|
import androidx.core.content.ContextCompat
|
|
|
|
import androidx.fragment.app.Fragment
|
|
|
|
import androidx.fragment.app.Fragment
|
|
|
|
import androidx.navigation.Navigation
|
|
|
|
import androidx.navigation.Navigation
|
|
|
|
import kotlinx.android.synthetic.main.component_search.*
|
|
|
|
|
|
|
|
import kotlinx.android.synthetic.main.fragment_browser.view.*
|
|
|
|
import kotlinx.android.synthetic.main.fragment_browser.view.*
|
|
|
|
import mozilla.components.browser.toolbar.behavior.BrowserToolbarBottomBehavior
|
|
|
|
import mozilla.components.browser.toolbar.behavior.BrowserToolbarBottomBehavior
|
|
|
|
import mozilla.components.feature.contextmenu.ContextMenuCandidate
|
|
|
|
import mozilla.components.feature.contextmenu.ContextMenuCandidate
|
|
|
@ -160,7 +159,7 @@ class BrowserFragment : Fragment(), BackHandler {
|
|
|
|
customTabsToolbarFeature.set(
|
|
|
|
customTabsToolbarFeature.set(
|
|
|
|
feature = CustomTabsToolbarFeature(
|
|
|
|
feature = CustomTabsToolbarFeature(
|
|
|
|
sessionManager,
|
|
|
|
sessionManager,
|
|
|
|
toolbar,
|
|
|
|
toolbarComponent.getView(),
|
|
|
|
sessionId,
|
|
|
|
sessionId,
|
|
|
|
closeListener = { requireActivity().finish() }),
|
|
|
|
closeListener = { requireActivity().finish() }),
|
|
|
|
owner = this,
|
|
|
|
owner = this,
|
|
|
@ -177,7 +176,7 @@ class BrowserFragment : Fragment(), BackHandler {
|
|
|
|
getAutoDisposeObservable<SearchAction>()
|
|
|
|
getAutoDisposeObservable<SearchAction>()
|
|
|
|
.subscribe {
|
|
|
|
.subscribe {
|
|
|
|
when (it) {
|
|
|
|
when (it) {
|
|
|
|
is SearchAction.ToolbarTapped -> Navigation.findNavController(toolbar)
|
|
|
|
is SearchAction.ToolbarTapped -> Navigation.findNavController(toolbarComponent.getView())
|
|
|
|
.navigate(
|
|
|
|
.navigate(
|
|
|
|
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
|
|
|
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
|
|
|
requireComponents.core.sessionManager.selectedSession?.id,
|
|
|
|
requireComponents.core.sessionManager.selectedSession?.id,
|
|
|
@ -221,9 +220,9 @@ class BrowserFragment : Fragment(), BackHandler {
|
|
|
|
ToolbarMenu.Item.Back -> sessionUseCases.goBack.invoke()
|
|
|
|
ToolbarMenu.Item.Back -> sessionUseCases.goBack.invoke()
|
|
|
|
ToolbarMenu.Item.Forward -> sessionUseCases.goForward.invoke()
|
|
|
|
ToolbarMenu.Item.Forward -> sessionUseCases.goForward.invoke()
|
|
|
|
ToolbarMenu.Item.Reload -> sessionUseCases.reload.invoke()
|
|
|
|
ToolbarMenu.Item.Reload -> sessionUseCases.reload.invoke()
|
|
|
|
ToolbarMenu.Item.Settings -> Navigation.findNavController(toolbar)
|
|
|
|
ToolbarMenu.Item.Settings -> Navigation.findNavController(toolbarComponent.getView())
|
|
|
|
.navigate(BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment())
|
|
|
|
.navigate(BrowserFragmentDirections.actionBrowserFragmentToSettingsFragment())
|
|
|
|
ToolbarMenu.Item.Library -> Navigation.findNavController(toolbar)
|
|
|
|
ToolbarMenu.Item.Library -> Navigation.findNavController(toolbarComponent.getView())
|
|
|
|
.navigate(BrowserFragmentDirections.actionBrowserFragmentToLibraryFragment())
|
|
|
|
.navigate(BrowserFragmentDirections.actionBrowserFragmentToLibraryFragment())
|
|
|
|
is ToolbarMenu.Item.RequestDesktop -> sessionUseCases.requestDesktopSite.invoke(action.item.isChecked)
|
|
|
|
is ToolbarMenu.Item.RequestDesktop -> sessionUseCases.requestDesktopSite.invoke(action.item.isChecked)
|
|
|
|
ToolbarMenu.Item.Share -> requireComponents.core.sessionManager
|
|
|
|
ToolbarMenu.Item.Share -> requireComponents.core.sessionManager
|
|
|
|