Fix #1762: NavigationDrawer cancel switch profile always mark home

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

@@ -8,42 +8,58 @@ 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,
+      isAdministratorControlsSelected: Boolean,
+      lastCheckedMenuItemId: Int
+    ): ExitProfileDialogFragment {
       val exitProfileDialogFragment = ExitProfileDialogFragment()
       val args = Bundle()
-      args.putBoolean(BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY, isFromNavigationDrawer)
+      val exitProfileDialogArguments =
+        ExitProfileDialogArguments.newBuilder()
+          .setRestoreLastCheckedMenuItem(restoreLastCheckedMenuItem)
+          .setIsAdministratorControlsSelected(isAdministratorControlsSelected)
+          .setLastCheckedMenuItemId(lastCheckedMenuItemId).build()
+      args.putProto(EXIT_PROFILE_DIALOG_ARGUMENTS_PROTO, exitProfileDialogArguments)
+
       exitProfileDialogFragment.arguments = args
       return exitProfileDialogFragment
     }
   }
 
-  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 isAdministratorControlsSelected = exitProfileDialogArguments.isAdministratorControlsSelected
+    val lastCheckedMenuItemId = exitProfileDialogArguments.lastCheckedMenuItemId
+
+    if (restoreLastCheckedMenuItem) {
       exitProfileDialogInterface =
         parentFragment as ExitProfileDialogInterface
     }
@@ -52,15 +68,19 @@ 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(
+            lastCheckedMenuItemId,
+            isAdministratorControlsSelected
+          )
+          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)

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

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

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

@@ -40,7 +40,17 @@ class NavigationDrawerFragment :
     navigationDrawerFragmentPresenter.openProfileProgress(profileId)
   }
 
-  override fun markHomeMenuCloseDrawer() {
-    navigationDrawerFragmentPresenter.markHomeMenuCloseDrawer()
+  override fun checkLastCheckedItemAndCloseDrawer(
+    lastCheckedMenuItemId: Int,
+    isAdministratorControlsSelected: Boolean
+  ) {
+    navigationDrawerFragmentPresenter.checkLastCheckedItemAndCloseDrawer(
+      lastCheckedMenuItemId,
+      isAdministratorControlsSelected
+    )
+  }
+
+  override fun unCheckSwitchProfileItemAndCloseDrawer() {
+    navigationDrawerFragmentPresenter.uncheckSwitchProfileItemAndCloseDrawer()
   }
 }

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

@@ -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,25 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           if (previousFragment != null) {
             fragment.childFragmentManager.beginTransaction().remove(previousFragment).commitNow()
           }
+          val lastCheckedMenuItemId: Int
+          val isAdministratorControlsSelected: Boolean
+          if (getFooterViewModel().isAdministratorControlsSelected.get() == true) {
+            getFooterViewModel().isAdministratorControlsSelected.set(false)
+            isAdministratorControlsSelected = true
+            lastCheckedMenuItemId = -1
+          } else {
+            isAdministratorControlsSelected = false
+            lastCheckedMenuItemId = previousMenuItemId ?: -1
+          }
+          binding.fragmentDrawerNavView.menu.getItem(
+            NavigationDrawerItem.SWITCH_PROFILE.ordinal
+          ).isChecked = true
           val dialogFragment = ExitProfileDialogFragment
-            .newInstance(isFromNavigationDrawer = true)
+            .newInstance(
+              restoreLastCheckedMenuItem = true,
+              isAdministratorControlsSelected = isAdministratorControlsSelected,
+              lastCheckedMenuItemId = lastCheckedMenuItemId
+            )
           dialogFragment.showNow(fragment.childFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
         }
       }
@@ -263,12 +277,41 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
     )
   }
 
-  fun markHomeMenuCloseDrawer() {
+  fun checkLastCheckedItemAndCloseDrawer(
+    lastCheckedMenuItemId: Int,
+    isAdministratorControlsSelected: Boolean
+  ) {
+    if (isAdministratorControlsSelected) {
+      getFooterViewModel().isAdministratorControlsSelected.set(true)
+      uncheckAllMenuItemsWhenAdministratorControlsIsChecked()
+    } else if (lastCheckedMenuItemId != -1) {
+      getFooterViewModel().isAdministratorControlsSelected.set(false)
+      val checkedMenuItemPosition =
+        when (lastCheckedMenuItemId) {
+          NavigationDrawerItem.HOME.value -> 0
+          NavigationDrawerItem.OPTIONS.value -> 1
+          NavigationDrawerItem.HELP.value -> 2
+          NavigationDrawerItem.DOWNLOADS.value -> 3
+          else -> 4
+        }
+      if (checkedMenuItemPosition != 4) {
+        binding.fragmentDrawerNavView.menu.getItem(checkedMenuItemPosition).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 +388,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

@@ -49,7 +49,11 @@ class HomeActivity :
       supportFragmentManager.beginTransaction().remove(previousFragment).commitNow()
     }
     val dialogFragment = ExitProfileDialogFragment
-      .newInstance(isFromNavigationDrawer = false)
+      .newInstance(
+        restoreLastCheckedMenuItem = false,
+        isAdministratorControlsSelected = false,
+        lastCheckedMenuItemId = -1
+      )
     dialogFragment.showNow(supportFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
   }