From 5e59d05598fee155b6491b31f553bc16d532917c Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 31 Jul 2020 12:58:13 -0400
Subject: [PATCH] Fix tap region for manga summary

(cherry picked from commit e990ad25eb80317b915abc042fdc3085da070e84)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/res/layout/manga_info_header.xml
---
 .../ui/manga/info/MangaInfoItemAdapter.kt     | 19 ++++++++-----------
 app/src/main/res/layout/manga_info_item.xml   | 12 ++++++------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoItemAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoItemAdapter.kt
index 6b4a68204..5944fbdf9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoItemAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoItemAdapter.kt
@@ -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
diff --git a/app/src/main/res/layout/manga_info_item.xml b/app/src/main/res/layout/manga_info_item.xml
index 74c4f7f0a..431e1e761 100644
--- a/app/src/main/res/layout/manga_info_item.xml
+++ b/app/src/main/res/layout/manga_info_item.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    android:id="@+id/manga_summary_section"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
@@ -42,7 +44,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
-        android:id="@+id/manga_summary"
+        android:id="@+id/manga_summary_text"
         style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -53,14 +55,12 @@
         android:focusable="true"
         android:maxLines="2"
         android:textIsSelectable="false"
-        android:visibility="gone"
-        tools:text="Summary"
-        tools:visibility="visible" />
+        tools:text="Summary" />
 
     <FrameLayout
         android:id="@+id/manga_genres_tags_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/manga_genres_tags_full_chips"