yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Mark common categories when moving them. Closes #135

Browse Source
This commit is contained in:
len 2016-04-18 19:17:05 +02:00
parent 78314077bb
commit 81bce8ef76
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
View File

@ -385,10 +385,15 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
* @param mangas the manga list to move. * @param mangas the manga list to move.
*/ */
private fun moveMangasToCategories(mangas: List<Manga>) { private fun moveMangasToCategories(mangas: List<Manga>) {
val categories = presenter.categories
val commonCategoriesIndexes = presenter.getCommonCategories(mangas)
.map { categories.indexOf(it) }
.toTypedArray()
MaterialDialog.Builder(activity) MaterialDialog.Builder(activity)
.title(R.string.action_move_category) .title(R.string.action_move_category)
.items(presenter.getCategoryNames()) .items(categories.map { it.name })
.itemsCallbackMultiChoice(null) { dialog, positions, text -> .itemsCallbackMultiChoice(commonCategoriesIndexes) { dialog, positions, text ->
presenter.moveMangasToCategories(positions, mangas) presenter.moveMangasToCategories(positions, mangas)
destroyActionModeIfNeeded() destroyActionModeIfNeeded()
true true

10
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -220,11 +220,13 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
} }
/** /**
* Get the category names as a list. * Returns the common categories for the given list of manga.
*
* @param mangas the list of manga.
*/ */
fun getCategoryNames(): List<String> { fun getCommonCategories(mangas: List<Manga>) = mangas.toSet()
return categories.map { it.name } .map { db.getCategoriesForManga(it).executeAsBlocking() }
} .reduce { set1: Iterable<Category>, set2 -> set1.intersect(set2) }
/** /**
* Remove the selected manga from the library. * Remove the selected manga from the library.