From a6a47a5eaed2d3e2fa506441c9568f9103d9713f Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 18 Nov 2022 21:06:42 +0100
Subject: [PATCH] Move login/logout to navigation drawer

---
 .../kirmanak/mealient/ui/activity/MainActivity.kt | 11 +++++++++--
 app/src/main/res/menu/main_toolbar.xml            | 12 ------------
 app/src/main/res/menu/navigation_menu.xml         | 15 ++++++++++++---
 app/src/main/res/values-ru/strings.xml            | 10 +++++-----
 app/src/main/res/values/strings.xml               | 14 +++++++-------
 5 files changed, 33 insertions(+), 29 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 63270ce..44d11c7 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
@@ -75,6 +75,12 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
             R.id.add_recipe -> actionGlobalAddRecipeFragment()
             R.id.recipes_list -> actionGlobalRecipesListFragment()
             R.id.change_url -> actionGlobalBaseURLFragment()
+            R.id.login -> actionGlobalAuthenticationFragment()
+            R.id.logout -> {
+                viewModel.logout()
+                binding.drawer.close()
+                return true
+            }
             else -> throw IllegalArgumentException("Unknown menu item id: ${menuItem.itemId}")
         }
         navigateTo(directions)
@@ -86,6 +92,9 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
         logger.v { "onUiStateChange() called with: uiState = $uiState" }
         supportActionBar?.title = if (uiState.titleVisible) title else null
         binding.navigationView.isVisible = uiState.navigationVisible
+        val menu = binding.navigationView.menu
+        menu.findItem(R.id.logout).isVisible = uiState.canShowLogout
+        menu.findItem(R.id.login).isVisible = uiState.canShowLogin
         invalidateOptionsMenu()
     }
 
@@ -108,8 +117,6 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         logger.v { "onCreateOptionsMenu() called with: menu = $menu" }
         menuInflater.inflate(R.menu.main_toolbar, menu)
-        menu.findItem(R.id.logout).isVisible = uiState.canShowLogout
-        menu.findItem(R.id.login).isVisible = uiState.canShowLogin
         val searchItem = menu.findItem(R.id.search_recipe_action)
         searchItem.isVisible = uiState.searchVisible
         setupSearchItem(searchItem)
diff --git a/app/src/main/res/menu/main_toolbar.xml b/app/src/main/res/menu/main_toolbar.xml
index 242a16e..8e4cf4e 100644
--- a/app/src/main/res/menu/main_toolbar.xml
+++ b/app/src/main/res/menu/main_toolbar.xml
@@ -2,18 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-	<item
-		android:id="@+id/login"
-		android:contentDescription="@string/menu_main_toolbar_content_description_login"
-		android:title="@string/menu_main_toolbar_login"
-		app:showAsAction="ifRoom" />
-
-	<item
-		android:id="@+id/logout"
-		android:contentDescription="@string/menu_main_toolbar_content_description_logout"
-		android:title="@string/menu_main_toolbar_logout"
-		app:showAsAction="never" />
-
 	<item
 		android:id="@+id/search_recipe_action"
 		android:icon="@android:drawable/ic_menu_search"
diff --git a/app/src/main/res/menu/navigation_menu.xml b/app/src/main/res/menu/navigation_menu.xml
index c5b3ea1..74245f0 100644
--- a/app/src/main/res/menu/navigation_menu.xml
+++ b/app/src/main/res/menu/navigation_menu.xml
@@ -2,13 +2,22 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item
 		android:id="@+id/recipes_list"
-		android:title="@string/menu_bottom_navigation_recipes_list" />
+		android:title="@string/menu_navigation_drawer_recipes_list" />
 
 	<item
 		android:id="@+id/add_recipe"
-		android:title="@string/menu_bottom_navigation_add_recipe" />
+		android:title="@string/menu_navigation_drawer_add_recipe" />
 
 	<item
 		android:id="@+id/change_url"
-		android:title="@string/menu_bottom_navigation_change_url" />
+		android:title="@string/menu_navigation_drawer_change_url" />
+
+	<item
+		android:id="@+id/login"
+		android:title="@string/menu_navigation_drawer_login" />
+
+	<item
+		android:id="@+id/logout"
+		android:title="@string/menu_navigation_drawer_logout" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fea499a..f5a69f7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -5,7 +5,7 @@
 	<string name="fragment_authentication_input_hint_url">URL сервера</string>
 	<string name="fragment_authentication_button_login">Войти</string>
 	<string name="content_description_view_holder_recipe_image">Изображение готового блюда</string>
-	<string name="menu_main_toolbar_logout">Выйти</string>
+	<string name="menu_navigation_drawer_logout">Выйти</string>
 	<string name="view_holder_recipe_text_placeholder">Загрузка</string>
 	<string name="fragment_recipe_info_ingredients_header">Ингредиенты</string>
 	<string name="fragment_recipe_info_instructions_header">Инструкции</string>
