diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexAdapter.kt index db1d86e1f..509268b49 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexAdapter.kt @@ -43,12 +43,12 @@ class IndexAdapter(val controller: IndexController) : // stores and recycles views as they are scrolled off screen inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - private val browseAdapter = IndexCardAdapter(controller) - private var browseLastBoundResults: List? = null - private val latestAdapter = IndexCardAdapter(controller) private var latestLastBoundResults: List? = null + private val browseAdapter = IndexCardAdapter(controller) + private var browseLastBoundResults: List? = null + init { binding.browseBarWrapper.clicks() .onEach { @@ -61,32 +61,11 @@ class IndexAdapter(val controller: IndexController) : } .launchIn(scope) - binding.browseRecycler.layoutManager = LinearLayoutManager(itemView.context, LinearLayoutManager.HORIZONTAL, false) - binding.browseRecycler.adapter = browseAdapter - binding.latestRecycler.layoutManager = LinearLayoutManager(itemView.context, LinearLayoutManager.HORIZONTAL, false) binding.latestRecycler.adapter = latestAdapter - } - fun bindBrowse(browseResults: List?) { - when { - browseResults == null -> { - binding.browseProgress.isVisible = true - showBrowseResultsHolder() - } - browseResults.isEmpty() -> { - binding.browseProgress.isVisible = false - showBrowseNoResults() - } - else -> { - binding.browseProgress.isVisible = false - showBrowseResultsHolder() - } - } - if (browseResults !== browseLastBoundResults) { - browseAdapter.updateDataSet(browseResults) - browseLastBoundResults = browseResults - } + binding.browseRecycler.layoutManager = LinearLayoutManager(itemView.context, LinearLayoutManager.HORIZONTAL, false) + binding.browseRecycler.adapter = browseAdapter } fun bindLatest(latestResults: List?) { @@ -110,24 +89,41 @@ class IndexAdapter(val controller: IndexController) : } } - private fun showBrowseResultsHolder() { - binding.browseNoResultsFound.isVisible = false - binding.browseCard.isVisible = true - } - - private fun showBrowseNoResults() { - binding.browseNoResultsFound.isVisible = true - binding.browseCard.isVisible = false + fun bindBrowse(browseResults: List?) { + when { + browseResults == null -> { + binding.browseProgress.isVisible = true + showBrowseResultsHolder() + } + browseResults.isEmpty() -> { + binding.browseProgress.isVisible = false + showBrowseNoResults() + } + else -> { + binding.browseProgress.isVisible = false + showBrowseResultsHolder() + } + } + if (browseResults !== browseLastBoundResults) { + browseAdapter.updateDataSet(browseResults) + browseLastBoundResults = browseResults + } } private fun showLatestResultsHolder() { binding.latestNoResultsFound.isVisible = false - binding.latestCard.isVisible = true } private fun showLatestNoResults() { binding.latestNoResultsFound.isVisible = true - binding.latestCard.isVisible = false + } + + private fun showBrowseResultsHolder() { + binding.browseNoResultsFound.isVisible = false + } + + private fun showBrowseNoResults() { + binding.browseNoResultsFound.isVisible = true } fun setLatestImage(manga: Manga) { diff --git a/app/src/main/res/layout/index_adapter.xml b/app/src/main/res/layout/index_adapter.xml index 5f7924dee..935f96761 100644 --- a/app/src/main/res/layout/index_adapter.xml +++ b/app/src/main/res/layout/index_adapter.xml @@ -6,6 +6,70 @@ android:layout_height="wrap_content" android:orientation="vertical"> + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file