From 1aede09d35d104131d121811f902a3a207c329a1 Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 8 May 2020 15:08:17 -0400 Subject: [PATCH] Hide & Expand Categories buttons now show/hide dynamically --- .../eu/kanade/tachiyomi/ui/library/LibraryController.kt | 4 ++++ .../tachiyomi/ui/library/filter/FilterBottomSheet.kt | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index e83cffc2a2..a6136856ed 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -639,6 +639,10 @@ class LibraryController( scrollToHeader(activeCategory) } category_hopper_frame.visibleIf(!singleCategory) + filter_bottom_sheet.updateButtons( + showHideCategories = presenter.allCategories.size > 1, + showExpand = !singleCategory && presenter.showAllCategories + ) adapter.isLongPressDragEnabled = canDrag() category_recycler.setCategories(presenter.categories) filter_bottom_sheet.setExpandText(preferences.collapsedCategories().getOrDefault().isNotEmpty()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt index d61e765df5..ab611c1dae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt @@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.util.view.hide import eu.kanade.tachiyomi.util.view.inflate import eu.kanade.tachiyomi.util.view.isExpanded import eu.kanade.tachiyomi.util.view.isHidden +import eu.kanade.tachiyomi.util.view.isVisible import eu.kanade.tachiyomi.util.view.updatePaddingRelative import eu.kanade.tachiyomi.util.view.visibleIf import kotlinx.android.synthetic.main.filter_bottom_sheet.view.* @@ -429,6 +430,14 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri } } + fun updateButtons(showHideCategories: Boolean, showExpand: Boolean) { + hide_categories.visibleIf(showHideCategories) + expand_categories.visibleIf(showExpand) + first_layout.visibleIf( + hide_categories.isVisible() || expand_categories.isVisible() || !second_layout.isVisible() + ) + } + private fun clearFilters() { preferences.filterDownloaded().set(0) preferences.filterUnread().set(0)