From 1d89b792dc60e5879b88a8421b3dc670815ce5e1 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sun, 20 Nov 2022 09:21:11 +0100 Subject: [PATCH] Expand toolbar on tab change --- .../mealient/ui/activity/MainActivity.kt | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt index 8a8e131..00eaaf6 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt @@ -70,7 +70,6 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) { private fun onNavigationItemSelected(menuItem: MenuItem): Boolean { logger.v { "onNavigationItemSelected() called with: menuItem = $menuItem" } - menuItem.isChecked = true val directions = when (menuItem.itemId) { R.id.add_recipe -> actionGlobalAddRecipeFragment() R.id.recipes_list -> actionGlobalRecipesListFragment() @@ -84,7 +83,6 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) { else -> throw IllegalArgumentException("Unknown menu item id: ${menuItem.itemId}") } navigateTo(directions) - binding.drawer.close() return true } @@ -141,24 +139,10 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) { }) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - logger.v { "onOptionsItemSelected() called with: item = $item" } - val result = when (item.itemId) { - R.id.login -> { - navigateTo(actionGlobalAuthenticationFragment()) - true - } - R.id.logout -> { - viewModel.logout() - true - } - else -> super.onOptionsItemSelected(item) - } - return result - } - private fun navigateTo(directions: NavDirections) { logger.v { "navigateTo() called with: directions = $directions" } + binding.toolbarHolder.setExpanded(true) + binding.drawer.close() navController.navigate(directions) } } \ No newline at end of file