Fix main menu

This commit is contained in:
Koitharu
2025-05-23 07:25:33 +03:00
parent 1b5720f2a5
commit ff5a873d3b

View File

@@ -106,6 +106,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(ActivityMainBinding.inflate(layoutInflater)) setContentView(ActivityMainBinding.inflate(layoutInflater))
setSupportActionBar(viewBinding.searchBar)
viewBinding.fab?.setOnClickListener(this) viewBinding.fab?.setOnClickListener(this)
viewBinding.navRail?.headerView?.setOnClickListener(this) viewBinding.navRail?.headerView?.setOnClickListener(this)
@@ -120,7 +121,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
navigationDelegate.addOnFragmentChangedListener(this) navigationDelegate.addOnFragmentChangedListener(this)
navigationDelegate.onCreate(this, savedInstanceState) navigationDelegate.onCreate(this, savedInstanceState)
viewBinding.searchBar.addMenuProvider(MainMenuProvider(router, viewModel)) addMenuProvider(MainMenuProvider(router, viewModel))
onBackPressedDispatcher.addCallback(ExitCallback(this, viewBinding.container)) onBackPressedDispatcher.addCallback(ExitCallback(this, viewBinding.container))
onBackPressedDispatcher.addCallback(navigationDelegate) onBackPressedDispatcher.addCallback(navigationDelegate)
@@ -134,7 +135,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
viewModel.isLoading.observe(this, this::onLoadingStateChanged) viewModel.isLoading.observe(this, this::onLoadingStateChanged)
viewModel.isResumeEnabled.observe(this, this::onResumeEnabledChanged) viewModel.isResumeEnabled.observe(this, this::onResumeEnabledChanged)
viewModel.feedCounter.observe(this, ::onFeedCounterChanged) 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.onFirstStart.observeEvent(this) { router.showWelcomeSheet() }
viewModel.isBottomNavPinned.observe(this, ::setNavbarPinned) viewModel.isBottomNavPinned.observe(this, ::setNavbarPinned)
searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged) searchSuggestionViewModel.isIncognitoModeEnabled.observe(this, this::onIncognitoModeChanged)
@@ -263,7 +264,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
options and EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING.inv() options and EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING.inv()
} }
viewBinding.searchView.getEditText().imeOptions = options viewBinding.searchView.getEditText().imeOptions = options
viewBinding.searchBar.invalidateMenu() invalidateOptionsMenu()
} }
private fun onLoadingStateChanged(isLoading: Boolean) { private fun onLoadingStateChanged(isLoading: Boolean) {