Fix #4072 and Fix Part of #4938: Revised profile chooser UI

app/BUILD.bazel

@@ -146,6 +146,7 @@ LISTENERS = [
     "src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt",
     "src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt",
     "src/main/java/org/oppia/android/app/policies/RouteToPoliciesListener.kt",
+    "src/main/java/org/oppia/android/app/profile/ProfileClickListener.kt",
     "src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt",
     "src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt",
     "src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt",
@@ -233,6 +234,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt",
     "src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt",
     "src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt",
+    "src/main/java/org/oppia/android/app/profile/ProfileItemViewModel.kt",
     "src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt",
     "src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt",
     "src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt",
@@ -413,6 +415,7 @@ VIEWS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt",
     "src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt",
     "src/main/java/org/oppia/android/app/customview/VerticalDashedLineView.kt",
+    "src/main/java/org/oppia/android/app/profile/ProfileListView.kt",
     "src/main/java/org/oppia/android/app/survey/SurveyMultipleChoiceOptionView.kt",
     "src/main/java/org/oppia/android/app/survey/SurveyNpsItemOptionView.kt",
     "src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt",

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

@@ -169,6 +169,7 @@ class CreateProfileFragmentPresenter @Inject constructor(
 
             val params = IntroActivityParams.newBuilder()
               .setProfileNickname(profileName)
+              .setParentScreen(IntroActivityParams.ParentScreen.CREATE_PROFILE_SCREEN)
               .build()
 
             val intent =

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

@@ -21,12 +21,14 @@ class IntroActivity : InjectableAutoLocalizedAppCompatActivity() {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
 
-    val profileNickname =
-      intent.getProtoExtra(PARAMS_KEY, IntroActivityParams.getDefaultInstance()).profileNickname
+    val activityParams = intent.getProtoExtra(PARAMS_KEY, IntroActivityParams.getDefaultInstance())
+    val profileNickname = activityParams.profileNickname
 
     val profileId = intent.extractCurrentUserProfileId()
 
-    onboardingLearnerIntroActivityPresenter.handleOnCreate(profileNickname, profileId)
+    val parentScreen = activityParams.parentScreen
+
+    onboardingLearnerIntroActivityPresenter.handleOnCreate(profileNickname, profileId, parentScreen)
   }
 
   companion object {

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

@@ -1,22 +1,16 @@
 package org.oppia.android.app.onboarding
 
-import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
-import org.oppia.android.app.model.IntroFragmentArguments
+import org.oppia.android.app.model.IntroActivityParams
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.databinding.IntroActivityBinding
-import org.oppia.android.util.extensions.putProto
-import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
 import javax.inject.Inject
 
 private const val TAG_LEARNER_INTRO_FRAGMENT = "TAG_INTRO_FRAGMENT"
 
-/** Argument key for bundling the profile nickname. */
-const val PROFILE_NICKNAME_ARGUMENT_KEY = "IntroFragment.Arguments"
-
 /** The Presenter for [IntroActivity]. */
 @ActivityScope
 class IntroActivityPresenter @Inject constructor(
@@ -25,22 +19,16 @@ class IntroActivityPresenter @Inject constructor(
   private lateinit var binding: IntroActivityBinding
 
   /** Handle creation and binding of the [IntroActivity] layout. */
-  fun handleOnCreate(profileNickname: String, profileId: ProfileId) {
+  fun handleOnCreate(
+    profileNickname: String,
+    profileId: ProfileId,
+    parentScreen: IntroActivityParams.ParentScreen
+  ) {
     binding = DataBindingUtil.setContentView(activity, R.layout.intro_activity)
     binding.lifecycleOwner = activity
 
     if (getIntroFragment() == null) {
-      val introFragment = IntroFragment()
-
-      val argumentsProto =
-        IntroFragmentArguments.newBuilder().setProfileNickname(profileNickname).build()
-
-      val args = Bundle().apply {
-        decorateWithUserProfileId(profileId)
-        putProto(PROFILE_NICKNAME_ARGUMENT_KEY, argumentsProto)
-      }
-
-      introFragment.arguments = args
+      val introFragment = IntroFragment.newInstance(profileNickname, profileId, parentScreen)
 
       activity.supportFragmentManager.beginTransaction().add(
         R.id.learner_intro_fragment_placeholder,

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

@@ -7,8 +7,12 @@ 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.IntroActivityParams
 import org.oppia.android.app.model.IntroFragmentArguments
+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
 
@@ -27,15 +31,19 @@ class IntroFragment : InjectableFragment() {
     container: ViewGroup?,
     savedInstanceState: Bundle?
   ): View? {
-    val profileNickname =
+    val args =
       checkNotNull(
         arguments?.getProto(
-          PROFILE_NICKNAME_ARGUMENT_KEY,
+          INTRO_FRAGMENT_ARGUMENT_KEY,
           IntroFragmentArguments.getDefaultInstance()
         )
       ) {
-        "Expected profileNickname to be included in the arguments for IntroFragment."
-      }.profileNickname
+        "Expected IntroFragment to have arguments."
+      }
+
+    val profileNickname = args.profileNickname
+
+    val parentScreen = args.parentScreen
 
     val profileId =
       checkNotNull(arguments?.extractCurrentUserProfileId()) {
@@ -46,7 +54,38 @@ class IntroFragment : InjectableFragment() {
       inflater,
       container,
       profileNickname,
-      profileId
+      profileId,
+      parentScreen
     )
   }
+
+  companion object {
+    /** Argument key for bundling arguments into [IntroFragment] . */
+    const val INTRO_FRAGMENT_ARGUMENT_KEY = "IntroFragment.Arguments"
+
+    /**
+     * Creates a new instance of a IntroFragment.
+     *
+     * @param profileNickname the nickname associated with this learner profile
+     * @param parentScreen the parent screen opening this [IntroFragment] instance
+     * @return a new instance of [IntroFragment]
+     */
+    fun newInstance(
+      profileNickname: String,
+      profileId: ProfileId,
+      parentScreen: IntroActivityParams.ParentScreen
+    ): IntroFragment {
+      val argumentsProto =
+        IntroFragmentArguments.newBuilder()
+          .setProfileNickname(profileNickname)
+          .setParentScreen(parentScreen)
+          .build()
+      return IntroFragment().apply {
+        arguments = Bundle().apply {
+          putProto(INTRO_FRAGMENT_ARGUMENT_KEY, argumentsProto)
+          decorateWithUserProfileId(profileId)
+        }
+      }
+    }
+  }
 }

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

@@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import org.oppia.android.R
 import org.oppia.android.app.model.AudioLanguage
+import org.oppia.android.app.model.IntroActivityParams
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.options.AudioLanguageActivity
 import org.oppia.android.app.translation.AppLanguageResourceHandler
@@ -29,7 +30,8 @@ class IntroFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     profileNickname: String,
-    profileId: ProfileId
+    profileId: ProfileId,
+    parentScreen: IntroActivityParams.ParentScreen
   ): View {
     binding = LearnerIntroFragmentBinding.inflate(
       inflater,
@@ -43,6 +45,10 @@ class IntroFragmentPresenter @Inject constructor(
 
     profileManagementController.markProfileOnboardingStarted(profileId)
 
+    if (parentScreen == IntroActivityParams.ParentScreen.PROFILE_CHOOSER_SCREEN) {
+      binding.onboardingStepsCount?.visibility = View.GONE
+    }
+
     binding.onboardingNavigationBack.setOnClickListener {
       activity.finish()
     }

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

@@ -7,13 +7,23 @@ 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.Profile
+import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
 
 /** Fragment that allows user to select a profile or create new ones. */
-class ProfileChooserFragment : InjectableFragment(), RouteToAdminPinListener {
+class ProfileChooserFragment : InjectableFragment(), RouteToAdminPinListener, ProfileClickListener {
+  @Inject
+  lateinit var profileChooserFragmentPresenterV1: ProfileChooserFragmentPresenterV1
+
   @Inject
   lateinit var profileChooserFragmentPresenter: ProfileChooserFragmentPresenter
 
+  @Inject
+  @field:EnableOnboardingFlowV2
+  lateinit var enableOnboardingFlowV2: PlatformParameterValue<Boolean>
+
   override fun onAttach(context: Context) {
     super.onAttach(context)
     (fragmentComponent as FragmentComponentImpl).inject(this)
@@ -24,10 +34,22 @@ class ProfileChooserFragment : InjectableFragment(), RouteToAdminPinListener {
     container: ViewGroup?,
     savedInstanceState: Bundle?
   ): View? {
-    return profileChooserFragmentPresenter.handleCreateView(inflater, container)
+    return if (enableOnboardingFlowV2.value) {
+      profileChooserFragmentPresenter.handleCreateView(inflater, container)
+    } else {
+      profileChooserFragmentPresenterV1.handleCreateView(inflater, container)
+    }
   }
 
   override fun routeToAdminPin() {
-    profileChooserFragmentPresenter.routeToAdminPin()
+    if (enableOnboardingFlowV2.value) {
+      profileChooserFragmentPresenter.routeToAdminPin()
+    } else {
+      profileChooserFragmentPresenterV1.routeToAdminPin()
+    }
+  }
+
+  override fun onProfileClicked(profile: Profile) {
+    profileChooserFragmentPresenter.onProfileClick(profile)
   }
 }