From 392a66ed593e40f87a6744eafcb661978b9d61aa Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 12 May 2022 14:08:02 -0300 Subject: [PATCH] Fix bad toolbar animations when switching to and from archive fragment. --- .../securesms/main/MainActivityListHostFragment.kt | 7 ++++--- app/src/main/res/navigation/main_activity_list.xml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt index ead68dc3ba..710b3eba14 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt @@ -150,13 +150,14 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f private fun presentToolbarForConversationListFragment() { if (_basicToolbar.resolved() && _basicToolbar.get().visible) { - _toolbar.runRevealAnimation(R.anim.slide_to_end) + _toolbar.runRevealAnimation(R.anim.slide_from_start) } _toolbar.visible = true _searchAction.visible = true - if (_basicToolbar.resolved()) { - _basicToolbar.get().runHideAnimation(R.anim.slide_from_start) + + if (_basicToolbar.resolved() && _basicToolbar.get().visible) { + _basicToolbar.get().runHideAnimation(R.anim.slide_to_end) } } diff --git a/app/src/main/res/navigation/main_activity_list.xml b/app/src/main/res/navigation/main_activity_list.xml index 8dc373cf5a..e72c0df523 100644 --- a/app/src/main/res/navigation/main_activity_list.xml +++ b/app/src/main/res/navigation/main_activity_list.xml @@ -13,8 +13,8 @@ app:destination="@id/conversationListArchiveFragment" app:enterAnim="@anim/slide_from_end" app:exitAnim="@anim/slide_to_start" - app:popEnterAnim="@anim/slide_to_end" - app:popExitAnim="@anim/slide_from_start" /> + app:popEnterAnim="@anim/slide_from_start" + app:popExitAnim="@anim/slide_to_end" />