blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8773: Fixes issue with snackbar placement on ContextMenu (#8942)

master
Sawyer Blatz 2020-03-12 09:54:13 -07:00 committed by GitHub
parent 9a582a6983
commit cc8f34b68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/browser/FenixSnackbarDelegate.kt
View File

@ -19,12 +19,12 @@ class FenixSnackbarDelegate(val view: View) :
listener: ((v: View) -> Unit)? listener: ((v: View) -> Unit)?
) { ) {
if (listener != null && action != 0) { if (listener != null && action != 0) {
FenixSnackbar.makeWithToolbarPadding(view) FenixSnackbar.make(view, duration = FenixSnackbar.LENGTH_SHORT)
.setText(view.context.getString(text)) .setText(view.context.getString(text))
.setAction(view.context.getString(action)) { listener.invoke(view) } .setAction(view.context.getString(action)) { listener.invoke(view) }
.show() .show()
} else { } else {
FenixSnackbar.makeWithToolbarPadding(view) FenixSnackbar.make(view, duration = FenixSnackbar.LENGTH_SHORT)
.setText(view.context.getString(text)) .setText(view.context.getString(text))
.show() .show()
} }

11
app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
View File

@ -110,18 +110,19 @@ class FenixSnackbar private constructor(
} }
/** /**
* Considers BrowserToolbar for padding when making snackbar * Considers BrowserToolbar for padding when making snackbar. The vast majority of the time
* you will want to pass in `fragment.view`.
*/ */
fun makeWithToolbarPadding( fun makeWithToolbarPadding(
view: View, fragmentView: View,
duration: Int = LENGTH_LONG, duration: Int = LENGTH_LONG,
isError: Boolean = false isError: Boolean = false
): FenixSnackbar { ): FenixSnackbar {
val shouldUseBottomToolbar = view.context.settings().shouldUseBottomToolbar val shouldUseBottomToolbar = fragmentView.context.settings().shouldUseBottomToolbar
val toolbarHeight = view.context.resources val toolbarHeight = fragmentView.context.resources
.getDimensionPixelSize(R.dimen.browser_toolbar_height) .getDimensionPixelSize(R.dimen.browser_toolbar_height)
return make(view, duration, isError).apply { return make(fragmentView, duration, isError).apply {
this.view.setPadding( this.view.setPadding(
0, 0,
0, 0,

1
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
View File

@ -81,6 +81,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
bookmarkStore = StoreProvider.get(this) { bookmarkStore = StoreProvider.get(this) {
BookmarkFragmentStore(BookmarkFragmentState(null)) BookmarkFragmentStore(BookmarkFragmentState(null))
} }
bookmarkInteractor = BookmarkFragmentInteractor( bookmarkInteractor = BookmarkFragmentInteractor(
bookmarkStore = bookmarkStore, bookmarkStore = bookmarkStore,
viewModel = sharedViewModel, viewModel = sharedViewModel,