github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-21 20:47:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't show option to delete chapters for local manga (closes #5243)

Browse source
This commit is contained in:
arkon 2021-09-12 13:01:53 -04:00
parent 1a8155c45b
commit 8362bf0886
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt
View file

@ -7,6 +7,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.util.isLocal
class DeleteLibraryMangasDialog<T>(bundle: Bundle? = null) : class DeleteLibraryMangasDialog<T>(bundle: Bundle? = null) :
DialogController(bundle) where T : Controller, T : DeleteLibraryMangasDialog.Listener { DialogController(bundle) where T : Controller, T : DeleteLibraryMangasDialog.Listener {
@ -19,7 +20,17 @@ class DeleteLibraryMangasDialog<T>(bundle: Bundle? = null) :
} }
override fun onCreateDialog(savedViewState: Bundle?): Dialog { override fun onCreateDialog(savedViewState: Bundle?): Dialog {
val items = resources!!.getStringArray(R.array.delete_selected_mangas) val canDeleteChapters = mangas.any { !it.isLocal() }
val items = when (canDeleteChapters) {
true -> listOf(
R.string.manga_from_library,
R.string.downloaded_chapters,
)
false -> listOf(R.string.manga_from_library)
}
.map { resources!!.getString(it) }
.toTypedArray()
val selected = items val selected = items
.mapIndexed { i, _ -> i == 0 } .mapIndexed { i, _ -> i == 0 }
.toBooleanArray() .toBooleanArray()
@ -30,7 +41,7 @@ class DeleteLibraryMangasDialog<T>(bundle: Bundle? = null) :
} }
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->
val deleteFromLibrary = selected[0] val deleteFromLibrary = selected[0]
val deleteChapters = selected[1] val deleteChapters = canDeleteChapters && selected[1]
(targetController as? Listener)?.deleteMangas(mangas, deleteFromLibrary, deleteChapters) (targetController as? Listener)?.deleteMangas(mangas, deleteFromLibrary, deleteChapters)
} }
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)

5
app/src/main/res/values/arrays.xml
View file

@ -84,11 +84,6 @@
<item>@string/tapping_inverted_both</item> <item>@string/tapping_inverted_both</item>
</string-array> </string-array>
<string-array name="delete_selected_mangas">
<item>@string/manga_from_library</item>
<item>@string/downloaded_chapters</item>
</string-array>
<string-array name="pager_nav"> <string-array name="pager_nav">
<item>@string/label_default</item> <item>@string/label_default</item>
<item>@string/l_nav</item> <item>@string/l_nav</item>