From 11f05133af4623d11364cddffabe4f9e7882ef5e Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Mon, 5 Jul 2021 13:17:49 -0400 Subject: [PATCH] New tablet layouts for manga details Portrait: Bigger cover Landscape: * flipped summary items. From top to bottom: Start Reading, Tags, Summary * Tags will always show in this layout, and summary will always be expanded --- .../tachiyomi/ui/manga/MangaHeaderHolder.kt | 25 +- .../layout-sw600dp-land/manga_header_item.xml | 408 ++++++++++++++++++ .../layout-sw600dp-port/manga_header_item.xml | 408 ++++++++++++++++++ 3 files changed, 831 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/layout-sw600dp-land/manga_header_item.xml create mode 100644 app/src/main/res/layout-sw600dp-port/manga_header_item.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt index 868f7fae3b..a5be427f32 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt @@ -127,17 +127,20 @@ class MangaHeaderHolder( trackButton.setOnClickListener { adapter.delegate.showTrackingSheet() } if (startExpanded) expandDesc() else collapseDesc() - if (isTablet) chapterLayout.isVisible = false + if (isTablet) { + chapterLayout.isVisible = false + expandDesc() + } } } private fun expandDesc() { binding ?: return - if (binding.moreButton.visibility == View.VISIBLE) { + if (binding.moreButton.visibility == View.VISIBLE || isTablet) { binding.mangaSummary.maxLines = Integer.MAX_VALUE binding.mangaSummary.setTextIsSelectable(true) binding.mangaGenresTags.isVisible = true - binding.lessButton.isVisible = true + binding.lessButton.isVisible = !isTablet binding.moreButtonGroup.isVisible = false binding.title.maxLines = Integer.MAX_VALUE binding.mangaSummary.requestFocus() @@ -146,12 +149,13 @@ class MangaHeaderHolder( private fun collapseDesc() { binding ?: return + if (isTablet) return binding.mangaSummary.setTextIsSelectable(false) binding.mangaSummary.isClickable = true binding.mangaSummary.maxLines = 3 - binding.mangaGenresTags.isVisible = false + binding.mangaGenresTags.isVisible = isTablet binding.lessButton.isVisible = false - binding.moreButtonGroup.isVisible = true + binding.moreButtonGroup.isVisible = !isTablet binding.title.maxLines = 4 adapter.recyclerView.post { adapter.delegate.updateScroll() @@ -370,10 +374,10 @@ class MangaHeaderHolder( binding.subItemGroup.isVisible = false binding.startReadingButton.isVisible = false if (binding.moreButton.isVisible || binding.moreButton.isInvisible) { - binding.moreButtonGroup.isInvisible = true + binding.moreButtonGroup.isInvisible = !isTablet } else { binding.lessButton.isVisible = false - binding.mangaGenresTags.isVisible = false + binding.mangaGenresTags.isVisible = isTablet } } @@ -406,9 +410,10 @@ class MangaHeaderHolder( binding.subItemGroup.isVisible = true if (!showMoreButton) binding.moreButtonGroup.isVisible = false else { - if (binding.mangaSummary.maxLines != Integer.MAX_VALUE) binding.moreButtonGroup.isVisible = true - else { - binding.lessButton.isVisible = true + if (binding.mangaSummary.maxLines != Integer.MAX_VALUE) { + binding.moreButtonGroup.isVisible = !isTablet + } else { + binding.lessButton.isVisible = !isTablet binding.mangaGenresTags.isVisible = true } } diff --git a/app/src/main/res/layout-sw600dp-land/manga_header_item.xml b/app/src/main/res/layout-sw600dp-land/manga_header_item.xml new file mode 100644 index 0000000000..f84b3c36d8 --- /dev/null +++ b/app/src/main/res/layout-sw600dp-land/manga_header_item.xml @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp-port/manga_header_item.xml b/app/src/main/res/layout-sw600dp-port/manga_header_item.xml new file mode 100644 index 0000000000..d89e0cc5a8 --- /dev/null +++ b/app/src/main/res/layout-sw600dp-port/manga_header_item.xml @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file