@@ -21,11 +21,11 @@
 	<string name="fragment_authentication_unknown_error">Что-то пошло не так, попробуйте еще раз.</string>
 	<string name="fragment_base_url_malformed_url">Проверьте формат URL: %s</string>
 	<string name="fragment_base_url_save">Продолжить</string>
-	<string name="menu_main_toolbar_login">Войти</string>
+	<string name="menu_navigation_drawer_login">Войти</string>
 	<string name="fragment_add_recipe_recipe_name">Название рецепта</string>
 	<string name="fragment_add_recipe_recipe_description">Описание</string>
-	<string name="menu_bottom_navigation_recipes_list">Рецепты</string>
-	<string name="menu_bottom_navigation_add_recipe">Добавить рецепт</string>
+	<string name="menu_navigation_drawer_recipes_list">Рецепты</string>
+	<string name="menu_navigation_drawer_add_recipe">Добавить рецепт</string>
 	<string name="fragment_add_recipe_recipe_yield">Количество порций</string>
 	<string name="fragment_add_recipe_save_button">Сохранить рецепт</string>
 	<string name="fragment_add_recipe_new_instruction">Добавить шаг</string>
@@ -47,6 +47,6 @@
 	<string name="fragment_recipes_load_failure_toast_unexpected_response">неожиданный ответ</string>
 	<string name="fragment_recipes_load_failure_toast_no_connection">нет соединения</string>
 	<string name="fragment_recipes_load_failure_toast_no_reason">Ошибка загрузки.</string>
-	<string name="menu_bottom_navigation_change_url">Сменить URL</string>
+	<string name="menu_navigation_drawer_change_url">Сменить URL</string>
 	<string name="search_recipes_hint">Найти рецепты</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 457b90e..fe674b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,8 +5,8 @@
 	<string name="fragment_authentication_input_hint_url">Server URL</string>
 	<string name="fragment_authentication_button_login">Login</string>
 	<string name="content_description_view_holder_recipe_image">Picture of the cooked meal</string>
-	<string name="menu_main_toolbar_content_description_logout" translatable="false">@string/menu_main_toolbar_logout</string>
-	<string name="menu_main_toolbar_logout">Logout</string>
+	<string name="menu_main_toolbar_content_description_logout" translatable="false">@string/menu_navigation_drawer_logout</string>
+	<string name="menu_navigation_drawer_logout">Logout</string>
 	<string name="view_holder_recipe_text_placeholder">Loading…</string>
 	<string name="content_description_fragment_recipe_info_image" translatable="false">@string/content_description_view_holder_recipe_image</string>
 	<string name="fragment_recipe_info_ingredients_header">Ingredients</string>
@@ -18,8 +18,8 @@
 	<string name="fragment_base_url_malformed_url">Check URL format: %s</string>
 	<string name="fragment_base_url_save">Proceed</string>
 	<string name="fragment_base_url_unknown_error" translatable="false">@string/fragment_authentication_unknown_error</string>
-	<string name="menu_main_toolbar_content_description_login" translatable="false">@string/menu_main_toolbar_login</string>
-	<string name="menu_main_toolbar_login">Login</string>
+	<string name="menu_main_toolbar_content_description_login" translatable="false">@string/menu_navigation_drawer_login</string>
+	<string name="menu_navigation_drawer_login">Login</string>
 	<string name="fragment_disclaimer_button_okay">Okay</string>
 	<string name="view_holder_recipe_instructions_step">Step: %d</string>
 	<string name="fragment_authentication_email_input_empty">E-mail can\'t be empty</string>
@@ -28,8 +28,8 @@
 	<string name="fragment_authentication_unknown_error">Something went wrong, please try again.</string>
 	<string name="fragment_add_recipe_recipe_name">Recipe name</string>
 	<string name="fragment_add_recipe_recipe_description">Description</string>
-	<string name="menu_bottom_navigation_add_recipe">Add recipe</string>
-	<string name="menu_bottom_navigation_recipes_list">Recipes</string>
+	<string name="menu_navigation_drawer_add_recipe">Add recipe</string>
+	<string name="menu_navigation_drawer_recipes_list">Recipes</string>
 	<string name="fragment_add_recipe_recipe_yield">Recipe yield</string>
 	<string name="fragment_add_recipe_save_button">Save recipe</string>
 	<string name="fragment_add_recipe_new_instruction">New step</string>
@@ -51,6 +51,6 @@
 	<string name="fragment_recipes_load_failure_toast_unauthorized">unauthorized</string>
 	<string name="fragment_recipes_load_failure_toast_unexpected_response">unexpected response</string>
 	<string name="fragment_recipes_load_failure_toast_no_connection">no connection</string>
-	<string name="menu_bottom_navigation_change_url">Change URL</string>
+	<string name="menu_navigation_drawer_change_url">Change URL</string>
 	<string name="search_recipes_hint">Search recipes</string>
 </resources>
\ No newline at end of file