remove all use of capitalize

sucks its gone fellas...
This commit is contained in:
Jays2Kings 2022-04-26 02:44:34 -04:00
parent a60e786810
commit b172b979ea
6 changed files with 40 additions and 10 deletions

View file

@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.databinding.CategoriesItemBinding
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import eu.kanade.tachiyomi.ui.category.CategoryPresenter.Companion.CREATE_CATEGORY_ORDER import eu.kanade.tachiyomi.ui.category.CategoryPresenter.Companion.CREATE_CATEGORY_ORDER
import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.getResourceColor
import java.util.Locale
/** /**
* Holder used to display category items. * Holder used to display category items.
@ -42,7 +43,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie
*/ */
fun bind(category: Category) { fun bind(category: Category) {
// Set capitalized title. // Set capitalized title.
binding.title.text = category.name.capitalize() binding.title.text = category.name.replaceFirstChar { it.titlecase(Locale.getDefault()) }
binding.editText.setOnEditorActionListener { _, actionId, _ -> binding.editText.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE) { if (actionId == EditorInfo.IME_ACTION_DONE) {
submitChanges() submitChanges()

View file

@ -72,6 +72,7 @@ import java.io.File
import java.io.FileOutputStream import java.io.FileOutputStream
import java.io.OutputStream import java.io.OutputStream
import java.util.Date import java.util.Date
import java.util.Locale
class MangaDetailsPresenter( class MangaDetailsPresenter(
val manga: Manga, val manga: Manga,
@ -737,10 +738,18 @@ class MangaDetailsPresenter(
manga.author = author?.trimOrNull() manga.author = author?.trimOrNull()
manga.artist = artist?.trimOrNull() manga.artist = artist?.trimOrNull()
manga.description = description?.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() manga.genre = if (tags.isNullOrEmpty()) null else tagsString?.trim()
if (seriesType != null) { 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 manga.viewer_flags = -1
db.updateViewerFlags(manga).executeAsBlocking() db.updateViewerFlags(manga).executeAsBlocking()
} }
@ -749,7 +758,8 @@ class MangaDetailsPresenter(
db.updateMangaInfo(manga).executeAsBlocking() db.updateMangaInfo(manga).executeAsBlocking()
} else { } else {
var genre = if (!tags.isNullOrEmpty() && tags.joinToString(", ") != manga.originalGenre) { 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 { } else {
null null
} }

View file

@ -54,14 +54,18 @@ class TrackSearchItem(val trackSearch: TrackSearch) : AbstractItem<TrackSearchIt
binding.trackSearchStatus.isVisible = false binding.trackSearchStatus.isVisible = false
binding.trackSearchStatusResult.isVisible = false binding.trackSearchStatusResult.isVisible = false
} else { } else {
binding.trackSearchStatusResult.text = track.publishing_status.capitalize(Locale.ROOT) binding.trackSearchStatusResult.text = track.publishing_status.replaceFirstChar {
it.titlecase(Locale.getDefault())
}
} }
if (track.publishing_type.isBlank()) { if (track.publishing_type.isBlank()) {
binding.trackSearchType.isVisible = false binding.trackSearchType.isVisible = false
binding.trackSearchTypeResult.isVisible = false binding.trackSearchTypeResult.isVisible = false
} else { } else {
binding.trackSearchTypeResult.text = track.publishing_type.capitalize(Locale.ROOT) binding.trackSearchTypeResult.text = track.publishing_type.replaceFirstChar {
it.titlecase(Locale.getDefault())
}
} }
if (track.start_date.isBlank()) { if (track.start_date.isBlank()) {

View file

@ -4,6 +4,7 @@ import android.view.View
import eu.kanade.tachiyomi.databinding.MigrationCardItemBinding import eu.kanade.tachiyomi.databinding.MigrationCardItemBinding
import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.icon
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import java.util.Locale
class SourceHolder(view: View, val adapter: SourceAdapter) : class SourceHolder(view: View, val adapter: SourceAdapter) :
BaseFlexibleViewHolder(view, adapter) { BaseFlexibleViewHolder(view, adapter) {
@ -20,7 +21,9 @@ class SourceHolder(view: View, val adapter: SourceAdapter) :
// Set source name // Set source name
val sourceName = val sourceName =
if (adapter.isMultiLanguage) source.toString() else source.name.capitalize() if (adapter.isMultiLanguage) source.toString() else source.name.replaceFirstChar {
it.titlecase(Locale.getDefault())
}
binding.title.text = sourceName binding.title.text = sourceName
// Set circle letter image. // Set circle letter image.

View file

@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.databinding.MigrationSourceItemBinding
import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.icon
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import java.util.Locale
class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) : class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) :
BaseFlexibleViewHolder(view, adapter) { BaseFlexibleViewHolder(view, adapter) {
@ -17,7 +18,9 @@ class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) :
fun bind(source: HttpSource, sourceEnabled: Boolean) { fun bind(source: HttpSource, sourceEnabled: Boolean) {
// Set capitalized title. // Set capitalized title.
val sourceName = if (adapter.isMultiLanguage) source.toString() else source.name.capitalize() val sourceName = if (adapter.isMultiLanguage) source.toString() else {
source.name.replaceFirstChar { it.titlecase(Locale.getDefault()) }
}
binding.title.text = sourceName binding.title.text = sourceName
// Update circle letter image. // Update circle letter image.
itemView.post { itemView.post {

View file

@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator
import java.net.URI import java.net.URI
import java.net.URISyntaxException import java.net.URISyntaxException
import java.util.Locale
import kotlin.math.floor import kotlin.math.floor
/** /**
@ -89,8 +90,16 @@ fun String.truncateCenter(count: Int, replacement: String = "..."): String {
} }
fun String.capitalizeWords(): String { fun String.capitalizeWords(): String {
val firstReplace = split(" ").joinToString(" ") { it.capitalize() } val firstReplace = split(" ").joinToString(" ") {
return firstReplace.split("-").joinToString("-") { it.capitalize() } it.replaceFirstChar { text ->
text.titlecase(Locale.getDefault())
}
}
return firstReplace.split("-").joinToString("-") {
it.replaceFirstChar { text ->
text.titlecase(Locale.getDefault())
}
}
} }
/** /**