Fix #1762: NavigationDrawer cancel switch profile always mark home

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

@@ -17,16 +17,26 @@ class ExitProfileDialogFragment : DialogFragment() {
     // 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 BOOL_IS_ADMINISTRATOR_CONTROLS_SELECTED_KEY =
+      "BOOL_IS_ADMINISTRATOR_CONTROLS_SELECTED_KEY"
+    const val INT_LAST_CHECKED_ITEM_KEY =
+      "INT_LAST_CHECKED_ITEM_KEY"
 
     /**
      * This function is responsible for displaying content in DialogFragment.
      *
      * @return [ExitProfileDialogFragment]: DialogFragment
      */
-    fun newInstance(isFromNavigationDrawer: Boolean): ExitProfileDialogFragment {
+    fun newInstance(
+      isFromNavigationDrawer: Boolean,
+      isAdministratorControlsSelected: Boolean,
+      lastCheckedItemId: Int
+    ): ExitProfileDialogFragment {
       val exitProfileDialogFragment = ExitProfileDialogFragment()
       val args = Bundle()
       args.putBoolean(BOOL_IS_FROM_NAVIGATION_DRAWER_EXTRA_KEY, isFromNavigationDrawer)
+      args.putBoolean(BOOL_IS_ADMINISTRATOR_CONTROLS_SELECTED_KEY, isAdministratorControlsSelected)
+      args.putInt(INT_LAST_CHECKED_ITEM_KEY, lastCheckedItemId)
       exitProfileDialogFragment.arguments = args
       return exitProfileDialogFragment
     }
@@ -43,6 +53,15 @@ class ExitProfileDialogFragment : DialogFragment() {
       false
     )
 
+    val isAdminSelected = args.getBoolean(
+      BOOL_IS_ADMINISTRATOR_CONTROLS_SELECTED_KEY,
+      false
+    )
+
+    val lastCheckedItemId = args.getInt(
+      INT_LAST_CHECKED_ITEM_KEY
+    )
+
     if (isFromNavigationDrawer) {
       exitProfileDialogInterface =
         parentFragment as ExitProfileDialogInterface
@@ -53,7 +72,11 @@ class ExitProfileDialogFragment : DialogFragment() {
       .setMessage(R.string.home_activity_back_dialog_message)
       .setNegativeButton(R.string.home_activity_back_dialog_cancel) { dialog, _ ->
         if (isFromNavigationDrawer) {
-          exitProfileDialogInterface.markHomeMenuCloseDrawer()
+          exitProfileDialogInterface.markLastCheckedItemCloseDrawer(
+            lastCheckedItemId,
+            isAdminSelected
+          )
+          exitProfileDialogInterface.unmarkSwitchProfileItemCloseDrawer()
         }
         dialog.dismiss()
       }

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

@@ -2,5 +2,6 @@ package org.oppia.app.drawer
 
 /** Interface to handle option selection in [ExitProfileDialogFragment]. */
 interface ExitProfileDialogInterface {
-  fun markHomeMenuCloseDrawer()
+  fun markLastCheckedItemCloseDrawer(lastCheckedItemId: Int, isAdminSelected: Boolean)
+  fun unmarkSwitchProfileItemCloseDrawer()
 }

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

@@ -40,7 +40,14 @@ class NavigationDrawerFragment :
     navigationDrawerFragmentPresenter.openProfileProgress(profileId)
   }
 
-  override fun markHomeMenuCloseDrawer() {
-    navigationDrawerFragmentPresenter.markHomeMenuCloseDrawer()
+  override fun markLastCheckedItemCloseDrawer(lastCheckedItemId: Int, isAdminSelected: Boolean) {
+    navigationDrawerFragmentPresenter.markLastCheckedItemCloseDrawer(
+      lastCheckedItemId,
+      isAdminSelected
+    )
+  }
+
+  override fun unmarkSwitchProfileItemCloseDrawer() {
+    navigationDrawerFragmentPresenter.unmarkSwitchProfileItemCloseDrawer()
   }
 }

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

@@ -1,5 +1,6 @@
 package org.oppia.app.drawer
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -57,6 +58,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
   private lateinit var profileId: ProfileId
   private var previousMenuItemId: Int? = null
   private var internalProfileId: Int = -1
+  private var lastCheckedItem: MenuItem? = null
 
   fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
     binding = DrawerFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
@@ -193,7 +195,6 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
   }
 
   private fun openActivityByMenuItemId(menuItemId: Int) {
-    getFooterViewModel().isAdministratorControlsSelected.set(false)
     if (previousMenuItemId != menuItemId) {
       when (NavigationDrawerItem.valueFromNavId(menuItemId)) {
         NavigationDrawerItem.HOME -> {
@@ -233,13 +234,20 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           drawerLayout.closeDrawers()
         }
         NavigationDrawerItem.SWITCH_PROFILE -> {
+          val isAdminSelected = getFooterViewModel().isAdministratorControlsSelected.get() ?: false
+          lastCheckedItem = binding.fragmentDrawerNavView.checkedItem
+          val id: Int = lastCheckedItem?.itemId ?: -1
           val previousFragment =
             fragment.childFragmentManager.findFragmentByTag(TAG_SWITCH_PROFILE_DIALOG)
           if (previousFragment != null) {
             fragment.childFragmentManager.beginTransaction().remove(previousFragment).commitNow()
           }
           val dialogFragment = ExitProfileDialogFragment
-            .newInstance(isFromNavigationDrawer = true)
+            .newInstance(
+              isFromNavigationDrawer = true,
+              isAdministratorControlsSelected = isAdminSelected,
+              lastCheckedItemId = id
+            )
           dialogFragment.showNow(fragment.childFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
         }
       }
@@ -257,12 +265,32 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
     )
   }
 
-  fun markHomeMenuCloseDrawer() {
+  fun markLastCheckedItemCloseDrawer(lastCheckedItemId: Int, isAdminSelected: Boolean) {
+    if (isAdminSelected) {
+      getFooterViewModel().isAdministratorControlsSelected.set(true)
+    } else {
+      if (lastCheckedItemId != -1) {
+        binding.fragmentDrawerNavView.menu.getItem(
+          when (lastCheckedItemId) {
+            NavigationDrawerItem.HOME.value -> 0
+            NavigationDrawerItem.OPTIONS.value -> 1
+            NavigationDrawerItem.HELP.value -> 2
+            NavigationDrawerItem.DOWNLOADS.value -> 3
+            NavigationDrawerItem.SWITCH_PROFILE.value -> 4
+            else -> 0
+          }
+        ).isChecked = true
+      }
+    }
+    drawerLayout.closeDrawers()
+  }
+
+  fun unmarkSwitchProfileItemCloseDrawer() {
+    Log.d("final", "unmarkSwitchProfileItemCloseDrawer: unmark done")
     binding.fragmentDrawerNavView.menu.getItem(
-      NavigationDrawerItem.HOME.ordinal
+      NavigationDrawerItem.SWITCH_PROFILE.ordinal
     ).isChecked =
-      true
-    drawerLayout.closeDrawers()
+      false
   }
 
   /**
@@ -348,6 +376,9 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
         R.string.drawer_close_content_description
       ) {
         override fun onDrawerOpened(drawerView: View) {
+          binding.fragmentDrawerNavView.menu.getItem(
+            NavigationDrawerItem.SWITCH_PROFILE.ordinal
+          ).isChecked = false
           super.onDrawerOpened(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
           StatusBarColor.statusBarColorUpdate(

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

@@ -44,7 +44,11 @@ class HomeActivity : InjectableAppCompatActivity(), RouteToTopicListener {
       supportFragmentManager.beginTransaction().remove(previousFragment).commitNow()
     }
     val dialogFragment = ExitProfileDialogFragment
-      .newInstance(isFromNavigationDrawer = false)
+      .newInstance(
+        isFromNavigationDrawer = false,
+        isAdministratorControlsSelected = false,
+        lastCheckedItemId = -1
+      )
     dialogFragment.showNow(supportFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
   }
 }