diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
index c5ee1632a..a9c5257a0 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
@@ -131,7 +131,7 @@ class BookmarkFragment : Fragment(), BackHandler, AccountObserver {
activity?.run {
ViewModelProviders.of(this).get(BookmarksSharedViewModel::class.java)
- }!!.selectedFolder = null
+ }!!.selectedFolder = currentRoot
}
}
}
@@ -152,7 +152,7 @@ class BookmarkFragment : Fragment(), BackHandler, AccountObserver {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
when (val mode = (bookmarkComponent.uiView as BookmarkUIView).mode) {
BookmarkState.Mode.Normal -> {
- inflater.inflate(R.menu.library_menu, menu)
+ inflater.inflate(R.menu.bookmarks_menu, menu)
}
is BookmarkState.Mode.Selecting -> {
inflater.inflate(R.menu.bookmarks_select_multi, menu)
@@ -326,6 +326,14 @@ class BookmarkFragment : Fragment(), BackHandler, AccountObserver {
.popBackStack(R.id.libraryFragment, true)
true
}
+ R.id.add_bookmark_folder -> {
+ nav(
+ R.id.bookmarkFragment,
+ BookmarkFragmentDirections
+ .actionBookmarkFragmentToBookmarkAddFolderFragment()
+ )
+ true
+ }
R.id.open_bookmarks_in_new_tabs_multi_select -> {
getSelectedBookmarks().forEach { node ->
node.url?.let {
diff --git a/app/src/main/res/drawable/ic_folder_new.xml b/app/src/main/res/drawable/ic_folder_new.xml
new file mode 100644
index 000000000..a8de11332
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_new.xml
@@ -0,0 +1,13 @@
+
+
+