Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
422cf747
Commit
422cf747
authored
May 26, 2020
by
Simon Chae
Committed by
Arturo Mejia
May 26, 2020
Browse files
For #8319: Integrate nest WebExtensionBrowserMenu support
parent
bd9ff675
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View file @
422cf747
...
...
@@ -68,6 +68,10 @@ class DefaultToolbarMenu(
menuItems
,
endOfMenuAlwaysVisible
=
!
shouldReverseItems
,
store
=
store
,
webExtIconTintColorResource
=
primaryTextColor
(),
onAddonsManagerTapped
=
{
onItemTapped
.
invoke
(
ToolbarMenu
.
Item
.
AddonsManager
)
},
appendExtensionActionAtStart
=
!
shouldReverseItems
)
}
...
...
@@ -186,7 +190,6 @@ class DefaultToolbarMenu(
val
menuItems
=
listOfNotNull
(
historyItem
,
bookmarksItem
,
addons
,
settings
,
if
(
shouldDeleteDataOnQuit
)
deleteDataOnQuit
else
null
,
BrowserMenuDivider
(),
...
...
@@ -211,14 +214,6 @@ class DefaultToolbarMenu(
}
}
private
val
addons
=
BrowserMenuImageText
(
label
=
context
.
getString
(
R
.
string
.
browser_menu_add_ons
),
imageResource
=
R
.
drawable
.
mozac_ic_extensions
,
iconTintColorResource
=
primaryTextColor
()
)
{
onItemTapped
.
invoke
(
ToolbarMenu
.
Item
.
AddonsManager
)
}
private
val
settings
=
BrowserMenuHighlightableItem
(
label
=
context
.
getString
(
R
.
string
.
browser_menu_settings
),
startImageResource
=
R
.
drawable
.
ic_settings
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment