Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #3609 - Remove FIP Integration, Use FIP Feature (#3637)

Browse Source
nightly-build-test
Emily Kager 5 years ago committed by Colin Lee
parent 6e3197f61c
commit 084fab77d4
2 changed files with 15 additions and 106 deletions
Show Stats Download Patch File Download Diff File

23
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
Unescape Escape View File

@ -42,6 +42,7 @@ import mozilla.components.browser.session.SessionManager
import mozilla.components.feature.app.links.AppLinksFeature
import mozilla.components.feature.contextmenu.ContextMenuFeature
import mozilla.components.feature.downloads.DownloadsFeature
import mozilla.components.feature.findinpage.FindInPageFeature
import mozilla.components.feature.intent.IntentProcessor
import mozilla.components.feature.prompts.PromptFeature
import mozilla.components.feature.readerview.ReaderViewFeature
@ -67,7 +68,6 @@ import org.mozilla.fenix.collections.CreateCollectionViewModel
import org.mozilla.fenix.collections.SaveCollectionStep
import org.mozilla.fenix.collections.getStepForCollectionsSize
import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.components.FindInPageIntegration
import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.Event.BrowserMenuItemTapped.Item
@ -116,7 +116,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
private val appLinksFeature = ViewBoundFeatureWrapper<AppLinksFeature>()
private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
private val findInPageIntegration = ViewBoundFeatureWrapper<FindInPageIntegration>()
private val findInPageFeature = ViewBoundFeatureWrapper<FindInPageFeature>()
private val toolbarIntegration = ViewBoundFeatureWrapper<ToolbarIntegration>()
private val readerViewFeature = ViewBoundFeatureWrapper<ReaderViewFeature>()
private val sitePermissionsFeature = ViewBoundFeatureWrapper<SitePermissionsFeature>()
@ -276,10 +276,11 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
view = view
)
findInPageIntegration.set(
feature = FindInPageIntegration(
requireComponents.core.sessionManager, view.findInPageView, view.engineView, toolbar
),
findInPageFeature.set(
feature = FindInPageFeature(requireComponents.core.sessionManager, view.findInPageView, view.engineView) {
toolbar.visibility = View.VISIBLE
findInPageView.visibility = View.GONE
},
owner = this,
view = view
)
@ -640,7 +641,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
override fun onBackPressed(): Boolean {
return when {
findInPageIntegration.onBackPressed() -> true
findInPageFeature.onBackPressed() -> true
fullScreenFeature.onBackPressed() -> true
readerViewFeature.onBackPressed() -> true
sessionFeature.onBackPressed() -> true
@ -744,7 +745,13 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
(activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Private
}
ToolbarMenu.Item.FindInPage -> {
FindInPageIntegration.launch?.invoke()
toolbar.visibility = View.GONE
findInPageView.visibility = View.VISIBLE
findInPageFeature.withFeature {
getSessionById()?.let { session ->
it.bind(session)
}
}
requireComponents.analytics.metrics.track(Event.FindInPageOpened)
}
ToolbarMenu.Item.ReportIssue -> getSessionById()?.let { session ->

98
app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
Unescape Escape View File

@ -1,98 +0,0 @@
/* 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()
}
}
Write Preview
Loading…
Cancel
Save