Fix Part of #4938: Create Admin PIN (4/12)

app/src/main/AndroidManifest.xml

@@ -366,6 +366,10 @@
         android:name=".app.onboarding.AdminIntroActivity"
         android:label="@string/admin_intro_activity_title"
         android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+        android:name=".app.profile.CreateAdminPinActivity"
+        android:label="@string/create_admin_pin_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

@@ -52,6 +52,7 @@ import org.oppia.android.app.policies.PoliciesActivity
 import org.oppia.android.app.profile.AddProfileActivity
 import org.oppia.android.app.profile.AdminAuthActivity
 import org.oppia.android.app.profile.AdminPinActivity
+import org.oppia.android.app.profile.CreateAdminPinActivity
 import org.oppia.android.app.profile.PinPasswordActivity
 import org.oppia.android.app.profile.ProfileChooserActivity
 import org.oppia.android.app.profile.ProfileLoginActivity
@@ -234,4 +235,5 @@ interface ActivityComponentImpl :
   fun inject(introActivity: IntroActivity)
   fun inject(profileLoginActivity: ProfileLoginActivity)
   fun inject(adminIntroActivity: AdminIntroActivity)
+  fun inject(createAdminPinActivity: CreateAdminPinActivity)
 }

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

@@ -64,6 +64,7 @@ import org.oppia.android.app.player.stopplaying.StopExplorationDialogFragment
 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.CreateAdminPinFragment
 import org.oppia.android.app.profile.ProfileChooserFragment
 import org.oppia.android.app.profile.ProfileLoginFragment
 import org.oppia.android.app.profile.ResetPinDialogFragment
@@ -220,4 +221,5 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(introFragment: IntroFragment)
   fun inject(profileLoginFragment: ProfileLoginFragment)
   fun inject(adminIntroFragment: AdminIntroFragment)
+  fun inject(createAdminPinFragment: CreateAdminPinFragment)
 }

app/src/main/java/org/oppia/android/app/onboarding/AdminIntroFragmentPresenter.kt

@@ -45,15 +45,12 @@ import androidx.compose.ui.unit.sp
 import androidx.fragment.app.Fragment
 import org.oppia.android.app.databinding.databinding.AdminIntroFragmentBinding
 import org.oppia.android.app.model.LegacyProfileId
-import org.oppia.android.app.model.ProfileChooserActivityParams
-import org.oppia.android.app.model.ProfileChooserActivityParams.ParentScreen
 import org.oppia.android.app.model.ProfileType
+import org.oppia.android.app.profile.CreateAdminPinActivity
 import org.oppia.android.app.profile.ProfileChooserActivity
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.ui.R
 import org.oppia.android.domain.profile.ProfileManagementController
-import org.oppia.android.util.extensions.putProtoExtra
-import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
 import javax.inject.Inject
 
 /** Argument key for [ProfileChooserActivity] intent parameters. */
@@ -262,8 +259,9 @@ class AdminIntroFragmentPresenter @Inject constructor(
 
       Button(
         onClick = {
-          // TODO(#4938): Refactor to: create admin pin screen when the UI is ready.
-          navigateToProfileChooserActivity()
+          fragment.startActivity(
+            CreateAdminPinActivity.createAdminPinActivityIntent(activity, profileId)
+          )
         },
         colors = ButtonDefaults.buttonColors(
           backgroundColor = colorResource(
@@ -285,22 +283,4 @@ class AdminIntroFragmentPresenter @Inject constructor(
       }
     }
   }
-
-  private fun navigateToProfileChooserActivity() {
-    val intent = ProfileChooserActivity.createProfileChooserActivity(activity)
-    intent.apply {
-      decorateWithUserProfileId(profileId)
-      putProtoExtra(
-        PROFILE_CHOOSER_PARAMS_KEY,
-        ProfileChooserActivityParams.newBuilder()
-          .setParentScreen(ParentScreen.ADMIN_INTRO_SCREEN)
-          .build()
-      )
-    }
-    fragment.startActivity(intent)
-    // Finish this activity as well as all activities immediately below it in the current
-    // task so that the user cannot navigate back to the onboarding flow by pressing the
-    // back button once onboarding is complete.
-    fragment.activity?.finishAffinity()
-  }
 }

app/src/main/java/org/oppia/android/app/onboarding/CreateProfileFragmentPresenter.kt

@@ -93,7 +93,7 @@ class CreateProfileFragmentPresenter @Inject constructor(
       val nickname = binding.createProfileNicknameEdittext.text.toString().trim()
 
       if (!checkNicknameAndUpdateError(nickname)) {
-        updateProfileDetails(nickname)
+        updateProfileDetails(nickname, profileType)
       }
     }
 
@@ -150,7 +150,7 @@ class CreateProfileFragmentPresenter @Inject constructor(
     }
   }
 
