mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-28 17:19:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow selecting default category for auto download

Browse source
This commit is contained in:
arkon 2020-02-16 17:17:23 -05:00
parent 958dbfdfa5
commit b04ebb1782
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
View file

@ -13,6 +13,7 @@ import com.afollestad.materialdialogs.MaterialDialog
import com.hippo.unifile.UniFile import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Category
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.DialogController
@ -72,6 +73,7 @@ class SettingsDownloadController : SettingsController() {
} }
val dbCategories = db.getCategories().executeAsBlocking() val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
preferenceCategory { preferenceCategory {
titleRes = R.string.pref_download_new titleRes = R.string.pref_download_new
@ -84,8 +86,8 @@ class SettingsDownloadController : SettingsController() {
multiSelectListPreference { multiSelectListPreference {
key = Keys.downloadNewCategories key = Keys.downloadNewCategories
titleRes = R.string.pref_download_new_categories titleRes = R.string.pref_download_new_categories
entries = dbCategories.map { it.name }.toTypedArray() entries = categories.map { it.name }.toTypedArray()
entryValues = dbCategories.map { it.id.toString() }.toTypedArray() entryValues = categories.map { it.id.toString() }.toTypedArray()
preferences.downloadNew().asObservable() preferences.downloadNew().asObservable()
.subscribeUntilDestroy { isVisible = it } .subscribeUntilDestroy { isVisible = it }
@ -93,7 +95,7 @@ class SettingsDownloadController : SettingsController() {
preferences.downloadNewCategories().asObservable() preferences.downloadNewCategories().asObservable()
.subscribeUntilDestroy { .subscribeUntilDestroy {
val selectedCategories = it val selectedCategories = it
.mapNotNull { id -> dbCategories.find { it.id == id.toInt() } } .mapNotNull { id -> categories.find { it.id == id.toInt() } }
.sortedBy { it.order } .sortedBy { it.order }
summary = if (selectedCategories.isEmpty()) summary = if (selectedCategories.isEmpty())