Fix tap region for manga summary
(cherry picked from commit e990ad25eb)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
# app/src/main/res/layout/manga_info_header.xml
This commit is contained in:
@@ -78,11 +78,11 @@ class MangaInfoItemAdapter(
|
||||
|
||||
inner class HeaderViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
|
||||
fun bind() {
|
||||
binding.mangaSummary.longClicks()
|
||||
binding.mangaSummaryText.longClicks()
|
||||
.onEach {
|
||||
controller.activity?.copyToClipboard(
|
||||
view.context.getString(R.string.description),
|
||||
binding.mangaSummary.text.toString()
|
||||
binding.mangaSummaryText.text.toString()
|
||||
)
|
||||
}
|
||||
.launchIn(scope)
|
||||
@@ -106,14 +106,14 @@ class MangaInfoItemAdapter(
|
||||
showMangaInfo(hasInfoContent)
|
||||
if (hasInfoContent) {
|
||||
// Update description TextView.
|
||||
binding.mangaSummary.text = if (manga.description.isNullOrBlank()) {
|
||||
binding.mangaSummaryText.text = if (manga.description.isNullOrBlank()) {
|
||||
view.context.getString(R.string.unknown)
|
||||
} else {
|
||||
manga.description
|
||||
}
|
||||
|
||||
if (binding.mangaSummary.text == "meta") {
|
||||
binding.mangaSummary.isVisible = false
|
||||
if (binding.mangaSummaryText.text == "meta") {
|
||||
binding.mangaSummaryText.isVisible = false
|
||||
binding.mangaSummaryLabel.setText(R.string.tags)
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ class MangaInfoItemAdapter(
|
||||
}
|
||||
|
||||
// Handle showing more or less info
|
||||
merge(view.clicks(), binding.mangaSummary.clicks(), binding.mangaInfoToggle.clicks())
|
||||
merge(binding.mangaSummarySection.clicks(), binding.mangaSummaryText.clicks(), binding.mangaInfoToggle.clicks())
|
||||
.onEach { toggleMangaInfo(view.context) }
|
||||
.launchIn(scope)
|
||||
|
||||
@@ -159,10 +159,7 @@ class MangaInfoItemAdapter(
|
||||
}
|
||||
|
||||
private fun showMangaInfo(visible: Boolean) {
|
||||
binding.mangaSummaryLabel.isVisible = visible
|
||||
binding.mangaSummary.isVisible = visible
|
||||
binding.mangaGenresTagsWrapper.isVisible = visible
|
||||
binding.mangaInfoToggle.isVisible = visible
|
||||
binding.mangaSummarySection.isVisible = visible
|
||||
}
|
||||
|
||||
private fun toggleMangaInfo(context: Context) {
|
||||
@@ -183,7 +180,7 @@ class MangaInfoItemAdapter(
|
||||
}
|
||||
}
|
||||
|
||||
with(binding.mangaSummary) {
|
||||
with(binding.mangaSummaryText) {
|
||||
maxLines =
|
||||
if (isExpanded) {
|
||||
2
|
||||
|
||||
Reference in New Issue
Block a user