From bbb435c2944bf53aaa55e8a01b46dc24342b7511 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Thu, 8 Apr 2021 23:14:44 -0400 Subject: [PATCH] Hopefully fixing issues with buttons in library filter sheet --- .../tachiyomi/ui/library/filter/FilterBottomSheet.kt | 7 +++++++ app/src/main/res/layout/filter_bottom_sheet.xml | 4 ++++ 2 files changed, 11 insertions(+) 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 106632dfc8..d139ee490f 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 @@ -31,6 +31,7 @@ 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.updatePaddingRelative +import eu.kanade.tachiyomi.util.view.visible import eu.kanade.tachiyomi.util.view.visibleIf import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers @@ -138,6 +139,12 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri binding.firstLayout.addView(binding.reorderFilters) binding.firstLayout.addView(binding.viewOptions) binding.secondLayout.gone() + } else if (binding.reorderFilters.parent == binding.firstLayout) { + binding.firstLayout.removeView(binding.viewOptions) + binding.firstLayout.removeView(binding.reorderFilters) + binding.secondLayout.addView(binding.reorderFilters) + binding.secondLayout.addView(binding.viewOptions) + binding.secondLayout.visible() } } diff --git a/app/src/main/res/layout/filter_bottom_sheet.xml b/app/src/main/res/layout/filter_bottom_sheet.xml index cf4ca4d151..3a1af5a8e3 100644 --- a/app/src/main/res/layout/filter_bottom_sheet.xml +++ b/app/src/main/res/layout/filter_bottom_sheet.xml @@ -76,6 +76,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" + android:maxLines="2" android:text="@string/group_library_by" android:textColor="?android:attr/textColorPrimary" app:icon="@drawable/ic_label_outline_24dp" @@ -86,6 +87,7 @@ style="@style/Theme.Widget.Button.TextButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:maxLines="2" android:text="@string/expand_all_categories" android:textColor="?android:attr/textColorPrimary" app:icon="@drawable/ic_expand_more_24dp" @@ -105,6 +107,7 @@ android:layout_height="wrap_content" android:layout_marginStart="10dp" android:layout_marginEnd="10dp" + android:maxLines="2" android:text="@string/reorder_filters" android:textColor="?android:attr/textColorPrimary" app:icon="@drawable/ic_swap_vert_24dp" @@ -116,6 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" + android:maxLines="2" android:text="@string/display_options" android:textColor="?android:attr/textColorPrimary" app:icon="@drawable/ic_tune_24dp"