Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for delete if in category

Browse Source
This commit is contained in:
Jobobby04 2020-10-15 11:27:10 -04:00
parent a4273bb9a2
commit c3a5439d26
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
View File

@ -131,7 +131,7 @@ class SettingsDownloadController : SettingsController() {
summary = context.getString( summary = context.getString(
R.string.pref_dont_delete_from_categories_summary, R.string.pref_dont_delete_from_categories_summary,
if (selectedCategories.isEmpty()) { if (selectedCategories.isEmpty()) {
context.getString(R.string.all) context.getString(R.string.tapping_inverted_none)
} else { } else {
selectedCategories.joinToString { it.name } selectedCategories.joinToString { it.name }
} }

2
app/src/main/java/exh/util/MangaExtensions.kt
View File

@ -16,5 +16,5 @@ fun Manga.shouldDeleteChapters(db: DatabaseHelper, prefs: PreferencesHelper): Bo
.mapNotNull { it.id } .mapNotNull { it.id }
.takeUnless { it.isEmpty() } ?: listOf(0) .takeUnless { it.isEmpty() } ?: listOf(0)
return categoriesForManga.any { it !in categoriesToNotDeleteFrom } return categoriesForManga.intersect(categoriesToNotDeleteFrom).isNotEmpty()
} }

2
app/src/main/res/values/strings_sy.xml
View File

@ -190,7 +190,7 @@
<string name="save_chapter_as_cbz">Save Chapters as CBZ</string> <string name="save_chapter_as_cbz">Save Chapters as CBZ</string>
<string name="save_chapter_as_cbz_level">CBZ Compression level</string> <string name="save_chapter_as_cbz_level">CBZ Compression level</string>
<string name="pref_dont_delete_from_categories">Categories to exclude from deletion</string> <string name="pref_dont_delete_from_categories">Categories to exclude from deletion</string>
<string name="pref_dont_delete_from_categories_summary">If a manga is only in these categories, chapters will not be deleted when marking as read and when finishing a chapter.\nCategories:\n%1$s</string> <string name="pref_dont_delete_from_categories_summary">If a manga is in any of these categories, chapters will not be deleted when marking as read and when finishing a chapter.\nCategories:\n%1$s</string>
<!-- Security settings --> <!-- Security settings -->
<string name="biometric_lock_times">Biometric lock times</string> <string name="biometric_lock_times">Biometric lock times</string>