More ActionToolbar tweaks

This commit is contained in:
arkon 2020-05-02 14:51:28 -04:00
parent ac4ae8103e
commit 33901dd72f
2 changed files with 8 additions and 4 deletions

View File

@ -327,7 +327,6 @@ class LibraryController(
* Destroys the action mode. * Destroys the action mode.
*/ */
private fun destroyActionModeIfNeeded() { private fun destroyActionModeIfNeeded() {
(activity as? MainActivity)?.showBottomNav(visible = true, collapse = true)
actionMode?.finish() actionMode?.finish()
} }
@ -435,10 +434,13 @@ class LibraryController(
} }
override fun onDestroyActionMode(mode: ActionMode?) { override fun onDestroyActionMode(mode: ActionMode?) {
binding.actionToolbar.hide()
// Clear all the manga selections and notify child views. // Clear all the manga selections and notify child views.
selectedMangas.clear() selectedMangas.clear()
selectionRelay.call(LibrarySelectionEvent.Cleared()) selectionRelay.call(LibrarySelectionEvent.Cleared())
binding.actionToolbar.hide()
(activity as? MainActivity)?.showBottomNav(visible = true, collapse = true)
actionMode = null actionMode = null
} }

View File

@ -271,7 +271,6 @@ class UpdatesController :
} }
private fun destroyActionModeIfNeeded() { private fun destroyActionModeIfNeeded() {
(activity as? MainActivity)?.showBottomNav(visible = true, collapse = true)
actionMode?.finish() actionMode?.finish()
} }
@ -353,9 +352,12 @@ class UpdatesController :
* @param mode the ActionMode object * @param mode the ActionMode object
*/ */
override fun onDestroyActionMode(mode: ActionMode?) { override fun onDestroyActionMode(mode: ActionMode?) {
binding.actionToolbar.hide()
adapter?.mode = SelectableAdapter.Mode.IDLE adapter?.mode = SelectableAdapter.Mode.IDLE
adapter?.clearSelection() adapter?.clearSelection()
binding.actionToolbar.hide()
(activity as? MainActivity)?.showBottomNav(visible = true, collapse = true)
actionMode = null actionMode = null
} }