javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases 5 Wiki Activity

Change usage of name to visualName when Default category can be shown (#7725)

Browse Source
This commit is contained in:
Andreas
2022-08-11 15:07:20 +02:00
committed by GitHub
parent 11f640cfee
commit ff996d282a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
+3 -3
View File
@@ -122,7 +122,7 @@ class SettingsDownloadController : SettingsController() {
summary = if (selected.isEmpty()) {
resources?.getString(R.string.none)
} else {
selected.joinToString { it.name }
selected.joinToString { it.visualName(context) }
}
}.launchIn(viewScope)
}
@@ -151,7 +151,7 @@ class SettingsDownloadController : SettingsController() {
val includedItemsText = if (selectedCategories.isEmpty()) {
context.getString(R.string.all)
} else {
selectedCategories.joinToString { it.name }
selectedCategories.joinToString { it.visualName(context) }
}
val excludedCategories = preferences.downloadNewChapterCategoriesExclude().get()
@@ -160,7 +160,7 @@ class SettingsDownloadController : SettingsController() {
val excludedItemsText = if (excludedCategories.isEmpty()) {
context.getString(R.string.none)
} else {
excludedCategories.joinToString { it.name }
excludedCategories.joinToString { it.visualName(context) }
}
summary = buildSpannedString {
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+4 -4
View File
@@ -115,12 +115,12 @@ class SettingsLibraryController : SettingsController() {
defaultValue = "-1"
val selectedCategory = allCategories.find { it.id == preferences.defaultCategory().toLong() }
summary = selectedCategory?.name
summary = selectedCategory?.visualName(context)
?: context.getString(R.string.default_category_summary)
onChange { newValue ->
summary = allCategories.find {
it.id == (newValue as String).toLong()
}?.name ?: context.getString(R.string.default_category_summary)
}?.visualName(context) ?: context.getString(R.string.default_category_summary)
true
}
}
@@ -250,7 +250,7 @@ class SettingsLibraryController : SettingsController() {
val includedItemsText = when {
// Some selected, but not all
includedCategories.isNotEmpty() && includedCategories.size != allCategories.size -> includedCategories.joinToString { it.name }
includedCategories.isNotEmpty() && includedCategories.size != allCategories.size -> includedCategories.joinToString { it.visualName(context) }
// All explicitly selected
includedCategories.size == allCategories.size -> context.getString(R.string.all)
allExcluded -> context.getString(R.string.none)
@@ -259,7 +259,7 @@ class SettingsLibraryController : SettingsController() {
val excludedItemsText = when {
excludedCategories.isEmpty() -> context.getString(R.string.none)
allExcluded -> context.getString(R.string.all)
else -> excludedCategories.joinToString { it.name }
else -> excludedCategories.joinToString { it.visualName(context) }
}
summary = buildSpannedString {