blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Issue #9472: ForceExpand browser toolbar when navigating (#9552)

master
Sawyer Blatz 2020-03-31 11:16:40 -07:00 committed by GitHub
parent 5f68d6cb29
commit 1a2b65d854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -453,6 +453,17 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
)
session.register(observer = object : Session.Observer {
override fun onNavigationStateChanged(
session: Session,
canGoBack: Boolean,
canGoForward: Boolean
) {
// Once https://bugzilla.mozilla.org/show_bug.cgi?id=1626338 is fixed, we can
// rely solely on `onLoadRequest` entirely, but as it stands that is not called
// for history navigation (back or forward).
browserToolbarView.expand()
}
override fun onLoadRequest(
session: Session,
url: String,

14
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
View File

@ -11,18 +11,18 @@ import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.PopupWindow
import androidx.annotation.LayoutRes
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import androidx.lifecycle.LifecycleOwner
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.browser_toolbar_popup_window.view.copy
import kotlinx.android.synthetic.main.browser_toolbar_popup_window.view.paste
import kotlinx.android.synthetic.main.browser_toolbar_popup_window.view.paste_and_go
import kotlinx.android.synthetic.main.component_browser_top_toolbar.view.app_bar
import kotlinx.android.synthetic.main.browser_toolbar_popup_window.view.*
import kotlinx.android.synthetic.main.component_browser_top_toolbar.view.*
import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
import mozilla.components.browser.session.Session
import mozilla.components.browser.toolbar.BrowserToolbar
import mozilla.components.browser.toolbar.behavior.BrowserToolbarBottomBehavior
import mozilla.components.browser.toolbar.display.DisplayToolbar
import mozilla.components.support.ktx.android.util.dpToFloat
import mozilla.components.support.utils.URLStringUtils
@ -240,7 +240,11 @@ class BrowserToolbarView(
}
fun expand() {
if (!settings.shouldUseBottomToolbar) {
if (settings.shouldUseBottomToolbar) {
(view.layoutParams as CoordinatorLayout.LayoutParams).apply {
(behavior as BrowserToolbarBottomBehavior).forceExpand(view)
}
} else {
layout.app_bar?.setExpanded(true)
}
}