From 9ab6f9d7df7837c2780eb1e0c8c5f5d7415ccd43 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 12 Aug 2018 19:26:55 +0200 Subject: [PATCH] properly update view visibility after closing search --- .../contacts/fragments/MyViewPagerFragment.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt index 0fd78e68..1409077e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt @@ -186,10 +186,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) } private fun setupContactsFavoritesAdapter(contacts: ArrayList) { - fragment_placeholder_2.beVisibleIf(contacts.isEmpty()) - fragment_placeholder.beVisibleIf(contacts.isEmpty()) - fragment_list.beVisibleIf(contacts.isNotEmpty()) - + setupViewVisibility(contacts) val currAdapter = fragment_list.adapter if (currAdapter == null || forceListRedraw) { forceListRedraw = false @@ -271,6 +268,8 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) fun onSearchClosed() { (fragment_list.adapter as? ContactsAdapter)?.updateItems(contactsIgnoringSearch) + setupViewVisibility(contactsIgnoringSearch) + if (this is FavoritesFragment) { fragment_placeholder.text = activity?.getString(R.string.no_favorites) } @@ -283,6 +282,12 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) fragment_placeholder_2.setTextColor(context.getAdjustedPrimaryColor()) } + private fun setupViewVisibility(contacts: ArrayList) { + fragment_placeholder_2.beVisibleIf(contacts.isEmpty()) + fragment_placeholder.beVisibleIf(contacts.isEmpty()) + fragment_list.beVisibleIf(contacts.isNotEmpty()) + } + abstract fun fabClicked() abstract fun placeholderClicked()