Fix #329. Add confirmation before removing favorite manga on multiple selection. Add new proguard rules

This commit is contained in:
len
2016-06-05 23:40:27 +02:00
parent 156e43290e
commit d1db2d60ec
9 changed files with 41 additions and 15 deletions

View File

@@ -313,13 +313,8 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
changeSelectedCover(presenter.selectedMangas)
destroyActionModeIfNeeded()
}
R.id.action_move_to_category -> {
moveMangasToCategories(presenter.selectedMangas)
}
R.id.action_delete -> {
presenter.deleteMangas()
destroyActionModeIfNeeded()
}
R.id.action_move_to_category -> moveMangasToCategories(presenter.selectedMangas)
R.id.action_delete -> showDeleteMangaDialog()
else -> return false
}
return true
@@ -409,6 +404,18 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
.show()
}
private fun showDeleteMangaDialog() {
MaterialDialog.Builder(activity)
.content(R.string.confirm_delete_manga)
.positiveText(android.R.string.yes)
.negativeText(android.R.string.no)
.onPositive { dialog, action ->
presenter.removeMangaFromLibrary()
destroyActionModeIfNeeded()
}
.show()
}
/**
* Creates the action mode if it's not created already.
*/

View File

@@ -236,7 +236,7 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
/**
* Remove the selected manga from the library.
*/
fun deleteMangas() {
fun removeMangaFromLibrary() {
// Create a set of the list
val mangaToDelete = selectedMangas.toSet()