Fix Part of #4938: Create Admin Onboarding Intro(2/12)

app/src/main/AndroidManifest.xml

@@ -364,6 +364,10 @@
         android:name=".app.profile.ProfileLoginActivity"
         android:label="@string/profile_login_activity_title"
         android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+        android:name=".app.onboarding.AdminIntroActivity"
+        android:label="@string/admin_intro_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

@@ -36,6 +36,7 @@ import org.oppia.android.app.help.thirdparty.ThirdPartyDependencyListActivity
 import org.oppia.android.app.home.HomeActivity
 import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity
 import org.oppia.android.app.mydownloads.MyDownloadsActivity
+import org.oppia.android.app.onboarding.AdminIntroActivity
 import org.oppia.android.app.onboarding.CreateProfileActivity
 import org.oppia.android.app.onboarding.IntroActivity
 import org.oppia.android.app.onboarding.OnboardingActivity
@@ -232,4 +233,5 @@ interface ActivityComponentImpl :
   fun inject(createProfileActivity: CreateProfileActivity)
   fun inject(introActivity: IntroActivity)
   fun inject(profileLoginActivity: ProfileLoginActivity)
+  fun inject(adminIntroActivity: AdminIntroActivity)
 }

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

@@ -275,13 +275,27 @@ class ClassroomListFragmentPresenter @Inject constructor(
         val profile = result.value
         val profileType = profile.profileType
 
-        if (enableOnboardingFlowV2.value && !profile.completedProfileOnboarding) {
-          // These asynchronous API calls do not block or wait for their results. They execute in
-          // the background and have minimal chances of interfering with the synchronous
-          // `handleBackPress` call below.
-          profileManagementController.markProfileOnboardingEnded(profileId)
-          if (profileType == ProfileType.SOLE_LEARNER || profileType == ProfileType.SUPERVISOR) {
-            appStartupStateController.markOnboardingFlowCompleted(profileId)
+        if (enableOnboardingFlowV2.value) {
+          when {
+            profileType == ProfileType.SUPERVISOR && profile.numberOfLogins == 1 -> {
+              // Supervisors end  profile onboarding on the profiles list screen, but they do
+              // complete app onboarding here.
+              appStartupStateController.markOnboardingFlowCompleted(profileId)
+            }
+            profileType == ProfileType.SOLE_LEARNER && !profile.completedProfileOnboarding -> {
+              // Sole learners both end profile onboarding and complete app onboarding here.
+              // These asynchronous API calls do not block or wait for their results. They execute
+              // in the background and have minimal chances of interfering with the synchronous
+              // `handleBackPress` call below.
+              profileManagementController.markProfileOnboardingEnded(profileId)
+              appStartupStateController.markOnboardingFlowCompleted(profileId)
+            }
+            profileType == ProfileType.ADDITIONAL_LEARNER &&
+              !profile.completedProfileOnboarding -> {
+              // Additional learners only end profile onboarding, since they will never be the first
+              // profile in the app.
+              profileManagementController.markProfileOnboardingEnded(profileId)
+            }
           }
         }
 

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

@@ -41,6 +41,7 @@ import org.oppia.android.app.notice.ForcedAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeDialogFragment
 import org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.OsDeprecationNoticeDialogFragment
+import org.oppia.android.app.onboarding.AdminIntroFragment
 import org.oppia.android.app.onboarding.CreateProfileFragment
 import org.oppia.android.app.onboarding.IntroFragment
 import org.oppia.android.app.onboarding.OnboardingFragment
@@ -218,4 +219,5 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(createProfileFragment: CreateProfileFragment)
   fun inject(introFragment: IntroFragment)
   fun inject(profileLoginFragment: ProfileLoginFragment)
+  fun inject(adminIntroFragment: AdminIntroFragment)
 }

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

@@ -125,13 +125,27 @@ class HomeFragmentPresenter @Inject constructor(
         val profile = result.value
         val profileType = profile.profileType
 
-        if (enableOnboardingFlowV2.value && !profile.completedProfileOnboarding) {
-          // These asynchronous API calls do not block or wait for their results. They execute in
-          // the background and have minimal chances of interfering with the synchronous
-          // `handleBackPress` call below.
-          profileManagementController.markProfileOnboardingEnded(profileId)
-          if (profileType == ProfileType.SOLE_LEARNER || profileType == ProfileType.SUPERVISOR) {
-            appStartupStateController.markOnboardingFlowCompleted(profileId)
+        if (enableOnboardingFlowV2.value) {
+          when {
+            profileType == ProfileType.SUPERVISOR && profile.numberOfLogins == 1 -> {
+              // Supervisors end  profile onboarding on the profiles list screen, but they do
+              // complete app onboarding here.
+              appStartupStateController.markOnboardingFlowCompleted(profileId)
+            }
+            profileType == ProfileType.SOLE_LEARNER && !profile.completedProfileOnboarding -> {
+              // Sole learners both end profile onboarding and complete app onboarding here.
+              // These asynchronous API calls do not block or wait for their results. They execute
+              // in the background and have minimal chances of interfering with the synchronous
+              // `handleBackPress` call below.
+              profileManagementController.markProfileOnboardingEnded(profileId)
+              appStartupStateController.markOnboardingFlowCompleted(profileId)
+            }
+            profileType == ProfileType.ADDITIONAL_LEARNER &&
+              !profile.completedProfileOnboarding -> {
+              // Additional learners only end profile onboarding, since they will never be the first
+              // profile in the app.
+              profileManagementController.markProfileOnboardingEnded(profileId)
+            }
           }
         }
 

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

@@ -0,0 +1,63 @@
+package org.oppia.android.app.onboarding
+
+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.AdminIntroActivityParams
+import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ProfileType
+import org.oppia.android.app.model.ScreenName.ADMIN_INTRO_ACTIVITY
+import org.oppia.android.util.extensions.getProtoExtra
+import org.oppia.android.util.extensions.putProtoExtra
+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
+
+/** Argument key for [AdminIntroActivity] intent parameters. */
+const val ADMIN_INTRO_PARAMS_KEY = "AdminIntroActivityParams.params"
+
+/** Activity for displaying the admin onboarding screen. */
+class AdminIntroActivity : InjectableAutoLocalizedAppCompatActivity() {
+
+  @Inject
+  lateinit var adminIntroActivityPresenter: AdminIntroActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    (activityComponent as ActivityComponentImpl).inject(this)
+
+    val profileId = intent.extractCurrentUserProfileId()
+    val adminIntroActivityParams = intent.getProtoExtra(
+      ADMIN_INTRO_PARAMS_KEY, AdminIntroActivityParams.getDefaultInstance()
+    )
+    val profileType = adminIntroActivityParams.profileType
+    val profileNickname = adminIntroActivityParams.profileNickname
+
+    adminIntroActivityPresenter.handleOnCreate(profileId, profileType, profileNickname)
+  }
+
+  companion object {
+    /** Returns a new [Intent] to open an [AdminIntroActivity] with the specified params. */
+    fun createAdminIntroActivityIntent(
+      context: Context,
+      profileId: ProfileId,
+      profileType: ProfileType,
+      profileNickname: String
+    ): Intent {
+      val introActivityParams = AdminIntroActivityParams.newBuilder()
+        .setProfileType(profileType)
+        .setProfileNickname(profileNickname)
+        .build()
+
+      return Intent(context, AdminIntroActivity::class.java).apply {
+        decorateWithScreenName(ADMIN_INTRO_ACTIVITY)
+        putProtoExtra(ADMIN_INTRO_PARAMS_KEY, introActivityParams)
+        decorateWithUserProfileId(profileId)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,59 @@
+package org.oppia.android.app.onboarding
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.app.model.AdminIntroFragmentArguments
+import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.ProfileType
+import org.oppia.android.app.ui.R
+import org.oppia.android.util.extensions.putProto
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
+import javax.inject.Inject
+
+/** Argument key for [AdminIntroFragment] arguments. */
+const val ADMIN_INTRO_FRAGMENT_ARGS = "AdminIntroFragment.args"
+
+private const val TAG_ADMIN_INTRO_FRAGMENT = "TAG_ADMIN_INTRO_FRAGMENT"
+
+/** The presenter for [AdminIntroActivity]. */
+@ActivityScope
+class AdminIntroActivityPresenter @Inject constructor(
+  private val activity: AppCompatActivity
+) {
+
+  /** Creates the view for [AdminIntroActivity]. */
+  fun handleOnCreate(profileId: ProfileId, profileType: ProfileType, profileNickname: String) {
+    activity.setContentView(R.layout.admin_intro_activity)
+
+    if (getAdminIntroFragment() == null) {
+      val adminIntroFragment = AdminIntroFragment()
+
+      val args = Bundle().apply {
+        val fragmentArgs =
+          AdminIntroFragmentArguments.newBuilder()
+            .setProfileType(profileType)
+            .setProfileNickname(profileNickname)
+            .build()
+        putProto(ADMIN_INTRO_FRAGMENT_ARGS, fragmentArgs)
+        decorateWithUserProfileId(profileId)
+      }
+
+      adminIntroFragment.arguments = args
+
+      activity.supportFragmentManager.beginTransaction()
+        .add(
+          R.id.admin_intro_fragment_placeholder,
+          adminIntroFragment,
+          TAG_ADMIN_INTRO_FRAGMENT
+        )
+        .commitNow()
+    }
+  }
+
+  private fun getAdminIntroFragment(): AdminIntroFragment? {
+    return activity.supportFragmentManager.findFragmentByTag(
+      TAG_ADMIN_INTRO_FRAGMENT
+    ) as? AdminIntroFragment
+  }
+}

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

@@ -0,0 +1,50 @@
+package org.oppia.android.app.onboarding
+
+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 org.oppia.android.app.model.AdminIntroFragmentArguments
+import org.oppia.android.util.extensions.getProto
+import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId
+import javax.inject.Inject
+
+/** Fragment that contains the admin intro screen. */
+class AdminIntroFragment : InjectableFragment() {
+
+  @Inject
+  lateinit var adminIntroFragmentPresenter: AdminIntroFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    val profileId = checkNotNull(arguments?.extractCurrentUserProfileId()) {
+      "Expected profileId to be included in the arguments for AdminIntroFragment."
+    }
+
+    val adminIntroFragmentArguments = arguments?.getProto(
+      ADMIN_INTRO_FRAGMENT_ARGS, AdminIntroFragmentArguments.getDefaultInstance()
+    )
+
+    val profileType = checkNotNull(adminIntroFragmentArguments?.profileType) {
+      "Expected AdminIntroFragment to have a profileType argument."
+    }
+
+    val profileNickName = checkNotNull(adminIntroFragmentArguments?.profileNickname) {
+      "Expected AdminIntroFragment to have a profileNickName argument."
+    }
+
+    return adminIntroFragmentPresenter
+      .handleCreateView(inflater, container, profileId, profileType, profileNickName)
+  }
+}