No issue: Add Bookmark multi-select edit button

nightly-build-test
Colin Lee 5 years ago
parent ec35283c9a
commit 6bff472276

@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- #1571 - Added a snackbar for undoing bookmark deletion
- #1079 - Managing site permissions exceptions
- #1312 - Added clear textfield buttons for editing bookmarks
- #1312 - Added a missing edit action for bookmark selections
### Changed
- #1429 - Updated site permissions ui for MVP

@ -52,7 +52,6 @@ import org.mozilla.fenix.ext.urlToHost
import org.mozilla.fenix.mvi.ActionBusFactory
import org.mozilla.fenix.mvi.getAutoDisposeObservable
import org.mozilla.fenix.mvi.getManagedEmitter
import org.mozilla.fenix.utils.ItsNotBrokenSnack
import kotlin.coroutines.CoroutineContext
@SuppressWarnings("TooManyFunctions")
@ -114,9 +113,18 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve
}
is BookmarkState.Mode.Selecting -> {
inflater.inflate(R.menu.bookmarks_select_multi, menu)
activity?.title = getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size)
val colorFilter =
PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
val enableEditButton = mode.selectedItems.size == 1
menu.findItem(R.id.edit_bookmark_multi_select).run {
isVisible = enableEditButton
if (enableEditButton) {
icon.colorFilter = colorFilter
}
}
activity?.title = getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size)
themeToolbar(toolbar, colorFilter)
}
}
@ -264,8 +272,13 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve
.navigate(BookmarkFragmentDirections.actionBookmarkFragmentToHomeFragment())
true
}
R.id.share_bookmarks_multi_select -> {
ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "1539")
R.id.edit_bookmark_multi_select -> {
val bookmark = getSelectedBookmarks().first()
Navigation.findNavController(requireActivity(), R.id.container)
.navigate(
BookmarkFragmentDirections
.actionBookmarkFragmentToBookmarkEditFragment(bookmark.guid)
)
true
}
R.id.open_bookmarks_in_private_tabs_multi_select -> {

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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/. -->
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M3.88,20.12l3.774,-1.62a0.768,0.768 0,0 0,0.235 -0.159l-2.233,-2.23a0.744,0.744 0,0 0,-0.158 0.234zM19.12,8.891L8.772,19.228a2.009,2.009 0,0 1,-0.626 0.424l-5.5,2.356a0.5,0.5 0,0 1,-0.657 -0.657l2.357,-5.5a2.018,2.018 0,0 1,0.422 -0.624L15.1,4.869a0.5,0.5 0,0 1,0.707 0l3.313,3.315a0.5,0.5 0,0 1,0 0.707zM16.861,3.1l0.5,-0.506a2,2 0,0 1,2.828 0l1.2,1.2a2,2 0,0 1,0 2.828l-0.509,0.507a0.5,0.5 0,0 1,-0.706 0l-3.32,-3.319a0.5,0.5 0,0 1,0.007 -0.71z"/>
</vector>

@ -5,10 +5,10 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/share_bookmarks_multi_select"
android:icon="@drawable/ic_send"
android:id="@+id/edit_bookmark_multi_select"
android:icon="@drawable/ic_edit"
android:iconTint="?primaryText"
android:title="@string/bookmark_add_folder"
android:title="@string/bookmark_edit"
app:showAsAction="ifRoom"
tools:targetApi="o" />
<item

Loading…
Cancel
Save