github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #6341 (#6383)

Browse source
This commit is contained in:
FourTOne5 2021-12-24 20:28:23 +06:00 committed by GitHub
parent 728e14e8e4
commit 1ab12e380a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
View file

@ -234,22 +234,29 @@ class SettingsLibraryController : SettingsController() {
} }
fun updateSummary() { fun updateSummary() {
val selectedCategories = preferences.libraryUpdateCategories().get() val dbCategories = db.getCategories().executeAsBlocking()
val allCategories = listOf(Category.createDefault(activity!!)) + dbCategories
val includedCategories = preferences.libraryUpdateCategories().get()
.mapNotNull { id -> categories.find { it.id == id.toInt() } } .mapNotNull { id -> categories.find { it.id == id.toInt() } }
.sortedBy { it.order } .sortedBy { it.order }
val includedItemsText = if (selectedCategories.isEmpty()) {
context.getString(R.string.all)
} else {
selectedCategories.joinToString { it.name }
}
val excludedCategories = preferences.libraryUpdateCategoriesExclude().get() val excludedCategories = preferences.libraryUpdateCategoriesExclude().get()
.mapNotNull { id -> categories.find { it.id == id.toInt() } } .mapNotNull { id -> categories.find { it.id == id.toInt() } }
.sortedBy { it.order } .sortedBy { it.order }
val includedItemsText = if (includedCategories.isEmpty()) {
if (excludedCategories.size == allCategories.size) context.getString(R.string.none)
else context.getString(R.string.all)
} else {
includedCategories.joinToString { it.name }
}
val excludedItemsText = if (excludedCategories.isEmpty()) { val excludedItemsText = if (excludedCategories.isEmpty()) {
context.getString(R.string.none) context.getString(R.string.none)
} else { } else {
excludedCategories.joinToString { it.name } if (excludedCategories.size == allCategories.size) context.getString(R.string.all)
else excludedCategories.joinToString { it.name }
} }
summary = buildSpannedString { summary = buildSpannedString {