Fix Part of #4938: Redesign Profile login and PIN Reset(1/12)

app/BUILD.bazel

@@ -653,6 +653,7 @@ kt_android_library(
         "//third_party:androidx_compose_foundation_foundation-layout",
         "//third_party:androidx_compose_material_material",
         "//third_party:androidx_compose_runtime_runtime",
+        "//third_party:androidx_compose_runtime_runtime-livedata",
         "//third_party:androidx_compose_ui_ui",
         "//third_party:androidx_core_core-ktx",
         "//third_party:androidx_databinding_databinding-adapters",

app/src/main/AndroidManifest.xml

@@ -360,6 +360,10 @@
       android:name=".app.onboarding.IntroActivity"
       android:label="@string/onboarding_learner_intro_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+        android:name=".app.profile.ProfileLoginActivity"
+        android:label="@string/profile_login_activity_title"
+        android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.testing.TextInputLayoutBindingAdaptersTestActivity"
       android:theme="@style/OppiaThemeWithoutActionBar" />

app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt

@@ -53,6 +53,7 @@ import org.oppia.android.app.profile.AdminAuthActivity
 import org.oppia.android.app.profile.AdminPinActivity
 import org.oppia.android.app.profile.PinPasswordActivity
 import org.oppia.android.app.profile.ProfileChooserActivity
+import org.oppia.android.app.profile.ProfileLoginActivity
 import org.oppia.android.app.profileprogress.ProfilePictureActivity
 import org.oppia.android.app.profileprogress.ProfileProgressActivity
 import org.oppia.android.app.resumelesson.ResumeLessonActivity
@@ -230,4 +231,5 @@ interface ActivityComponentImpl :
   fun inject(onboardingProfileTypeActivity: OnboardingProfileTypeActivity)
   fun inject(createProfileActivity: CreateProfileActivity)
   fun inject(introActivity: IntroActivity)
+  fun inject(profileLoginActivity: ProfileLoginActivity)
 }

app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt

