Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-09 19:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename mangaType to seriesType

Browse Source
This commit is contained in:
Jays2Kings 2021-04-14 20:53:06 -04:00
parent 3cd5043e67
commit 7fd4c69c3e
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View File

@ -53,9 +53,9 @@ interface Manga : SManga {
fun showChapterTitle(defaultShow: Boolean): Boolean = chapter_flags and DISPLAY_MASK == DISPLAY_NUMBER fun showChapterTitle(defaultShow: Boolean): Boolean = chapter_flags and DISPLAY_MASK == DISPLAY_NUMBER
fun mangaType(context: Context): String { fun seriesType(context: Context): String {
return context.getString( return context.getString(
when (mangaType()) { when (seriesType()) {
TYPE_WEBTOON -> R.string.webtoon TYPE_WEBTOON -> R.string.webtoon
TYPE_MANHWA -> R.string.manhwa TYPE_MANHWA -> R.string.manhwa
TYPE_MANHUA -> R.string.manhua TYPE_MANHUA -> R.string.manhua
@ -76,7 +76,7 @@ interface Manga : SManga {
/** /**
* The type of comic the manga is (ie. manga, manhwa, manhua) * The type of comic the manga is (ie. manga, manhwa, manhua)
*/ */
fun mangaType(): Int { fun seriesType(): Int {
val sourceName = Injekt.get<SourceManager>().getOrStub(source).name val sourceName = Injekt.get<SourceManager>().getOrStub(source).name
val currentTags = val currentTags =
genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList() genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) } ?: emptyList()

2
app/src/main/java/eu/kanade/tachiyomi/ui/category/addtolibrary/SetCategoriesSheet.kt
View File

@ -68,7 +68,7 @@ class SetCategoriesSheet(
R.string.move_x_to R.string.move_x_to
}, },
if (listManga.size == 1) { if (listManga.size == 1) {
listManga.first().mangaType(context) listManga.first().seriesType(context)
} else { } else {
context.getString(R.string.selection).lowercase(Locale.ROOT) context.getString(R.string.selection).lowercase(Locale.ROOT)
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -253,9 +253,9 @@ class LibraryPresenter(
if (filterMangaType > 0) { if (filterMangaType > 0) {
if (if (filterMangaType == Manga.TYPE_MANHWA) { if (if (filterMangaType == Manga.TYPE_MANHWA) {
(filterMangaType != item.manga.mangaType() && filterMangaType != Manga.TYPE_WEBTOON) (filterMangaType != item.manga.seriesType() && filterMangaType != Manga.TYPE_WEBTOON)
} else { } else {
filterMangaType != item.manga.mangaType() filterMangaType != item.manga.seriesType()
} }
) return false ) return false
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
View File

@ -280,9 +280,9 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
} }
val libraryManga = db.getLibraryMangas().executeAsBlocking() val libraryManga = db.getLibraryMangas().executeAsBlocking()
val types = mutableListOf<Int>() val types = mutableListOf<Int>()
if (libraryManga.any { it.mangaType() == Manga.TYPE_MANHWA }) types.add(R.string.manhwa) if (libraryManga.any { it.seriesType() == Manga.TYPE_MANHWA }) types.add(R.string.manhwa)
if (libraryManga.any { it.mangaType() == Manga.TYPE_MANHUA }) types.add(R.string.manhua) if (libraryManga.any { it.seriesType() == Manga.TYPE_MANHUA }) types.add(R.string.manhua)
if (libraryManga.any { it.mangaType() == Manga.TYPE_COMIC }) types.add(R.string.comic) if (libraryManga.any { it.seriesType() == Manga.TYPE_COMIC }) types.add(R.string.comic)
if (types.isNotEmpty()) { if (types.isNotEmpty()) {
launchUI { launchUI {
val mangaType = inflate(R.layout.filter_tag_group) as FilterTagGroup val mangaType = inflate(R.layout.filter_tag_group) as FilterTagGroup

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
View File

@ -742,7 +742,7 @@ class MangaDetailsController :
manga?.source != LocalSource.ID && presenter.manga.favorite manga?.source != LocalSource.ID && presenter.manga.favorite
menu.findItem(R.id.action_migrate).title = view?.context?.getString( menu.findItem(R.id.action_migrate).title = view?.context?.getString(
R.string.migrate_, R.string.migrate_,
presenter.manga.mangaType(view!!.context) presenter.manga.seriesType(view!!.context)
) )
val iconPrimary = view?.context?.getResourceColor(android.R.attr.textColorPrimary) val iconPrimary = view?.context?.getResourceColor(android.R.attr.textColorPrimary)
?: Color.BLACK ?: Color.BLACK
@ -980,7 +980,7 @@ class MangaDetailsController :
presenter.downloadChapters(chapters) presenter.downloadChapters(chapters)
val text = view.context.getString( val text = view.context.getString(
R.string.add_x_to_library, R.string.add_x_to_library,
presenter.manga.mangaType presenter.manga.seriesType
(view.context).toLowerCase(Locale.ROOT) (view.context).toLowerCase(Locale.ROOT)
) )
if (!presenter.manga.favorite && ( if (!presenter.manga.favorite && (

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
View File

@ -171,7 +171,7 @@ class MangaHeaderHolder(
} }
binding.mangaSummaryLabel.text = itemView.context.getString( binding.mangaSummaryLabel.text = itemView.context.getString(
R.string.about_this_, R.string.about_this_,
manga.mangaType(itemView.context) manga.seriesType(itemView.context)
) )
with(binding.favoriteButton) { with(binding.favoriteButton) {
icon = ContextCompat.getDrawable( icon = ContextCompat.getDrawable(

2
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RemoveHistoryDialog.kt
View File

@ -40,7 +40,7 @@ class RemoveHistoryDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
).checkBoxPrompt( ).checkBoxPrompt(
text = activity.getString( text = activity.getString(
R.string.reset_all_chapters_for_this_, R.string.reset_all_chapters_for_this_,
manga!!.mangaType(activity) manga!!.seriesType(activity)
) )
) {}.negativeButton(android.R.string.cancel).positiveButton(R.string.reset) { ) {}.negativeButton(android.R.string.cancel).positiveButton(R.string.reset) {
onPositive(it.isCheckPromptChecked()) onPositive(it.isCheckPromptChecked())