Fix #1762: NavigationDrawer cancel switch profile always mark home

app/src/main/java/org/oppia/android/app/drawer/Argument.kt

@@ -0,0 +1,6 @@
+package org.oppia.android.app.drawer
+
+sealed class Argument {
+  class LastCheckedMenuItem(val navigationDrawerItem: NavigationDrawerItem) : Argument()
+  class IsAdministratorControlsSelected(val value: Boolean) : Argument()
+}

app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt

@@ -8,42 +8,76 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.fragment.app.DialogFragment
 import org.oppia.android.R
+import org.oppia.android.app.model.ExitProfileDialogArguments
 import org.oppia.android.app.profile.ProfileChooserActivity
+import org.oppia.android.util.extensions.getProto
+import org.oppia.android.util.extensions.putProto
 
 /** [DialogFragment] that gives option to either cancel or exit current profile. */
 class ExitProfileDialogFragment : DialogFragment() {
 
   companion object {
     // TODO(#1655): Re-restrict access to fields in tests post-Gradle.
-    const val BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY =
-      "BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY"
+    const val EXIT_PROFILE_DIALOG_ARGUMENTS_PROTO = "EXIT_PROFILE_DIALOG_ARGUMENTS_PROTO"
 
     /**
      * This function is responsible for displaying content in DialogFragment.
      *
      * @return [ExitProfileDialogFragment]: DialogFragment
      */
-    fun newInstance(isFromNavigationDrawer: Boolean): ExitProfileDialogFragment {
+    fun newInstance(
+      restoreLastCheckedMenuItem: Boolean,
+      argument: Argument
+    ): ExitProfileDialogFragment {
       val exitProfileDialogFragment = ExitProfileDialogFragment()
       val args = Bundle()
-      args.putBoolean(BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY, isFromNavigationDrawer)
+      val exitProfileDialogArguments = createExitProfileDialogFragmentProto(
+        argument = argument,
+        restoreLastCheckedMenuItem = restoreLastCheckedMenuItem
+      )
+
+      args.putProto(EXIT_PROFILE_DIALOG_ARGUMENTS_PROTO, exitProfileDialogArguments)
+
       exitProfileDialogFragment.arguments = args
       return exitProfileDialogFragment
     }
+
+    private fun createExitProfileDialogFragmentProto(
+      argument: Argument,
+      restoreLastCheckedMenuItem: Boolean
+    ): ExitProfileDialogArguments {
+      return when (argument) {
+        is Argument.IsAdministratorControlsSelected -> {
+          ExitProfileDialogArguments.newBuilder()
+            .setRestoreLastCheckedMenuItem(restoreLastCheckedMenuItem)
+            .setIsAdministratorControlsSelected(argument.value)
+            .build()
+        }
+        is Argument.LastCheckedMenuItem -> {
+          ExitProfileDialogArguments.newBuilder()
+            .setRestoreLastCheckedMenuItem(restoreLastCheckedMenuItem)
+            .setLastCheckedMenuItemValue(argument.navigationDrawerItem.value)
+            .build()
+        }
+      }
+    }
   }
 
-  lateinit var exitProfileDialogInterface: ExitProfileDialogInterface
+  private lateinit var exitProfileDialogInterface: ExitProfileDialogInterface
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
     val args =
       checkNotNull(arguments) { "Expected arguments to be pass to ExitProfileDialogFragment" }
 
-    val isFromNavigationDrawer = args.getBoolean(
-      BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY,
-      false
+    val exitProfileDialogArguments = args.getProto(
+      EXIT_PROFILE_DIALOG_ARGUMENTS_PROTO,
+      ExitProfileDialogArguments.getDefaultInstance()
     )
 
-    if (isFromNavigationDrawer) {
+    val restoreLastCheckedMenuItem = exitProfileDialogArguments.restoreLastCheckedMenuItem
+    val argument = exitProfileDialogArguments.adminControlsOrNavDrawerItemsCase
+
+    if (restoreLastCheckedMenuItem) {
       exitProfileDialogInterface =
         parentFragment as ExitProfileDialogInterface
     }
@@ -52,19 +86,42 @@ class ExitProfileDialogFragment : DialogFragment() {
       .Builder(ContextThemeWrapper(activity as Context, R.style.AlertDialogTheme))
       .setMessage(R.string.home_activity_back_dialog_message)
       .setNegativeButton(R.string.home_activity_back_dialog_cancel) { dialog, _ ->
-        if (isFromNavigationDrawer) {
-          exitProfileDialogInterface.markHomeMenuCloseDrawer()
+        if (restoreLastCheckedMenuItem) {
+          exitProfileDialogInterface.checkLastCheckedItemAndCloseDrawer(
+            when (argument.number) {
+              2 -> Argument.IsAdministratorControlsSelected(
+                exitProfileDialogArguments.isAdministratorControlsSelected
+              )
+              else -> Argument.LastCheckedMenuItem(
+                getNavigationDrawerItem(
+                  exitProfileDialogArguments.lastCheckedMenuItemValue
+                )
+              )
+            }
+          )
+          exitProfileDialogInterface.unCheckSwitchProfileItemAndCloseDrawer()
         }
         dialog.dismiss()
       }
       .setPositiveButton(R.string.home_activity_back_dialog_exit) { _, _ ->
         // TODO(#322): Need to start intent for ProfileChooserActivity to get update. Change to finish when live data bug is fixed.
         val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!)
-        if (!isFromNavigationDrawer) {
+        if (!restoreLastCheckedMenuItem) {
           intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         }
         activity!!.startActivity(intent)
       }
       .create()
   }
+
+  private fun getNavigationDrawerItem(value: Int): NavigationDrawerItem {
+    return when (value) {
+      0 -> NavigationDrawerItem.HOME
+      1 -> NavigationDrawerItem.OPTIONS
+      2 -> NavigationDrawerItem.HELP
+      3 -> NavigationDrawerItem.DOWNLOADS
+      4 -> NavigationDrawerItem.SWITCH_PROFILE
+      else -> NavigationDrawerItem.HOME
+    }
+  }
 }

app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogInterface.kt

@@ -2,5 +2,7 @@ package org.oppia.android.app.drawer
 
 /** Interface to handle option selection in [ExitProfileDialogFragment]. */
 interface ExitProfileDialogInterface {
-  fun markHomeMenuCloseDrawer()
+  fun checkLastCheckedItemAndCloseDrawer(argument: Argument)
+
+  fun unCheckSwitchProfileItemAndCloseDrawer()
 }

app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt

@@ -40,7 +40,11 @@ class NavigationDrawerFragment :
     navigationDrawerFragmentPresenter.openProfileProgress(profileId)
   }
 
-  override fun markHomeMenuCloseDrawer() {
-    navigationDrawerFragmentPresenter.markHomeMenuCloseDrawer()
+  override fun checkLastCheckedItemAndCloseDrawer(argument: Argument) {
+    navigationDrawerFragmentPresenter.checkLastCheckedItemAndCloseDrawer(argument)
+  }
+
+  override fun unCheckSwitchProfileItemAndCloseDrawer() {
+    navigationDrawerFragmentPresenter.uncheckSwitchProfileItemAndCloseDrawer()
   }
 }

app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt

@@ -59,7 +59,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
   private var previousMenuItemId: Int? = null
   private var internalProfileId: Int = -1
 
-  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View {
     binding = DrawerFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     binding.fragmentDrawerNavView.setNavigationItemSelectedListener(this)
 
@@ -105,9 +105,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
             return@setOnClickListener
           }
 
-          binding.fragmentDrawerNavView.menu.forEach { menuItem ->
-            menuItem.isCheckable = false
-          }
+          uncheckAllMenuItemsWhenAdministratorControlsIsChecked()
 
           drawerLayout.closeDrawers()
           getFooterViewModel().isAdministratorControlsSelected.set(true)
@@ -199,7 +197,6 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
   }
 
   private fun openActivityByMenuItemId(menuItemId: Int) {
-    getFooterViewModel().isAdministratorControlsSelected.set(false)
     if (previousMenuItemId != menuItemId) {
       when (NavigationDrawerItem.valueFromNavId(menuItemId)) {
         NavigationDrawerItem.HOME -> {
@@ -244,8 +241,30 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           if (previousFragment != null) {
             fragment.childFragmentManager.beginTransaction().remove(previousFragment).commitNow()
           }
+          val argument: Argument =
+            if (getFooterViewModel().isAdministratorControlsSelected.get() == true) {
+              getFooterViewModel().isAdministratorControlsSelected.set(false)
+              Argument.IsAdministratorControlsSelected(value = true)
+            } else {
+              Argument.LastCheckedMenuItem(
+                navigationDrawerItem = when (previousMenuItemId) {
+                  0 -> NavigationDrawerItem.HOME
+                  1 -> NavigationDrawerItem.OPTIONS
+                  2 -> NavigationDrawerItem.HELP
+                  3 -> NavigationDrawerItem.DOWNLOADS
+                  4 -> NavigationDrawerItem.SWITCH_PROFILE
+                  else -> NavigationDrawerItem.HOME
+                }
+              )
+            }
+          binding.fragmentDrawerNavView.menu.getItem(
+            NavigationDrawerItem.SWITCH_PROFILE.ordinal
+          ).isChecked = true
           val dialogFragment = ExitProfileDialogFragment
-            .newInstance(isFromNavigationDrawer = true)
+            .newInstance(
+              restoreLastCheckedMenuItem = true,
+              argument = argument
+            )
           dialogFragment.showNow(fragment.childFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
         }
       }
@@ -263,12 +282,31 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
     )
   }
 
-  fun markHomeMenuCloseDrawer() {
+  fun checkLastCheckedItemAndCloseDrawer(argument: Argument) {
+    when (argument) {
+      is Argument.IsAdministratorControlsSelected -> {
+        getFooterViewModel().isAdministratorControlsSelected.set(argument.value)
+        uncheckAllMenuItemsWhenAdministratorControlsIsChecked()
+      }
+      is Argument.LastCheckedMenuItem -> {
+        binding.fragmentDrawerNavView.menu
+          .getItem(argument.navigationDrawerItem.ordinal).isChecked = true
+      }
+    }
+    drawerLayout.closeDrawers()
+  }
+
+  fun uncheckSwitchProfileItemAndCloseDrawer() {
     binding.fragmentDrawerNavView.menu.getItem(
-      NavigationDrawerItem.HOME.ordinal
+      NavigationDrawerItem.SWITCH_PROFILE.ordinal
     ).isChecked =
-      true
-    drawerLayout.closeDrawers()
+      false
+  }
+
+  private fun uncheckAllMenuItemsWhenAdministratorControlsIsChecked() {
+    binding.fragmentDrawerNavView.menu.forEach { item ->
+      item.isCheckable = false
+    }
   }
 
   /**
@@ -345,6 +383,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
     } else {
       // For showing navigation drawer in AdministratorControlsActivity
       getFooterViewModel().isAdministratorControlsSelected.set(true)
+      uncheckAllMenuItemsWhenAdministratorControlsIsChecked()
       this.drawerLayout = drawerLayout
       drawerToggle = object : ActionBarDrawerToggle(
         fragment.activity,

app/src/main/java/org/oppia/android/app/home/HomeActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import org.oppia.android.R
 import org.oppia.android.app.activity.InjectableAppCompatActivity
+import org.oppia.android.app.drawer.Argument
 import org.oppia.android.app.drawer.ExitProfileDialogFragment
 import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID
 import org.oppia.android.app.drawer.TAG_SWITCH_PROFILE_DIALOG
@@ -48,8 +49,12 @@ class HomeActivity :
     if (previousFragment != null) {
       supportFragmentManager.beginTransaction().remove(previousFragment).commitNow()
     }
+    val argument = Argument.IsAdministratorControlsSelected(false)
     val dialogFragment = ExitProfileDialogFragment
-      .newInstance(isFromNavigationDrawer = false)
+      .newInstance(
+        restoreLastCheckedMenuItem = false,
+        argument = argument
+      )
     dialogFragment.showNow(supportFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
   }