From 1ed291086a129e718612bf7f7c43ebce5a4869d0 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 11 Apr 2020 11:02:32 -0400 Subject: [PATCH] Hide filter FAB in source latest --- .../browse/BrowseCatalogueController.kt | 22 ++++++++++--------- .../latest/LatestUpdatesController.kt | 4 ++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt index b34e8b99bd..fa71543d04 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt @@ -121,22 +121,21 @@ open class BrowseCatalogueController(bundle: Bundle) : override fun onViewCreated(view: View) { super.onViewCreated(view) + // Prepare filter sheet + initFilterSheet() + // Initialize adapter, scroll listener and recycler views adapter = FlexibleAdapter(null, this) setupRecycler(view) - // Prepare filter sheet - if (presenter.sourceFilters.isNotEmpty()) { - initFilterSheet() - - binding.fabFilter.setOnClickListener { filterSheet?.show() } - binding.fabFilter.visible() - } - binding.progress.visible() } - private fun initFilterSheet() { + open fun initFilterSheet() { + if (presenter.sourceFilters.isEmpty()) { + return + } + filterSheet = CatalogueFilterSheet( activity!!, onSearchClicked = { @@ -153,6 +152,9 @@ open class BrowseCatalogueController(bundle: Bundle) : } ) filterSheet?.setFilters(presenter.filterItems) + + binding.fabFilter.setOnClickListener { filterSheet?.show() } + binding.fabFilter.visible() } override fun onDestroyView(view: View) { @@ -204,7 +206,7 @@ open class BrowseCatalogueController(bundle: Bundle) : } } - if (presenter.sourceFilters.isNotEmpty()) { + if (filterSheet != null) { // Add bottom padding if filter FAB is visible recycler.setPadding( 0, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/latest/LatestUpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/latest/LatestUpdatesController.kt index f3e198f65e..47ea383dec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/latest/LatestUpdatesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/latest/LatestUpdatesController.kt @@ -24,4 +24,8 @@ class LatestUpdatesController(bundle: Bundle) : BrowseCatalogueController(bundle super.onPrepareOptionsMenu(menu) menu.findItem(R.id.action_search).isVisible = false } + + override fun initFilterSheet() { + // No-op: we don't allow filtering in latest + } }