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

Add clarification for category exclusion (closes #4777)

Browse Source
This commit is contained in:
arkon 2021-04-06 23:29:13 -04:00
parent ef49fc91d8
commit b2d697131c
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
View File

@ -78,7 +78,7 @@ class MoreController :
} }
} }
preference { preference {
titleRes = R.string.label_categories titleRes = R.string.categories
iconRes = R.drawable.ic_label_24dp iconRes = R.drawable.ic_label_24dp
iconTint = tintColor iconTint = tintColor
onClick { onClick {

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

@ -100,7 +100,7 @@ class SettingsDownloadController : SettingsController() {
val categories = listOf(Category.createDefault()) + dbCategories val categories = listOf(Category.createDefault()) + dbCategories
preferenceCategory { preferenceCategory {
titleRes = R.string.pref_download_new titleRes = R.string.pref_category_auto_download
switchPreference { switchPreference {
key = Keys.downloadNew key = Keys.downloadNew
@ -109,7 +109,7 @@ class SettingsDownloadController : SettingsController() {
} }
preference { preference {
key = Keys.downloadNewCategories key = Keys.downloadNewCategories
titleRes = R.string.pref_download_new_categories titleRes = R.string.categories
onClick { onClick {
DownloadCategoriesDialog().showDialog(router) DownloadCategoriesDialog().showDialog(router)
} }
@ -241,7 +241,8 @@ class SettingsDownloadController : SettingsController() {
.toIntArray() .toIntArray()
return MaterialDialog(activity!!) return MaterialDialog(activity!!)
.title(R.string.pref_download_new_categories) .title(R.string.categories)
.message(R.string.pref_download_new_categories_details)
.listItemsQuadStateMultiChoice( .listItemsQuadStateMultiChoice(
items = items, items = items,
initialSelected = preselected initialSelected = preselected

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

@ -83,7 +83,7 @@ class SettingsLibraryController : SettingsController() {
} }
preferenceCategory { preferenceCategory {
titleRes = R.string.pref_category_library_categories titleRes = R.string.categories
preference { preference {
key = "pref_action_edit_categories" key = "pref_action_edit_categories"
@ -171,7 +171,7 @@ class SettingsLibraryController : SettingsController() {
} }
preference { preference {
key = Keys.libraryUpdateCategories key = Keys.libraryUpdateCategories
titleRes = R.string.pref_library_update_categories titleRes = R.string.categories
onClick { onClick {
LibraryGlobalUpdateCategoriesDialog().showDialog(router) LibraryGlobalUpdateCategoriesDialog().showDialog(router)
} }
@ -312,7 +312,8 @@ class SettingsLibraryController : SettingsController() {
.toIntArray() .toIntArray()
return MaterialDialog(activity!!) return MaterialDialog(activity!!)
.title(R.string.pref_library_update_categories) .title(R.string.categories)
.message(R.string.pref_library_update_categories_details)
.listItemsQuadStateMultiChoice( .listItemsQuadStateMultiChoice(
items = items, items = items,
initialSelected = preselected initialSelected = preselected

15
app/src/main/res/values/strings.xml
View File

@ -18,7 +18,6 @@
<string name="label_recent_updates">Updates</string> <string name="label_recent_updates">Updates</string>
<string name="label_recent_manga">History</string> <string name="label_recent_manga">History</string>
<string name="label_sources">Sources</string> <string name="label_sources">Sources</string>
<string name="label_categories">Categories</string>
<string name="label_backup">Backup</string> <string name="label_backup">Backup</string>
<string name="label_migration">Migrate</string> <string name="label_migration">Migrate</string>
<string name="label_extensions">Extensions</string> <string name="label_extensions">Extensions</string>
@ -194,8 +193,8 @@
<string name="default_columns">Default</string> <string name="default_columns">Default</string>
<string name="pref_jump_to_chapters">Jump to chapters on open</string> <string name="pref_jump_to_chapters">Jump to chapters on open</string>
<string name="pref_category_library_update">Updates</string> <string name="pref_category_library_update">Global update</string>
<string name="pref_library_update_interval">Library update frequency</string> <string name="pref_library_update_interval">Update frequency</string>
<string name="update_never">Manual</string> <string name="update_never">Manual</string>
<string name="update_1hour">Hourly</string> <string name="update_1hour">Hourly</string>
<string name="update_2hour">Every 2 hours</string> <string name="update_2hour">Every 2 hours</string>
@ -207,8 +206,8 @@
<string name="update_24hour">Daily</string> <string name="update_24hour">Daily</string>
<string name="update_48hour">Every 2 days</string> <string name="update_48hour">Every 2 days</string>
<string name="update_weekly">Weekly</string> <string name="update_weekly">Weekly</string>
<string name="pref_library_update_prioritization">Library update order</string> <string name="pref_library_update_prioritization">Update order</string>
<string name="pref_library_update_restriction">Library update restrictions</string> <string name="pref_library_update_restriction">Update restrictions</string>
<string name="pref_library_update_restriction_summary">Update only when the conditions are met</string> <string name="pref_library_update_restriction_summary">Update only when the conditions are met</string>
<string name="network_unmetered">Unmetered network</string> <string name="network_unmetered">Unmetered network</string>
<string name="charging">Charging</string> <string name="charging">Charging</string>
@ -217,14 +216,13 @@
<string name="pref_library_update_refresh_metadata_summary">Check for new cover and details when updating library</string> <string name="pref_library_update_refresh_metadata_summary">Check for new cover and details when updating library</string>
<string name="pref_library_update_error_notification">Show update errors notifications</string> <string name="pref_library_update_error_notification">Show update errors notifications</string>
<string name="pref_category_library_categories">Categories</string>
<string name="default_category">Default category</string> <string name="default_category">Default category</string>
<string name="default_category_summary">Always ask</string> <string name="default_category_summary">Always ask</string>
<plurals name="num_categories"> <plurals name="num_categories">
<item quantity="one">%d category</item> <item quantity="one">%d category</item>
<item quantity="other">%d categories</item> <item quantity="other">%d categories</item>
</plurals> </plurals>
<string name="pref_library_update_categories">Categories to include in global update</string> <string name="pref_library_update_categories_details">Manga in excluded categories will not be updated even if they are also in included categories.</string>
<string name="all">All</string> <string name="all">All</string>
<string name="none">None</string> <string name="none">None</string>
<string name="include">Include: %s</string> <string name="include">Include: %s</string>
@ -364,8 +362,9 @@
<string name="third_to_last">Third to last chapter</string> <string name="third_to_last">Third to last chapter</string>
<string name="fourth_to_last">Fourth to last chapter</string> <string name="fourth_to_last">Fourth to last chapter</string>
<string name="fifth_to_last">Fifth to last chapter</string> <string name="fifth_to_last">Fifth to last chapter</string>
<string name="pref_category_auto_download">Auto-download</string>
<string name="pref_download_new">Download new chapters</string> <string name="pref_download_new">Download new chapters</string>
<string name="pref_download_new_categories">Categories to include in download</string> <string name="pref_download_new_categories_details">Manga in excluded categories will not be downloaded even if they are also in included categories.</string>
<!-- Tracking section --> <!-- Tracking section -->
<string name="pref_auto_update_manga_sync">Update chapter progress after reading</string> <string name="pref_auto_update_manga_sync">Update chapter progress after reading</string>