From 181e0301aafb268f91f424209d0f4f34738fcf40 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 7 Aug 2023 01:42:28 +0800
Subject: [PATCH] Fix onBackPressed callbacks order

---
 .../main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
index b5329e7d4..eb7d7447e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
@@ -101,11 +101,13 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
                 onSearchViewHidden()
             }
         }
+        onCreateViewWithToolbar(inflater, binding.root, savedInstanceState)
+        // This has to be placed after onCreateViewWithToolbar() since
+        // callbacks are invoked in the reverse order in which they are added
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             binding.searchview.addTransitionListener(mSearchViewOnBackPressedCallback)
             requireActivity().onBackPressedDispatcher.addCallback(mSearchViewOnBackPressedCallback)
         }
-        onCreateViewWithToolbar(inflater, binding.root, savedInstanceState)
         binding.appbar.bringToFront()
         return binding.root
     }