Revert "For #3609 - Remove FIP Integration, Use FIP Feature"
This reverts commit 428643d598e938f58a2fe4abfee417c46edec167.master
parent
2d6ebb986d
commit
6d0a4fdb4d
|
@ -41,7 +41,6 @@ import mozilla.components.browser.session.SessionManager
|
||||||
import mozilla.components.feature.app.links.AppLinksFeature
|
import mozilla.components.feature.app.links.AppLinksFeature
|
||||||
import mozilla.components.feature.contextmenu.ContextMenuFeature
|
import mozilla.components.feature.contextmenu.ContextMenuFeature
|
||||||
import mozilla.components.feature.downloads.DownloadsFeature
|
import mozilla.components.feature.downloads.DownloadsFeature
|
||||||
import mozilla.components.feature.findinpage.FindInPageFeature
|
|
||||||
import mozilla.components.feature.intent.IntentProcessor
|
import mozilla.components.feature.intent.IntentProcessor
|
||||||
import mozilla.components.feature.prompts.PromptFeature
|
import mozilla.components.feature.prompts.PromptFeature
|
||||||
import mozilla.components.feature.readerview.ReaderViewFeature
|
import mozilla.components.feature.readerview.ReaderViewFeature
|
||||||
|
@ -67,6 +66,7 @@ import org.mozilla.fenix.collections.CreateCollectionViewModel
|
||||||
import org.mozilla.fenix.collections.SaveCollectionStep
|
import org.mozilla.fenix.collections.SaveCollectionStep
|
||||||
import org.mozilla.fenix.collections.getStepForCollectionsSize
|
import org.mozilla.fenix.collections.getStepForCollectionsSize
|
||||||
import org.mozilla.fenix.components.FenixSnackbar
|
import org.mozilla.fenix.components.FenixSnackbar
|
||||||
|
import org.mozilla.fenix.components.FindInPageIntegration
|
||||||
import org.mozilla.fenix.components.TabCollectionStorage
|
import org.mozilla.fenix.components.TabCollectionStorage
|
||||||
import org.mozilla.fenix.components.metrics.Event
|
import org.mozilla.fenix.components.metrics.Event
|
||||||
import org.mozilla.fenix.components.metrics.Event.BrowserMenuItemTapped.Item
|
import org.mozilla.fenix.components.metrics.Event.BrowserMenuItemTapped.Item
|
||||||
|
@ -114,7 +114,7 @@ class BrowserFragment : Fragment(), BackHandler {
|
||||||
private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
|
private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
|
||||||
private val appLinksFeature = ViewBoundFeatureWrapper<AppLinksFeature>()
|
private val appLinksFeature = ViewBoundFeatureWrapper<AppLinksFeature>()
|
||||||
private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
|
private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
|
||||||
private val findInPageFeature = ViewBoundFeatureWrapper<FindInPageFeature>()
|
private val findInPageIntegration = ViewBoundFeatureWrapper<FindInPageIntegration>()
|
||||||
private val toolbarIntegration = ViewBoundFeatureWrapper<ToolbarIntegration>()
|
private val toolbarIntegration = ViewBoundFeatureWrapper<ToolbarIntegration>()
|
||||||
private val readerViewFeature = ViewBoundFeatureWrapper<ReaderViewFeature>()
|
private val readerViewFeature = ViewBoundFeatureWrapper<ReaderViewFeature>()
|
||||||
private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
|
private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
|
||||||
|
@ -270,11 +270,10 @@ class BrowserFragment : Fragment(), BackHandler {
|
||||||
view = view
|
view = view
|
||||||
)
|
)
|
||||||
|
|
||||||
findInPageFeature.set(
|
findInPageIntegration.set(
|
||||||
feature = FindInPageFeature(requireComponents.core.sessionManager, view.findInPageView, view.engineView) {
|
feature = FindInPageIntegration(
|
||||||
toolbar.visibility = View.VISIBLE
|
requireComponents.core.sessionManager, view.findInPageView, view.engineView, toolbar
|
||||||
findInPageView.visibility = View.GONE
|
),
|
||||||
},
|
|
||||||
owner = this,
|
owner = this,
|
||||||
view = view
|
view = view
|
||||||
)
|
)
|
||||||
|
@ -634,7 +633,7 @@ class BrowserFragment : Fragment(), BackHandler {
|
||||||
|
|
||||||
override fun onBackPressed(): Boolean {
|
override fun onBackPressed(): Boolean {
|
||||||
return when {
|
return when {
|
||||||
findInPageFeature.onBackPressed() -> true
|
findInPageIntegration.onBackPressed() -> true
|
||||||
fullScreenFeature.onBackPressed() -> true
|
fullScreenFeature.onBackPressed() -> true
|
||||||
readerViewFeature.onBackPressed() -> true
|
readerViewFeature.onBackPressed() -> true
|
||||||
sessionFeature.onBackPressed() -> true
|
sessionFeature.onBackPressed() -> true
|
||||||
|
@ -733,13 +732,7 @@ class BrowserFragment : Fragment(), BackHandler {
|
||||||
(activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Private
|
(activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Private
|
||||||
}
|
}
|
||||||
ToolbarMenu.Item.FindInPage -> {
|
ToolbarMenu.Item.FindInPage -> {
|
||||||
toolbar.visibility = View.GONE
|
FindInPageIntegration.launch?.invoke()
|
||||||
findInPageView.visibility = View.VISIBLE
|
|
||||||
findInPageFeature.withFeature {
|
|
||||||
getSessionById()?.let { session ->
|
|
||||||
it.bind(session)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
requireComponents.analytics.metrics.track(Event.FindInPageOpened)
|
requireComponents.analytics.metrics.track(Event.FindInPageOpened)
|
||||||
}
|
}
|
||||||
ToolbarMenu.Item.ReportIssue -> getSessionById()?.let { session ->
|
ToolbarMenu.Item.ReportIssue -> getSessionById()?.let { session ->
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
/* 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.components
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.util.AttributeSet
|
||||||
|
import android.view.View
|
||||||
|
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
import mozilla.components.browser.session.SessionManager
|
||||||
|
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||||
|
import mozilla.components.concept.engine.EngineView
|
||||||
|
import mozilla.components.feature.findinpage.FindInPageFeature
|
||||||
|
import mozilla.components.feature.findinpage.view.FindInPageBar
|
||||||
|
import mozilla.components.feature.findinpage.view.FindInPageView
|
||||||
|
import mozilla.components.support.base.feature.BackHandler
|
||||||
|
import mozilla.components.support.base.feature.LifecycleAwareFeature
|
||||||
|
import org.mozilla.fenix.test.Mockable
|
||||||
|
|
||||||
|
@Mockable
|
||||||
|
class FindInPageIntegration(
|
||||||
|
private val sessionManager: SessionManager,
|
||||||
|
private val view: FindInPageView,
|
||||||
|
engineView: EngineView,
|
||||||
|
private val toolbar: BrowserToolbar
|
||||||
|
) : LifecycleAwareFeature, BackHandler {
|
||||||
|
private val feature = FindInPageFeature(sessionManager, view, engineView, ::onClose)
|
||||||
|
|
||||||
|
override fun start() {
|
||||||
|
feature.start()
|
||||||
|
|
||||||
|
FindInPageIntegration.launch = this::launch
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun stop() {
|
||||||
|
feature.stop()
|
||||||
|
|
||||||
|
FindInPageIntegration.launch = null
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBackPressed(): Boolean {
|
||||||
|
return feature.onBackPressed()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onClose() {
|
||||||
|
toolbar.visibility = View.VISIBLE
|
||||||
|
view.asView().visibility = View.GONE
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun launch() {
|
||||||
|
val session = sessionManager.selectedSession ?: return
|
||||||
|
|
||||||
|
toolbar.visibility = View.GONE
|
||||||
|
view.asView().visibility = View.VISIBLE
|
||||||
|
feature.bind(session)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
// This is a workaround to let the menu item find this integration and active "Find in Page" mode. That's a bit
|
||||||
|
// ridiculous and there's no need that we create the toolbar menu items at app start time. Instead the
|
||||||
|
// ToolbarIntegration should create them and get the FindInPageIntegration injected as a dependency if the
|
||||||
|
// menu items need them.
|
||||||
|
var launch: (() -> Unit)? = null
|
||||||
|
private set
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [CoordinatorLayout.Behavior] that will always position the [FindInPageBar] above the [BrowserToolbar] (including
|
||||||
|
* when the browser toolbar is scrolling or performing a snap animation).
|
||||||
|
*/
|
||||||
|
@Suppress("unused") // Referenced from XML
|
||||||
|
class FindInPageBarBehavior(
|
||||||
|
context: Context,
|
||||||
|
attrs: AttributeSet
|
||||||
|
) : CoordinatorLayout.Behavior<FindInPageBar>(context, attrs) {
|
||||||
|
override fun layoutDependsOn(parent: CoordinatorLayout, child: FindInPageBar, dependency: View): Boolean {
|
||||||
|
if (dependency is BrowserToolbar) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.layoutDependsOn(parent, child, dependency)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDependentViewChanged(parent: CoordinatorLayout, child: FindInPageBar, dependency: View): Boolean {
|
||||||
|
return if (dependency is BrowserToolbar) {
|
||||||
|
repositionFindInPageBar(child, dependency)
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun repositionFindInPageBar(findInPageView: FindInPageBar, toolbar: BrowserToolbar) {
|
||||||
|
findInPageView.translationY = (toolbar.translationY + toolbar.height * -1.0).toFloat()
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue