Merge pull request #10682 from woocommerce/blaze/improve-toolbar-logic

Generalize the toolbar fix when changing visibility during a pending animation
woocommerce · Feb 6, 2024 · 7d59059 · 7d59059
2 parents 37270cb + db74dbd
commit 7d59059
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -61,7 +61,6 @@ import com.woocommerce.android.ui.appwidgets.WidgetUpdater
 import com.woocommerce.android.ui.base.BaseFragment
 import com.woocommerce.android.ui.base.TopLevelFragment
 import com.woocommerce.android.ui.base.UIMessageResolver
-import com.woocommerce.android.ui.blaze.creation.preview.BlazeCampaignCreationPreviewFragment
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.feedback.SurveyType
 import com.woocommerce.android.ui.login.LoginActivity
@@ -207,9 +206,6 @@ class MainActivity :
         override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
             if (f is DialogFragment) return
 
-            if (f is BlazeCampaignCreationPreviewFragment) // Context on why this is needed check GH issue #10563
-                animatorHelper.cancelToolbarAnimation()
-
             when (val appBarStatus = (f as? BaseFragment)?.activityAppBarStatus ?: AppBarStatus.Visible()) {
                 is AppBarStatus.Visible -> {
                     showToolbar(animate = f is TopLevelFragment)
@@ -490,6 +486,9 @@ class MainActivity :
     }
 
     private fun showToolbar(animate: Boolean) {
+        // Cancel any pending toolbar animations
+        animatorHelper.cancelToolbarAnimation()
+
         if (binding.collapsingToolbar.layoutParams.height == animatorHelper.toolbarHeight) return
         if (animate) {
             animatorHelper.animateToolbarHeight(show = true) {
@@ -505,6 +504,9 @@ class MainActivity :
     }
 
     private fun hideToolbar(animate: Boolean) {
+        // Cancel any pending toolbar animations
+        animatorHelper.cancelToolbarAnimation()
+
         if (binding.collapsingToolbar.layoutParams.height == 0) return
         if (animate) {
             animatorHelper.animateToolbarHeight(show = false) {