-  private fun updateProfileDetails(profileName: String) {
+  private fun updateProfileDetails(profileName: String, profileType: ProfileType) {
     profileManagementController.updateNewProfileDetails(
       profileId = profileId,
       profileType = profileType,
@@ -170,7 +170,8 @@ class CreateProfileFragmentPresenter @Inject constructor(
             .setParentScreen(IntroActivityParams.ParentScreen.CREATE_PROFILE_SCREEN)
             .build()
 
-          val learnerIntroIntent = IntroActivity.createIntroActivity(activity, params, profileId)
+          val learnerIntroIntent =
+            IntroActivity.createIntroActivity(activity, params, profileId)
 
           val adminIntroIntent = AdminIntroActivity.createAdminIntroActivityIntent(
             activity,

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

@@ -21,6 +21,7 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.extensions.getProtoExtra
 import javax.inject.Inject
 
+// TODO(#5817): Remove when v2 onboarding flow has stabilized.
 /** The presenter for [AdminPinActivity]. */
 @ActivityScope
 class AdminPinActivityPresenter @Inject constructor(

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

@@ -0,0 +1,38 @@
+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.InjectableSystemLocalizedAppCompatActivity
+import org.oppia.android.app.model.LegacyProfileId
+import org.oppia.android.app.model.ScreenName.CREATE_ADMIN_PIN_ACTIVITY
+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 for displaying the Admin PIN setup screen. */
+class CreateAdminPinActivity : InjectableSystemLocalizedAppCompatActivity() {
+
+  @Inject
+  lateinit var createAdminPinActivityPresenter: CreateAdminPinActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    (activityComponent as ActivityComponentImpl).inject(this)
+    super.onCreate(savedInstanceState)
+
+    val profileId = intent.extractCurrentUserProfileId()
+    createAdminPinActivityPresenter.handleOnCreate(profileId)
+  }
+
+  companion object {
+    /** Returns a new [Intent] to open a [CreateAdminPinActivity] with the specified params. */
+    fun createAdminPinActivityIntent(context: Context, profileId: LegacyProfileId): Intent {
+      return Intent(context, CreateAdminPinActivity::class.java).apply {
+        decorateWithScreenName(CREATE_ADMIN_PIN_ACTIVITY)
+        decorateWithUserProfileId(profileId)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,44 @@
+package org.oppia.android.app.profile
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.app.model.LegacyProfileId
+import org.oppia.android.app.ui.R
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
+import javax.inject.Inject
+
+/** The presenter for [CreateAdminPinActivity]. */
+@ActivityScope
+class CreateAdminPinActivityPresenter @Inject constructor(
+  private val activity: AppCompatActivity
+) {
+  private companion object {
+    private const val TAG_CREATE_ADMIN_PIN_FRAGMENT = "TAG_CREATE_ADMIN_PIN_FRAGMENT"
+  }
+
+  /** Creates the view for [CreateAdminPinActivity]. */
+  fun handleOnCreate(profileId: LegacyProfileId) {
+    activity.setContentView(R.layout.create_admin_pin_activity)
+
+    if (getPinSetupFragment() == null) {
+      val createAdminPinFragment = CreateAdminPinFragment().apply {
+        arguments = Bundle().also { it.decorateWithUserProfileId(profileId) }
+      }
+
+      activity.supportFragmentManager.beginTransaction()
+        .add(
+          R.id.pin_setup_fragment_placeholder,
+          createAdminPinFragment,
+          TAG_CREATE_ADMIN_PIN_FRAGMENT
+        )
+        .commitNow()
+    }
+  }
+
+  private fun getPinSetupFragment(): CreateAdminPinFragment? {
+    return activity.supportFragmentManager.findFragmentByTag(
+      TAG_CREATE_ADMIN_PIN_FRAGMENT
+    ) as? CreateAdminPinFragment
+  }
+}

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

@@ -0,0 +1,30 @@
+package org.oppia.android.app.profile
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.oppia.android.app.fragment.FragmentComponentImpl
+import org.oppia.android.app.fragment.InjectableFragment
+import javax.inject.Inject
+
+/** Fragment that contains the create admin PIN screen. */
+class CreateAdminPinFragment : InjectableFragment() {
+
+  @Inject
+  lateinit var createAdminPinFragmentPresenter: CreateAdminPinFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    return createAdminPinFragmentPresenter.handleCreateView(inflater, container, savedInstanceState)
+  }
+}