diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt index a05015112..682f6643b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt @@ -6,6 +6,7 @@ import com.bluelinelabs.conductor.Controller import com.google.android.material.dialog.MaterialAlertDialogBuilder import eu.kanade.domain.category.model.Category import eu.kanade.domain.manga.model.Manga +import eu.kanade.presentation.category.visualName import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.pushController @@ -41,7 +42,7 @@ class ChangeMangaCategoriesDialog(bundle: Bundle? = null) : .apply { if (categories.isNotEmpty()) { setQuadStateMultiChoiceItems( - items = categories.map { it.name }, + items = categories.map { it.visualName(context) }, isActionList = false, initialSelected = preselected.toIntArray(), ) { selections -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt index 7c89ae6c6..da41c8933 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt @@ -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 { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index ced54c2c2..18c12b85a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -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 {