mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-01 22:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.kt
View File

@@ -134,7 +134,7 @@ class DownloadFragment : BaseRxFragment<DownloadPresenter>() {
// Set clear button visibility.
clearButton = menu.findItem(R.id.clear_queue).apply {
if (adapter.itemCount > 0) {
if (!presenter.downloadQueue.isEmpty()) {
isVisible = true
}
}
@@ -147,7 +147,6 @@ class DownloadFragment : BaseRxFragment<DownloadPresenter>() {
R.id.clear_queue -> {
DownloadService.stop(activity)
presenter.clearQueue()
clearButton?.isVisible = false
}
else -> return super.onOptionsItemSelected(item)
}
@@ -223,7 +222,7 @@ class DownloadFragment : BaseRxFragment<DownloadPresenter>() {
isRunning = running
startButton?.isVisible = !running && !presenter.downloadQueue.isEmpty()
pauseButton?.isVisible = running
clearButton?.isVisible = running
clearButton?.isVisible = !presenter.downloadQueue.isEmpty()
// Check if download queue is empty and update information accordingly.
setInformationView()

21
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
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.
*/

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
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()