From dd914047f8ac0fd89bdd0dd829f8a2cf4e5fdea2 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 23 May 2021 12:36:47 -0400 Subject: [PATCH] Tablet manga view (cherry picked from commit 7875f363a8a18659d4cb59774f6ce0e3d0a428ab) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt --- .../tachiyomi/ui/manga/MangaController.kt | 99 ++++++++++++------- .../ui/manga/info/MangaInfoHeaderAdapter.kt | 17 +++- .../ui/manga/info/MangaInfoItemAdapter.kt | 5 +- .../res/layout-sw600dp/manga_controller.xml | 84 ++++++++++++++++ app/src/main/res/layout/manga_controller.xml | 3 +- 5 files changed, 161 insertions(+), 47 deletions(-) create mode 100644 app/src/main/res/layout-sw600dp/manga_controller.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 06cc793b1..ff3d90d9d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -109,7 +109,6 @@ import exh.metadata.metadata.base.FlatMetadata import exh.recs.RecommendsController import exh.source.MERGED_SOURCE_ID import exh.source.getMainSource -import exh.source.isEhBasedSource import exh.source.isMdBasedSource import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers @@ -281,11 +280,17 @@ class MangaController : override fun onViewCreated(view: View) { super.onViewCreated(view) - binding.recycler.applyInsetter { - type(navigationBars = true) { - padding() + listOfNotNull(binding.fullRecycler, binding.infoRecycler, binding.chaptersRecycler) + .forEach { + it.applyInsetter { + type(navigationBars = true) { + padding() + } + } + + it.layoutManager = LinearLayoutManager(view.context) + it.setHasFixedSize(true) } - } binding.actionToolbar.applyInsetter { type(navigationBars = true) { margin(bottom = true) @@ -293,59 +298,70 @@ class MangaController : } if (manga == null || source == null) return - val adapters: MutableList?> = mutableListOf() // Init RecyclerView and adapter + mangaInfoAdapter = MangaInfoHeaderAdapter(this, binding.infoRecycler != null) + chaptersHeaderAdapter = MangaChaptersHeaderAdapter(this) + chaptersAdapter = ChaptersAdapter(this, view.context) // SY --> - mangaInfoAdapter = MangaInfoHeaderAdapter(this) - - adapters += mangaInfoAdapter - val mainSource = presenter.source.getMainSource() if (mainSource is MetadataSource<*, *>) { mangaMetaInfoAdapter = mainSource.getDescriptionAdapter(this) - mangaMetaInfoAdapter?.let { adapters += it } } - mangaInfoItemAdapter = MangaInfoItemAdapter(this, fromSource) - adapters += mangaInfoItemAdapter - if (!preferences.recommendsInOverflow().get() || smartSearchConfig != null) { mangaInfoButtonsAdapter = MangaInfoButtonsAdapter(this) - adapters += mangaInfoButtonsAdapter + } + mangaInfoItemAdapter = MangaInfoItemAdapter(this, fromSource, binding.infoRecycler != null) + // SY <-- + + // Phone layout + binding.fullRecycler?.let { + it.adapter = ConcatAdapter( + listOfNotNull( + mangaInfoAdapter, + mangaMetaInfoAdapter, + mangaInfoItemAdapter, + mangaInfoButtonsAdapter, + chaptersHeaderAdapter, + chaptersAdapter + ) + ) + + it.scrollEvents() + .onEach { updateToolbarTitleAlpha() } + .launchIn(viewScope) + } + // Tablet layout + binding.infoRecycler?.let { + it.adapter = ConcatAdapter( + listOfNotNull( + mangaInfoAdapter, + mangaMetaInfoAdapter, + mangaInfoItemAdapter, + mangaInfoButtonsAdapter + ) + ) + } + binding.chaptersRecycler?.let { + it.adapter = ConcatAdapter(chaptersHeaderAdapter, chaptersAdapter) } - chaptersHeaderAdapter = MangaChaptersHeaderAdapter(this) - - adapters += chaptersHeaderAdapter - - chaptersAdapter = ChaptersAdapter(this, view.context) - - adapters += chaptersAdapter - - binding.recycler.adapter = ConcatAdapter(adapters) - // SY <-- - binding.recycler.layoutManager = LinearLayoutManager(view.context) - binding.recycler.setHasFixedSize(true) chaptersAdapter?.fastScroller = binding.fastScroller - actionFabScrollListener = actionFab?.shrinkOnScroll(binding.recycler) + actionFabScrollListener = actionFab?.shrinkOnScroll(chaptersRecycler) // Skips directly to chapters list if navigated to from the library - binding.recycler.post { + chaptersRecycler.post { if (!fromSource && preferences.jumpToChapters()) { - (binding.recycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(1, 0) + (chaptersRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(1, 0) } // Delayed in case we need to jump to chapters - binding.recycler.post { + binding.fullRecycler?.post { updateToolbarTitleAlpha() } } - binding.recycler.scrollEvents() - .onEach { updateToolbarTitleAlpha() } - .launchIn(viewScope) - binding.swipeRefresh.refreshes() .onEach { fetchMangaInfoFromSource(manualFetch = true) @@ -376,15 +392,19 @@ class MangaController : } private fun updateToolbarTitleAlpha(alpha: Int? = null) { + if (binding.fullRecycler == null) { + return + } + val calculatedAlpha = when { // Specific alpha provided alpha != null -> alpha // First item isn't in view, full opacity - ((binding.recycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() > 0) -> 255 + ((binding.fullRecycler!!.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() > 0) -> 255 // Based on scroll amount when first item is in view - else -> min(binding.recycler.computeVerticalScrollOffset(), 255) + else -> min(binding.fullRecycler!!.computeVerticalScrollOffset(), 255) } (activity as? MainActivity)?.binding?.toolbar?.setTitleTextColor( @@ -428,7 +448,7 @@ class MangaController : override fun cleanupFab(fab: ExtendedFloatingActionButton) { fab.setOnClickListener(null) - actionFabScrollListener?.let { binding.recycler.removeOnScrollListener(it) } + actionFabScrollListener?.let { binding.fullRecycler?.removeOnScrollListener(it) } actionFab = null } @@ -1497,6 +1517,9 @@ class MangaController : // Tracker sheet - end + private val chaptersRecycler: RecyclerView + get() = binding.fullRecycler ?: binding.chaptersRecycler!! + companion object { const val FROM_SOURCE_EXTRA = "from_source" const val MANGA_EXTRA = "manga" 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 8377f2630..8748d0dd7 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 @@ -30,7 +30,8 @@ import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy class MangaInfoHeaderAdapter( - private val controller: MangaController + private val controller: MangaController, + private val isTablet: Boolean ) : RecyclerView.Adapter() { @@ -223,10 +224,16 @@ class MangaInfoHeaderAdapter( */ private fun setMangaInfo(manga: Manga, source: Source?) { // Update full title TextView. - binding.mangaFullTitle.text = if (manga.title.isBlank()) { - view.context.getString(R.string.unknown) - } else { - manga.title + with(binding.mangaFullTitle) { + if (isTablet) { + isVisible = false + } else { + text = if (manga.title.isBlank()) { + view.context.getString(R.string.unknown) + } else { + manga.title + } + } } // Update author TextView. 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 a714cf421..47ba13e11 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 @@ -33,7 +33,8 @@ import reactivecircus.flowbinding.android.view.longClicks class MangaInfoItemAdapter( private val controller: MangaController, - private val fromSource: Boolean + private val fromSource: Boolean, + private val isTablet: Boolean ) : RecyclerView.Adapter() { @@ -191,7 +192,7 @@ class MangaInfoItemAdapter( .launchIn(controller.viewScope) // Expand manga info if navigated from source listing - if (initialLoad && fromSource) { + if (initialLoad && (fromSource || isTablet)) { toggleMangaInfo() initialLoad = false } diff --git a/app/src/main/res/layout-sw600dp/manga_controller.xml b/app/src/main/res/layout-sw600dp/manga_controller.xml new file mode 100644 index 000000000..dd3bd0696 --- /dev/null +++ b/app/src/main/res/layout-sw600dp/manga_controller.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/manga_controller.xml b/app/src/main/res/layout/manga_controller.xml index 0338f736d..0b7bead52 100755 --- a/app/src/main/res/layout/manga_controller.xml +++ b/app/src/main/res/layout/manga_controller.xml @@ -18,11 +18,10 @@ android:id="@+id/swipe_refresh" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/toolbar_bottom" android:orientation="vertical">