No issue: Add Bookmark multi-select edit button
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
|
- #1571 - Added a snackbar for undoing bookmark deletion
|
||||||
- #1079 - Managing site permissions exceptions
|
- #1079 - Managing site permissions exceptions
|
||||||
- #1312 - Added clear textfield buttons for editing bookmarks
|
- #1312 - Added clear textfield buttons for editing bookmarks
|
||||||
|
- #1312 - Added a missing edit action for bookmark selections
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- #1429 - Updated site permissions ui for MVP
|
- #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.ActionBusFactory
|
||||||
import org.mozilla.fenix.mvi.getAutoDisposeObservable
|
import org.mozilla.fenix.mvi.getAutoDisposeObservable
|
||||||
import org.mozilla.fenix.mvi.getManagedEmitter
|
import org.mozilla.fenix.mvi.getManagedEmitter
|
||||||
import org.mozilla.fenix.utils.ItsNotBrokenSnack
|
|
||||||
import kotlin.coroutines.CoroutineContext
|
import kotlin.coroutines.CoroutineContext
|
||||||
|
|
||||||
@SuppressWarnings("TooManyFunctions")
|
@SuppressWarnings("TooManyFunctions")
|
||||||
|
@ -114,9 +113,18 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve
|
||||||
}
|
}
|
||||||
is BookmarkState.Mode.Selecting -> {
|
is BookmarkState.Mode.Selecting -> {
|
||||||
inflater.inflate(R.menu.bookmarks_select_multi, menu)
|
inflater.inflate(R.menu.bookmarks_select_multi, menu)
|
||||||
activity?.title = getString(R.string.bookmarks_multi_select_title, mode.selectedItems.size)
|
|
||||||
val colorFilter =
|
val colorFilter =
|
||||||
PorterDuffColorFilter(R.attr.primaryText.getColorFromAttr(context!!), PorterDuff.Mode.SRC_IN)
|
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)
|
themeToolbar(toolbar, colorFilter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -264,8 +272,13 @@ class BookmarkFragment : Fragment(), CoroutineScope, BackHandler, AccountObserve
|
||||||
.navigate(BookmarkFragmentDirections.actionBookmarkFragmentToHomeFragment())
|
.navigate(BookmarkFragmentDirections.actionBookmarkFragmentToHomeFragment())
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
R.id.share_bookmarks_multi_select -> {
|
R.id.edit_bookmark_multi_select -> {
|
||||||
ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "1539")
|
val bookmark = getSelectedBookmarks().first()
|
||||||
|
Navigation.findNavController(requireActivity(), R.id.container)
|
||||||
|
.navigate(
|
||||||
|
BookmarkFragmentDirections
|
||||||
|
.actionBookmarkFragmentToBookmarkEditFragment(bookmark.guid)
|
||||||
|
)
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
R.id.open_bookmarks_in_private_tabs_multi_select -> {
|
R.id.open_bookmarks_in_private_tabs_multi_select -> {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -5,10 +5,10 @@
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
|
<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">
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/share_bookmarks_multi_select"
|
android:id="@+id/edit_bookmark_multi_select"
|
||||||
android:icon="@drawable/ic_send"
|
android:icon="@drawable/ic_edit"
|
||||||
android:iconTint="?primaryText"
|
android:iconTint="?primaryText"
|
||||||
android:title="@string/bookmark_add_folder"
|
android:title="@string/bookmark_edit"
|
||||||
app:showAsAction="ifRoom"
|
app:showAsAction="ifRoom"
|
||||||
tools:targetApi="o" />
|
tools:targetApi="o" />
|
||||||
<item
|
<item
|
||||||
|
|
Loading…
Reference in New Issue