From e990ad25eb80317b915abc042fdc3085da070e84 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 31 Jul 2020 12:58:13 -0400 Subject: [PATCH] Fix tap region for manga summary --- .../ui/manga/info/MangaInfoHeaderAdapter.kt | 15 ++++++--------- app/src/main/res/layout/manga_info_header.xml | 3 ++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt index 46d4ae66b1..6138026f37 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt @@ -181,11 +181,11 @@ class MangaInfoHeaderAdapter( } .launchIn(scope) - 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) @@ -277,7 +277,7 @@ class MangaInfoHeaderAdapter( 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 @@ -292,7 +292,7 @@ class MangaInfoHeaderAdapter( } // 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) @@ -305,10 +305,7 @@ class MangaInfoHeaderAdapter( } 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) { @@ -329,7 +326,7 @@ class MangaInfoHeaderAdapter( } } - with(binding.mangaSummary) { + with(binding.mangaSummaryText) { maxLines = if (isExpanded) { 2 diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml index 1719146dc1..87277aa30c 100644 --- a/app/src/main/res/layout/manga_info_header.xml +++ b/app/src/main/res/layout/manga_info_header.xml @@ -173,6 +173,7 @@