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

Move categories up in library settings

Browse Source 
(cherry picked from commit 4fdb4f14a84d6852742c7d670023e671a46606e5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
This commit is contained in:
arkon 2020-05-23 10:33:49 -04:00 committed by Jobobby04
parent dde7254dcf
commit b0704063f2
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
View File

@ -44,6 +44,9 @@ class SettingsLibraryController : SettingsController() {
override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
titleRes = R.string.pref_category_library
val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
preferenceCategory {
titleRes = R.string.pref_category_display
@ -74,8 +77,40 @@ class SettingsLibraryController : SettingsController() {
}
}
val dbCategories = db.getCategories().executeAsBlocking()
val categories = listOf(Category.createDefault()) + dbCategories
preferenceCategory {
titleRes = R.string.pref_category_library_categories
preference {
titleRes = R.string.action_edit_categories
val catCount = dbCategories.size
summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount)
onClick {
router.pushController(CategoryController().withFadeTransaction())
}
}
intListPreference {
key = Keys.defaultCategory
titleRes = R.string.default_category
entries = arrayOf(context.getString(R.string.default_category_summary)) +
categories.map { it.name }.toTypedArray()
entryValues = arrayOf("-1") + categories.map { it.id.toString() }.toTypedArray()
defaultValue = "-1"
val selectedCategory = categories.find { it.id == preferences.defaultCategory() }
summary = selectedCategory?.name
?: context.getString(R.string.default_category_summary)
onChange { newValue ->
summary = categories.find {
it.id == (newValue as String).toInt()
}?.name ?: context.getString(R.string.default_category_summary)
true
}
}
}
preferenceCategory {
titleRes = R.string.pref_category_library_update
@ -171,42 +206,12 @@ class SettingsLibraryController : SettingsController() {
}
}
preferenceCategory {
titleRes = R.string.pref_category_library_categories
if (preferences.skipPreMigration().get() || preferences.migrationSources().get()
.isNotEmpty()
) {
preferenceCategory {
title = "Migration"
preference {
titleRes = R.string.action_edit_categories
val catCount = dbCategories.size
summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount)
onClick {
router.pushController(CategoryController().withFadeTransaction())
}
}
intListPreference {
key = Keys.defaultCategory
titleRes = R.string.default_category
entries = arrayOf(context.getString(R.string.default_category_summary)) +
categories.map { it.name }.toTypedArray()
entryValues = arrayOf("-1") + categories.map { it.id.toString() }.toTypedArray()
defaultValue = "-1"
val selectedCategory = categories.find { it.id == preferences.defaultCategory() }
summary = selectedCategory?.name
?: context.getString(R.string.default_category_summary)
onChange { newValue ->
summary = categories.find {
it.id == (newValue as String).toInt()
}?.name ?: context.getString(R.string.default_category_summary)
true
}
}
if (preferences.skipPreMigration().get() || preferences.migrationSources()
.get().isNotEmpty()
) {
switchPreference {
key = Keys.skipPreMigration
titleRes = R.string.pref_skip_pre_migration