@@ -102,7 +102,6 @@ class ClassroomListFragmentPresenter @Inject constructor(
   private lateinit var binding: ClassroomListFragmentBinding
   private lateinit var classroomListViewModel: ClassroomListViewModel
   private val profileId = activity.intent.extractCurrentUserProfileId()
-  private var onBackPressedCallback: OnBackPressedCallback? = null
 
   /** Creates and returns the view for the [ClassroomListFragment]. */
   fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {

app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt

@@ -62,6 +62,7 @@ import org.oppia.android.app.player.stopplaying.UnsavedExplorationDialogFragment
 import org.oppia.android.app.policies.PoliciesFragment
 import org.oppia.android.app.profile.AdminSettingsDialogFragment
 import org.oppia.android.app.profile.ProfileChooserFragment
+import org.oppia.android.app.profile.ProfileLoginFragment
 import org.oppia.android.app.profile.ResetPinDialogFragment
 import org.oppia.android.app.profileprogress.ProfilePictureEditDialogFragment
 import org.oppia.android.app.profileprogress.ProfileProgressFragment
@@ -210,4 +211,5 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(createProfileFragment: CreateProfileFragment)
   fun inject(introFragment: IntroFragment)
   fun inject(flashbackConfirmationDialogFragment: FlashbackConfirmationDialogFragment)
+  fun inject(profileLoginFragment: ProfileLoginFragment)
 }

app/src/main/java/org/oppia/android/app/profile/AdminPinRecoveryDialog.kt

@@ -0,0 +1,46 @@
+package org.oppia.android.app.profile
+
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.DialogProperties
+import org.oppia.android.app.ui.R
+
+/** Composable that represents the admin's forgot pin dialog. */
+@Composable
+fun AdminPinRecoveryDialog(
+  onDismissRequest: () -> Unit,
+  onConfirmation: () -> Unit
+) {
+  val appName = stringResource(R.string.app_name)
+
+  AlertDialog(
+    title = {
+      Text(stringResource(R.string.profile_login_forgot_pin_dialog_title))
+    },
+    text = {
+      Text(stringResource(R.string.profile_login_forgot_pin_dialog_message, appName))
+    },
+    properties = DialogProperties(
+      dismissOnClickOutside = false,
+      dismissOnBackPress = false
+    ),
+    onDismissRequest = { onDismissRequest() },
+    dismissButton = {
+      TextButton(
+        onClick = { onDismissRequest() }
+      ) {
+        Text(stringResource(R.string.profile_login_forgot_pin_dialog_cancel_button))
+      }
+    },
+    confirmButton = {
+      TextButton(
+        onClick = { onConfirmation() }
+      ) {
+        Text(stringResource(R.string.profile_login_forgot_pin_dialog_reset_button, appName))
+      }
+    }
+  )
+}

app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt

@@ -6,20 +6,31 @@ import android.os.Bundle
 import org.oppia.android.app.fragment.FragmentComponentImpl
 import org.oppia.android.app.fragment.InjectableDialogFragment
 import org.oppia.android.app.model.AdminSettingsDialogFragmentArguments
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.extensions.putProto
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId
 import javax.inject.Inject
 
 /** DialogFragment that allows user to input admin PIN. */
 class AdminSettingsDialogFragment : InjectableDialogFragment() {
   companion object {
     /** Arguments key for AdminSettingsDialogFragment. */
     const val ADMIN_SETTINGS_DIALOG_FRAGMENT_ARGUMENTS_KEY = "AdminSettingsDialogFragment.arguments"
-    fun newInstance(adminPin: String): AdminSettingsDialogFragment {
-      val args = AdminSettingsDialogFragmentArguments.newBuilder().setAdminPin(adminPin).build()
+    fun newInstance(
+      adminPin: String,
+      profileId: ProfileId,
+      profileName: String
+    ): AdminSettingsDialogFragment {
+      val args = AdminSettingsDialogFragmentArguments.newBuilder()
+        .setAdminPin(adminPin)
+        .setCurrentProfileName(profileName)
+        .build()
       return AdminSettingsDialogFragment().apply {
         arguments = Bundle().apply {
           putProto(ADMIN_SETTINGS_DIALOG_FRAGMENT_ARGUMENTS_KEY, args)
+          decorateWithUserProfileId(profileId)
         }
       }
     }
@@ -39,10 +50,16 @@ class AdminSettingsDialogFragment : InjectableDialogFragment() {
       AdminSettingsDialogFragmentArguments.getDefaultInstance()
     )
     val adminPin = args?.adminPin
+    val profileName = args?.currentProfileName ?: ""
+    val profileId = arguments?.extractCurrentUserProfileId() ?: ProfileId.getDefaultInstance()
+
     checkNotNull(adminPin) { "Admin Pin must not be null" }
+
     return adminSettingsDialogFragmentPresenter.handleOnCreateDialog(
       activity as ProfileRouteDialogInterface,
-      adminPin
+      adminPin,
+      profileId,
+      profileName
     )
   }
 }

app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt

@@ -9,6 +9,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import org.oppia.android.app.databinding.databinding.AdminSettingsDialogBinding
 import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.ui.R
 import org.oppia.android.app.utility.TextInputEditTextHelper.Companion.onTextChanged
@@ -24,7 +25,9 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor(
 ) {
   fun handleOnCreateDialog(
     routeDialogInterface: ProfileRouteDialogInterface,
-    adminPin: String?
+    adminPin: String?,
+    profileId: ProfileId,
+    profileName: String
   ): Dialog {
     val binding: AdminSettingsDialogBinding =
       DataBindingUtil.inflate(
@@ -83,7 +86,7 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor(
           return@setOnClickListener
         }
         if (binding.adminSettingsInputPinEditText.text.toString() == adminPin) {
-          routeDialogInterface.routeToResetPinDialog()
+          routeDialogInterface.routeToResetPinDialog(profileId, profileName)
         } else {
           adminViewModel.errorMessage.set(
             resourceHandler.getStringInLocale(

app/src/main/java/org/oppia/android/app/profile/DataResetConfirmationDialog.kt

@@ -0,0 +1,53 @@
+package org.oppia.android.app.profile
+
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.DialogProperties
+import org.oppia.android.app.ui.R
+
+/** Composable that represents the admin's reset app data confirmation dialog. */
+@Composable
+fun DataResetConfirmationDialog(
+  onDismissRequest: () -> Unit,
+  deleteAppData: () -> Unit
+) {
+  val appName = stringResource(R.string.app_name)
+
+  AlertDialog(
+    title = {
+      Text(
+        stringResource(R.string.admin_confirm_app_wipe_title, appName)
+      )
+    },
+    text = {
+      Text(stringResource(R.string.admin_confirm_app_wipe_message, appName))
+    },
+    properties = DialogProperties(
+      dismissOnClickOutside = false,
+      dismissOnBackPress = false
+    ),
+    onDismissRequest = { onDismissRequest() },
+    dismissButton = {
+      TextButton(
+        onClick = { onDismissRequest() }
+      ) {
+        Text(stringResource(R.string.admin_confirm_app_wipe_negative_button_text))
+      }
+    },
+    confirmButton = {
+      TextButton(
+        onClick = { deleteAppData() }
+      ) {
+        Text(
+          stringResource(
+            R.string.admin_confirm_app_wipe_positive_button_text,
+            appName
+          )
+        )
+      }
+    }
+  )
+}

app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt

@@ -6,11 +6,13 @@ import android.os.Bundle
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.model.PinPasswordActivityParams
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.ScreenName.PIN_PASSWORD_ACTIVITY
 import org.oppia.android.util.extensions.putProtoExtra
 import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
 import javax.inject.Inject
 
+// TODO(#5817): Remove when v2 onboarding flow has stabilized.
 /** Activity that allows user to input his or her PIN. */
 class PinPasswordActivity :
   InjectableAutoLocalizedAppCompatActivity(),
@@ -43,7 +45,7 @@ class PinPasswordActivity :
     pinPasswordActivityPresenter.handleOnCreate()
   }
 
-  override fun routeToResetPinDialog() {
+  override fun routeToResetPinDialog(profileId: ProfileId, profileName: String) {
     pinPasswordActivityPresenter.handleRouteToResetPinDialog()
   }
 

app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt

@@ -138,21 +138,32 @@ class PinPasswordActivityPresenter @Inject constructor(
     }
 
     binding.forgotPin.setOnClickListener {
-      if (pinViewModel.isAdmin.get()!!) {
+      val isAdmin = pinViewModel.isAdmin.get() ?: false
+      if (isAdmin) {
         showAdminForgotPin()
       } else {
         val previousFrag =
           activity.supportFragmentManager.findFragmentByTag(TAG_ADMIN_SETTINGS_DIALOG)
         if (previousFrag != null) {
-          activity.supportFragmentManager.beginTransaction().remove(previousFrag).commitNow()
+          activity.supportFragmentManager.beginTransaction()
+            .remove(previousFrag)
+            .commitNow()
+        }
+
+        val nameValue = pinViewModel.name.get()
+
+        if (adminPin != null && nameValue != null) {
+          val dialogFragment = AdminSettingsDialogFragment
+            .newInstance(adminPin, profileId, nameValue)
+          dialogFragment.showNow(
+            activity.supportFragmentManager,
+            TAG_ADMIN_SETTINGS_DIALOG
+          )
         }
-        val dialogFragment = AdminSettingsDialogFragment
-          .newInstance(adminPin!!)
-        dialogFragment.showNow(activity.supportFragmentManager, TAG_ADMIN_SETTINGS_DIALOG)
       }
     }
 
-    if (pinViewModel.showAdminPinForgotPasswordPopUp.get()!!) {
+    if (pinViewModel.showAdminPinForgotPasswordPopUp.get() == true) {
       showAdminForgotPin()
     }
   }

app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt

@@ -15,6 +15,7 @@ import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
 
+// TODO(#5817): Remove along with PinPasswordActivity when v2 onboarding flow has stabilized.
 /** The ViewModel for [PinPasswordActivity]. */
 @ActivityScope
 class PinPasswordViewModel @Inject constructor(

app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt

@@ -22,6 +22,7 @@ class ProfileChooserActivityPresenter @Inject constructor(
   /** Adds [ProfileChooserFragment] to view. */
   fun handleOnCreate(profileId: ProfileId, profileType: ProfileType) {
     if (enableOnboardingFlowV2.value) {
+      // TODO(#4938): Ensure default profile is present when the admin resets the app data.
       profileManagementController.updateNewProfileDetails(
         profileId = profileId,
         profileType = profileType,

app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt

@@ -325,12 +325,11 @@ class ProfileChooserFragmentPresenter @Inject constructor(
         }
       }
     } else {
-      val pinPasswordIntent = PinPasswordActivity.createPinPasswordActivityIntent(
-        activity,
-        chooserViewModel.adminPin,
-        profile.id.internalId
+      val profileLoginIntent = ProfileLoginActivity.createProfileLoginActivityIntent(
+        context,
+        profile.id
       )
-      activity.startActivity(pinPasswordIntent)
+      activity.startActivity(profileLoginIntent)
     }
   }
 

app/src/main/java/org/oppia/android/app/profile/ProfileLoginActivity.kt

@@ -0,0 +1,52 @@
+package org.oppia.android.app.profile
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import org.oppia.android.app.activity.ActivityComponentImpl
+import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
+import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ScreenName
+import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId
+import javax.inject.Inject
+
+/** Activity that allows user to log in to their profile by inputting their PIN. */
+class ProfileLoginActivity :
+  InjectableAutoLocalizedAppCompatActivity(),
+  ProfileRouteDialogInterface {
+
+  @Inject
+  lateinit var profileLoginActivityPresenter: ProfileLoginActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    (activityComponent as ActivityComponentImpl).inject(this)
+
+    val profileId = intent.extractCurrentUserProfileId()
+
+    profileLoginActivityPresenter.handleOnCreate(profileId)
+  }
+
+  companion object {
+    /** Creates and returns an Intent to open a new [ProfileLoginActivity]. */
+    fun createProfileLoginActivityIntent(
+      context: Context,
+      profileId: ProfileId
+    ): Intent {
+      return Intent(context, ProfileLoginActivity::class.java).apply {
+        decorateWithUserProfileId(profileId)
+        decorateWithScreenName(ScreenName.PROFILE_LOGIN_ACTIVITY)
+      }
+    }
+  }
+
+  override fun routeToResetPinDialog(profileId: ProfileId, profileName: String) {
+    profileLoginActivityPresenter.handleRouteToResetPinDialog(profileId, profileName)
+  }
+
+  override fun routeToSuccessDialog() {
+    profileLoginActivityPresenter.handleRouteToSuccessDialog()
+  }
+}