parent
a1c6e0127b
commit
0b7df74731
|
@ -769,20 +769,24 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setToolbarBehavior(loading: Boolean) {
|
private fun setToolbarBehavior(loading: Boolean) {
|
||||||
if (customTabSessionId != null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val toolbarView = toolbarComponent.uiView.view
|
val toolbarView = toolbarComponent.uiView.view
|
||||||
(toolbarView.layoutParams as CoordinatorLayout.LayoutParams).apply {
|
(toolbarView.layoutParams as CoordinatorLayout.LayoutParams).apply {
|
||||||
// Stop toolbar from collapsing if TalkBack is enabled or page is loading
|
// Stop toolbar from collapsing if TalkBack is enabled or page is loading
|
||||||
val accessibilityManager = context
|
val accessibilityManager = context
|
||||||
?.getSystemService(Context.ACCESSIBILITY_SERVICE) as? AccessibilityManager
|
?.getSystemService(Context.ACCESSIBILITY_SERVICE) as? AccessibilityManager
|
||||||
if (loading || accessibilityManager?.isTouchExplorationEnabled == true) {
|
|
||||||
(behavior as? BrowserToolbarBottomBehavior)?.forceExpand(toolbarView)
|
behavior = when {
|
||||||
behavior = null
|
loading || accessibilityManager?.isTouchExplorationEnabled == true -> {
|
||||||
} else {
|
(behavior as? BrowserToolbarBottomBehavior)?.forceExpand(toolbarView)
|
||||||
behavior = BrowserToolbarBottomBehavior(context, null)
|
(behavior as? BrowserToolbarTopBehavior)?.forceExpand(toolbarView)
|
||||||
|
null
|
||||||
|
}
|
||||||
|
customTabSessionId != null -> {
|
||||||
|
BrowserToolbarTopBehavior(context, null)
|
||||||
|
}
|
||||||
|
else -> {
|
||||||
|
BrowserToolbarBottomBehavior(context, null)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@ class BrowserToolbarBottomBehavior(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private enum class SnapDirection {
|
enum class SnapDirection {
|
||||||
UP,
|
UP,
|
||||||
DOWN
|
DOWN
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,122 @@
|
||||||
|
/* 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.browser
|
||||||
|
|
||||||
|
import android.animation.ValueAnimator
|
||||||
|
import android.content.Context
|
||||||
|
import android.util.AttributeSet
|
||||||
|
import android.view.Gravity
|
||||||
|
import android.view.View
|
||||||
|
import android.view.View.SCROLL_AXIS_VERTICAL
|
||||||
|
import android.view.animation.DecelerateInterpolator
|
||||||
|
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
import androidx.core.view.ViewCompat.TYPE_NON_TOUCH
|
||||||
|
import androidx.core.view.ViewCompat.TYPE_TOUCH
|
||||||
|
import com.google.android.material.snackbar.Snackbar
|
||||||
|
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||||
|
import org.mozilla.fenix.R
|
||||||
|
import kotlin.math.max
|
||||||
|
import kotlin.math.min
|
||||||
|
|
||||||
|
private const val SNAP_ANIMATION_DURATION = 150L
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A [CoordinatorLayout.Behavior] implementation to be used when placing [BrowserToolbar] at the top of the screen.
|
||||||
|
*
|
||||||
|
* This implementation will:
|
||||||
|
* - Show/Hide the [BrowserToolbar] automatically when scrolling vertically.
|
||||||
|
* - On showing a [Snackbar] position it above the [BrowserToolbar].
|
||||||
|
* - Snap the [BrowserToolbar] to be hidden or visible when the user stops scrolling.
|
||||||
|
*/
|
||||||
|
class BrowserToolbarTopBehavior(
|
||||||
|
context: Context?,
|
||||||
|
attrs: AttributeSet?
|
||||||
|
) : CoordinatorLayout.Behavior<BrowserToolbar>(context, attrs) {
|
||||||
|
// This implementation is heavily based on this blog article:
|
||||||
|
// https://android.jlelse.eu/scroll-your-bottom-navigation-view-away-with-10-lines-of-code-346f1ed40e9e
|
||||||
|
|
||||||
|
internal var shouldSnapAfterScroll: Boolean = false
|
||||||
|
|
||||||
|
internal var snapAnimator: ValueAnimator = ValueAnimator().apply {
|
||||||
|
interpolator = DecelerateInterpolator()
|
||||||
|
duration = SNAP_ANIMATION_DURATION
|
||||||
|
}
|
||||||
|
|
||||||
|
fun forceExpand(view: View) {
|
||||||
|
animateSnap(view, SnapDirection.DOWN)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStartNestedScroll(
|
||||||
|
coordinatorLayout: CoordinatorLayout,
|
||||||
|
child: BrowserToolbar,
|
||||||
|
directTargetChild: View,
|
||||||
|
target: View,
|
||||||
|
axes: Int,
|
||||||
|
type: Int
|
||||||
|
): Boolean {
|
||||||
|
return if (axes == SCROLL_AXIS_VERTICAL) {
|
||||||
|
shouldSnapAfterScroll = type == TYPE_TOUCH
|
||||||
|
snapAnimator.cancel()
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("MagicNumber")
|
||||||
|
override fun onStopNestedScroll(
|
||||||
|
coordinatorLayout: CoordinatorLayout,
|
||||||
|
child: BrowserToolbar,
|
||||||
|
target: View,
|
||||||
|
type: Int
|
||||||
|
) {
|
||||||
|
if (shouldSnapAfterScroll || type == TYPE_NON_TOUCH) {
|
||||||
|
if (child.translationY >= (-child.height * 0.5f)) {
|
||||||
|
animateSnap(child, SnapDirection.DOWN)
|
||||||
|
} else {
|
||||||
|
animateSnap(child, SnapDirection.UP)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onNestedPreScroll(
|
||||||
|
coordinatorLayout: CoordinatorLayout,
|
||||||
|
child: BrowserToolbar,
|
||||||
|
target: View,
|
||||||
|
dx: Int,
|
||||||
|
dy: Int,
|
||||||
|
consumed: IntArray,
|
||||||
|
type: Int
|
||||||
|
) {
|
||||||
|
super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
|
||||||
|
child.translationY = max(-child.height.toFloat(), min(0f, child.translationY - dy))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun layoutDependsOn(parent: CoordinatorLayout, child: BrowserToolbar, dependency: View): Boolean {
|
||||||
|
if (dependency is Snackbar.SnackbarLayout) {
|
||||||
|
positionSnackbar(dependency)
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.layoutDependsOn(parent, child, dependency)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun animateSnap(child: View, direction: SnapDirection) = with(snapAnimator) {
|
||||||
|
addUpdateListener { child.translationY = it.animatedValue as Float }
|
||||||
|
setFloatValues(child.translationY, if (direction == SnapDirection.DOWN) 0f else -child.height.toFloat())
|
||||||
|
start()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("MagicNumber")
|
||||||
|
private fun positionSnackbar(view: View) {
|
||||||
|
val params = view.layoutParams as CoordinatorLayout.LayoutParams
|
||||||
|
|
||||||
|
// Position the snackbar below the toolbar so that it doesn't overlay the toolbar.
|
||||||
|
params.anchorId = R.id.quick_action_sheet
|
||||||
|
params.anchorGravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
|
||||||
|
params.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
|
||||||
|
|
||||||
|
view.layoutParams = params
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,7 +6,6 @@ package org.mozilla.fenix.customtabs
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.google.android.material.appbar.AppBarLayout
|
|
||||||
import mozilla.components.browser.session.SessionManager
|
import mozilla.components.browser.session.SessionManager
|
||||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||||
import mozilla.components.feature.customtabs.CustomTabsToolbarFeature
|
import mozilla.components.feature.customtabs.CustomTabsToolbarFeature
|
||||||
|
@ -24,7 +23,7 @@ class CustomTabsIntegration(
|
||||||
) : LifecycleAwareFeature, BackHandler {
|
) : LifecycleAwareFeature, BackHandler {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
enableToolbarCollapse()
|
toolbar.elevation = 0f
|
||||||
}
|
}
|
||||||
|
|
||||||
private val customTabToolbarMenu by lazy {
|
private val customTabToolbarMenu by lazy {
|
||||||
|
@ -56,16 +55,7 @@ class CustomTabsIntegration(
|
||||||
return feature.onBackPressed()
|
return feature.onBackPressed()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun enableToolbarCollapse() {
|
|
||||||
val params = toolbar.layoutParams as AppBarLayout.LayoutParams
|
|
||||||
params.scrollFlags = DEFAULT_SCROLL_FLAGS
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val DEFAULT_SCROLL_FLAGS = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or
|
|
||||||
AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS or
|
|
||||||
AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP or
|
|
||||||
AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
|
|
||||||
const val START_OF_MENU_ITEMS_INDEX = 2
|
const val START_OF_MENU_ITEMS_INDEX = 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue