From ff5a873d3b6d96b40d082a1ed24a176e6d062b00 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Fri, 23 May 2025 07:25:33 +0300 Subject: [PATCH] Fix main menu --- .../kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt index 00efeaefc..9d18da554 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt @@ -106,6 +106,7 @@ class MainActivity : BaseActivity(), AppBarOwner, BottomNav override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(ActivityMainBinding.inflate(layoutInflater)) + setSupportActionBar(viewBinding.searchBar) viewBinding.fab?.setOnClickListener(this) viewBinding.navRail?.headerView?.setOnClickListener(this) @@ -120,7 +121,7 @@ class MainActivity : BaseActivity(), AppBarOwner, BottomNav navigationDelegate.addOnFragmentChangedListener(this) navigationDelegate.onCreate(this, savedInstanceState) - viewBinding.searchBar.addMenuProvider(MainMenuProvider(router, viewModel)) + addMenuProvider(MainMenuProvider(router, viewModel)) onBackPressedDispatcher.addCallback(ExitCallback(this, viewBinding.container)) onBackPressedDispatcher.addCallback(navigationDelegate) @@ -134,7 +135,7 @@ class MainActivity : BaseActivity(), AppBarOwner, BottomNav viewModel.isLoading.observe(this, this::onLoadingStateChanged) viewModel.isResumeEnabled.observe(this, this::onResumeEnabledChanged) viewModel.feedCounter.observe(this, ::onFeedCounterChanged) - viewModel.appUpdate.observe(this, MenuInvalidator(viewBinding.searchBar)) + viewModel.appUpdate.observe(this, MenuInvalidator(this)) viewModel.onFirstStart.observeEvent(this) { router.showWelcomeSheet() } viewModel.isBottomNavPinned.observe(this, ::setNavbarPinned) searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged) @@ -263,7 +264,7 @@ class MainActivity : BaseActivity(), AppBarOwner, BottomNav options and EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING.inv() } viewBinding.searchView.getEditText().imeOptions = options - viewBinding.searchBar.invalidateMenu() + invalidateOptionsMenu() } private fun onLoadingStateChanged(isLoading: Boolean) {