From b172b979eae022221817bacd10533c602d38083f Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Tue, 26 Apr 2022 02:44:34 -0400 Subject: [PATCH] remove all use of capitalize sucks its gone fellas... --- .../tachiyomi/ui/category/CategoryHolder.kt | 3 ++- .../tachiyomi/ui/manga/MangaDetailsPresenter.kt | 16 +++++++++++++--- .../tachiyomi/ui/manga/track/TrackSearchItem.kt | 8 ++++++-- .../tachiyomi/ui/migration/SourceHolder.kt | 5 ++++- .../manga/design/MigrationSourceHolder.kt | 5 ++++- .../tachiyomi/util/lang/StringExtensions.kt | 13 +++++++++++-- 6 files changed, 40 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt index 7992676251..44a26bba27 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt @@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.databinding.CategoriesItemBinding import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.category.CategoryPresenter.Companion.CREATE_CATEGORY_ORDER import eu.kanade.tachiyomi.util.system.getResourceColor +import java.util.Locale /** * Holder used to display category items. @@ -42,7 +43,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie */ fun bind(category: Category) { // Set capitalized title. - binding.title.text = category.name.capitalize() + binding.title.text = category.name.replaceFirstChar { it.titlecase(Locale.getDefault()) } binding.editText.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_DONE) { submitChanges() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index 0172067fec..c4471f54a9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -72,6 +72,7 @@ import java.io.File import java.io.FileOutputStream import java.io.OutputStream import java.util.Date +import java.util.Locale class MangaDetailsPresenter( val manga: Manga, @@ -737,10 +738,18 @@ class MangaDetailsPresenter( manga.author = author?.trimOrNull() manga.artist = artist?.trimOrNull() manga.description = description?.trimOrNull() - val tagsString = tags?.joinToString(", ") { it.capitalize() } + val tagsString = tags?.joinToString(", ") { tag -> + tag.replaceFirstChar { + it.uppercase(Locale.getDefault()) + } + } manga.genre = if (tags.isNullOrEmpty()) null else tagsString?.trim() if (seriesType != null) { - manga.genre = setSeriesType(seriesType, manga.genre).joinToString(", ") { it.capitalize() } + manga.genre = setSeriesType(seriesType, manga.genre).joinToString(", ") { + it.replaceFirstChar { genre -> + genre.titlecase(Locale.getDefault()) + } + } manga.viewer_flags = -1 db.updateViewerFlags(manga).executeAsBlocking() } @@ -749,7 +758,8 @@ class MangaDetailsPresenter( db.updateMangaInfo(manga).executeAsBlocking() } else { var genre = if (!tags.isNullOrEmpty() && tags.joinToString(", ") != manga.originalGenre) { - tags.map { it.capitalize() }.toTypedArray() + tags.map { tag -> tag.replaceFirstChar { it.titlecase(Locale.getDefault()) } } + .toTypedArray() } else { null } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchItem.kt index 2a18dca16c..e1bc4e9bfb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchItem.kt @@ -54,14 +54,18 @@ class TrackSearchItem(val trackSearch: TrackSearch) : AbstractItem + text.titlecase(Locale.getDefault()) + } + } + return firstReplace.split("-").joinToString("-") { + it.replaceFirstChar { text -> + text.titlecase(Locale.getDefault()) + } + } } /**