admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Combine author and artist fields in manga info"

Browse Source 
This reverts commit da7d3f3a9e.

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
This commit is contained in:
Jobobby04
2020-06-23 22:40:11 -04:00
parent a6b6776447
commit 1cc36379e0
8 changed files with 219 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
+27 -5
View File
@@ -131,11 +131,27 @@ class MangaAllInOneHolder(
}
.launchIn(adapter.delegate.controllerScope)
binding.mangaArtist.longClicks()
.onEach {
adapter.delegate.copyToClipboard(binding.mangaArtistLabel.text.toString(), binding.mangaArtist.text.toString())
}
.launchIn(adapter.delegate.controllerScope)
binding.mangaArtist.clicks()
.onEach {
var text = binding.mangaArtist.text.toString()
if (adapter.delegate.isEHentaiBasedSource()) {
text = adapter.delegate.wrapTag("artist", text)
}
adapter.delegate.performGlobalSearch(text)
}
.launchIn(adapter.delegate.controllerScope)
binding.mangaAuthor.longClicks()
.onEach {
// EXH Special case E-Hentai/ExHentai to ignore author field (unused)
if (!adapter.delegate.isEHentaiBasedSource()) {
adapter.delegate.copyToClipboard("author", binding.mangaAuthor.text.toString())
adapter.delegate.copyToClipboard(binding.mangaAuthorLabel.text.toString(), binding.mangaAuthor.text.toString())
}
}
.launchIn(adapter.delegate.controllerScope)
@@ -187,12 +203,18 @@ class MangaAllInOneHolder(
manga.title
}
// Update author/artist TextView.
val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct()
binding.mangaAuthor.text = if (authors.isEmpty()) {
// Update artist TextView.
binding.mangaArtist.text = if (manga.artist.isNullOrBlank()) {
itemView.context.getString(R.string.unknown)
} else {
authors.joinToString(", ")
manga.artist
}
// Update author TextView.
binding.mangaAuthor.text = if (manga.author.isNullOrBlank()) {
itemView.context.getString(R.string.unknown)
} else {
manga.author
}
// If manga source is known update source TextView.
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
+29 -4
View File
@@ -176,6 +176,25 @@ class MangaInfoController(private val fromSource: Boolean = false) :
}
.launchIn(scope)
binding.mangaArtist.longClicks()
.onEach {
activity?.copyToClipboard(
binding.mangaArtistLabel.text.toString(),
binding.mangaArtist.text.toString()
)
}
.launchIn(scope)
binding.mangaArtist.clicks()
.onEach {
var text = binding.mangaArtist.text.toString()
if (isEHentaiBasedSource()) {
text = wrapTag("artist", text)
}
performGlobalSearch(text)
}
.launchIn(scope)
binding.mangaAuthor.longClicks()
.onEach {
// EXH Special case E-Hentai/ExHentai to ignore author field (unused)
@@ -318,12 +337,18 @@ class MangaInfoController(private val fromSource: Boolean = false) :
manga.title
}
// Update author/artist TextView.
val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct()
binding.mangaAuthor.text = if (authors.isEmpty()) {
// Update artist TextView.
binding.mangaArtist.text = if (manga.artist.isNullOrBlank()) {
view.context.getString(R.string.unknown)
} else {
authors.joinToString(", ")
manga.artist
}
// Update author TextView.
binding.mangaAuthor.text = if (manga.author.isNullOrBlank()) {
view.context.getString(R.string.unknown)
} else {
manga.author
}
// If manga source is known update source TextView.