Fix Part of #4938: Introduce Onboarding UI V2 2 of 3

app/BUILD.bazel

@@ -214,6 +214,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt",
     "src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt",
     "src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt",
+    "src/main/java/org/oppia/android/app/onboarding/onboardingv2/CreateLearnerProfileViewModel.kt",
     "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt",
     "src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt",
     "src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt",
@@ -409,9 +410,9 @@ VIEWS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt",
     "src/main/java/org/oppia/android/app/customview/ContinueButtonView.kt",
     "src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt",
+    "src/main/java/org/oppia/android/app/customview/OppiaCurveBackgroundView.kt",
     "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/SurveyOnboardingBackgroundView.kt",
     "src/main/java/org/oppia/android/app/customview/VerticalDashedLineView.kt",
     "src/main/java/org/oppia/android/app/survey/SurveyMultipleChoiceOptionView.kt",
     "src/main/java/org/oppia/android/app/survey/SurveyNpsItemOptionView.kt",

app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
     <meta-data
       android:name="expiration_date"
       android:value="2020-09-01" />
+
     <activity
       android:name=".app.administratorcontrols.AdministratorControlsActivity"
       android:label="@string/administrator_controls_title"
@@ -43,7 +44,7 @@
     <activity
       android:name=".app.administratorcontrols.learneranalytics.ProfileAndDeviceIdActivity"
       android:label="@string/profile_and_device_id_activity_title"
-      android:theme="@style/OppiaThemeWithoutActionBar"/>
+      android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.completedstorylist.CompletedStoryListActivity"
       android:label="@string/completed_story_list_activity_title"
@@ -329,6 +330,18 @@
       android:label="@string/survey_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar"
       android:windowSoftInputMode="adjustNothing" />
+    <activity
+      android:name=".app.onboarding.onboardingv2.OnboardingProfileTypeActivity"
+      android:label="@string/onboarding_profile_type_activity_title"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.onboarding.onboardingv2.OnboardingLearnerIntroActivity"
+      android:label="@string/onboarding_learner_intro_activity_title"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.onboarding.onboardingv2.CreateProfileActivity"
+      android:label="@string/create_profile_activity_title"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
 
     <provider
       android:name="androidx.work.impl.WorkManagerInitializer"

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

@@ -32,6 +32,9 @@ 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.OnboardingActivity
+import org.oppia.android.app.onboarding.onboardingv2.CreateProfileActivity
+import org.oppia.android.app.onboarding.onboardingv2.OnboardingLearnerIntroActivity
+import org.oppia.android.app.onboarding.onboardingv2.OnboardingProfileTypeActivity
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
 import org.oppia.android.app.options.AppLanguageActivity
 import org.oppia.android.app.options.AudioLanguageActivity
@@ -125,6 +128,7 @@ interface ActivityComponentImpl :
     appCompatCheckBoxBindingAdaptersTestActivity:
       AppCompatCheckBoxBindingAdaptersTestActivity
   )
+
   fun inject(appLanguageActivity: AppLanguageActivity)
   fun inject(appVersionActivity: AppVersionActivity)
   fun inject(audioFragmentTestActivity: AudioFragmentTestActivity)
@@ -216,4 +220,7 @@ interface ActivityComponentImpl :
   fun inject(viewEventLogsTestActivity: ViewEventLogsTestActivity)
   fun inject(walkthroughActivity: WalkthroughActivity)
   fun inject(surveyActivity: SurveyActivity)
+  fun inject(onboardingProfileTypeActivity: OnboardingProfileTypeActivity)
+  fun inject(onboardingLearnerIntroActivity: OnboardingLearnerIntroActivity)
+  fun inject(createProfileActivity: CreateProfileActivity)
 }

app/src/main/java/org/oppia/android/app/customview/SurveyOnboardingBackgroundView.kt → app/src/main/java/org/oppia/android/app/customview/OppiaCurveBackgroundView.kt

@@ -1,13 +1,13 @@
 package org.oppia.android.app.customview
 
 import android.content.Context
+import android.content.res.TypedArray
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Path
 import android.util.AttributeSet
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -18,33 +18,38 @@ import org.oppia.android.app.view.ViewComponentImpl
 import javax.inject.Inject
 
 /**
- * CustomView to add a background to [SurveyWelcomeDialogFragment] and [SurveyOutroDialogFragment].
- * Without chaptersFinished and totalChapters values this custom-view cannot be created.
+ * CustomView to add a background to views that require a bezier curve background.
  *
  * Reference: // https://proandroiddev.com/how-i-drew-custom-shapes-in-bottom-bar-c4539d86afd7 and
  * // https://ciechanow.ski/drawing-bezier-curves/
  */
-class SurveyOnboardingBackgroundView : View {
-  @Inject
-  lateinit var resourceHandler: AppLanguageResourceHandler
+class OppiaCurveBackgroundView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr) {
+  /**
+   * Used to retrieve the layout direction that should be used to mirror the direction of the
+   * curve based on locale.
+   */
+  @Inject lateinit var resourceHandler: AppLanguageResourceHandler
 
   private val isRtl by lazy {
     resourceHandler.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL
   }
 
+  private var customBackgroundColor = Color.WHITE // Default color
+
   private lateinit var paint: Paint
   private lateinit var path: Path
   private var strokeWidth = 2f
 
-  constructor(context: Context) : super(context)
-  constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-  constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-    context,
-    attrs,
-    defStyleAttr
-  )
-
   init {
+    val typedArray: TypedArray =
+      context.obtainStyledAttributes(attrs, R.styleable.OppiaCurveBackgroundView)
+    customBackgroundColor =
+      typedArray.getColor(R.styleable.OppiaCurveBackgroundView_customBackgroundColor, Color.WHITE)
+    typedArray.recycle()
     setupCurvePaint()
   }
 
@@ -61,10 +66,10 @@ class SurveyOnboardingBackgroundView : View {
     val width = this.width.toFloat()
     val height = this.height.toFloat()
 
-    val controlPoint1X = width * 0.5f
+    val controlPoint1X = width * 0.55f
     val controlPoint1Y = 0f
 
-    val controlPoint2X = width * 0.5f
+    val controlPoint2X = width * 0.52f
     val controlPoint2Y = height * 0.2f
 
     val controlPoint3X = width * 1f
@@ -91,11 +96,8 @@ class SurveyOnboardingBackgroundView : View {
     paint = Paint(Paint.ANTI_ALIAS_FLAG)
     paint.apply {
       style = Paint.Style.FILL_AND_STROKE
-      strokeWidth = [email protected]
-      color = ContextCompat.getColor(
-        context,
-        R.color.component_color_survey_popup_background_color
-      )
+      strokeWidth = [email protected]
+      color = customBackgroundColor
     }
     setBackgroundColor(Color.TRANSPARENT)
   }

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

@@ -36,6 +36,9 @@ import org.oppia.android.app.notice.GeneralAvailabilityUpgradeNoticeDialogFragme
 import org.oppia.android.app.notice.OptionalAppDeprecationNoticeDialogFragment
 import org.oppia.android.app.notice.OsDeprecationNoticeDialogFragment
 import org.oppia.android.app.onboarding.OnboardingFragment
+import org.oppia.android.app.onboarding.onboardingv2.CreateProfileFragment
+import org.oppia.android.app.onboarding.onboardingv2.OnboardingLearnerIntroFragment
+import org.oppia.android.app.onboarding.onboardingv2.OnboardingProfileTypeFragment
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListFragment
 import org.oppia.android.app.options.AppLanguageFragment
 import org.oppia.android.app.options.AudioLanguageFragment
@@ -194,4 +197,7 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(exitSurveyConfirmationDialogFragment: ExitSurveyConfirmationDialogFragment)
   fun inject(surveyWelcomeDialogFragment: SurveyWelcomeDialogFragment)
   fun inject(surveyOutroDialogFragment: SurveyOutroDialogFragment)
+  fun inject(onboardingProfileTypeFragment: OnboardingProfileTypeFragment)
+  fun inject(onboardingLearnerIntroFragment: OnboardingLearnerIntroFragment)
+  fun inject(createProfileFragment: CreateProfileFragment)
 }

app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.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.util.platformparameter.EnableOnboardingFlowV2
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
+import org.oppia.android.app.onboarding.onboardingv2.OnboardingFragmentPresenter as OnboardingFragmentPresenterV2
 
 /** Fragment that contains an onboarding flow of the app. */
 class OnboardingFragment : InjectableFragment() {
   @Inject
   lateinit var onboardingFragmentPresenter: OnboardingFragmentPresenter
 
+  @Inject
+  lateinit var onboardingFragmentPresenterV2: OnboardingFragmentPresenterV2
+
+  @Inject
+  @field:EnableOnboardingFlowV2
+  lateinit var enableOnboardingFlowV2: PlatformParameterValue<Boolean>
+
   override fun onAttach(context: Context) {
     super.onAttach(context)
     (fragmentComponent as FragmentComponentImpl).inject(this)
@@ -24,6 +34,10 @@ class OnboardingFragment : InjectableFragment() {
     container: ViewGroup?,
     savedInstanceState: Bundle?
   ): View? {
-    return onboardingFragmentPresenter.handleCreateView(inflater, container)
+    return if (enableOnboardingFlowV2.value) {
+      onboardingFragmentPresenterV2.handleCreateView(inflater, container)
+    } else {
+      onboardingFragmentPresenter.handleCreateView(inflater, container)
+    }
   }
 }

app/src/main/java/org/oppia/android/app/onboarding/onboardingv2/AudioLanguageFragmentPresenter.kt

@@ -0,0 +1,123 @@
+package org.oppia.android.app.onboarding.onboardingv2
+
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.google.android.material.appbar.AppBarLayout
+import org.oppia.android.R
+import org.oppia.android.app.home.HomeActivity
+import org.oppia.android.app.model.AudioLanguage
+import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.databinding.AudioLanguageSelectionFragmentBinding
+import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.profile.ProfileManagementController
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProviders.Companion.toLiveData
+import javax.inject.Inject
+
+/** The presenter for [AudioLanguageFragment] V2. */
+class AudioLanguageFragmentPresenter @Inject constructor(
+  private val fragment: Fragment,
+  private val activity: AppCompatActivity,
+  private val appLanguageResourceHandler: AppLanguageResourceHandler,
+  private val profileManagementController: ProfileManagementController,
+  private val oppiaLogger: OppiaLogger
+) {
+  private lateinit var binding: AudioLanguageSelectionFragmentBinding
+  private val orientation = Resources.getSystem().configuration.orientation
+
+  /**
+   * Returns a newly inflated view to render the fragment with the specified [audioLanguage] as the
+   * initial selected language.
+   */
+  fun handleCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?
+  ): View {
+
+    activity.findViewById<AppBarLayout>(R.id.reading_list_app_bar_layout).visibility = View.GONE
+
+    binding = AudioLanguageSelectionFragmentBinding.inflate(
+      inflater,
+      container,
+      /* attachToRoot= */ false
+    )
+    binding.lifecycleOwner = fragment
+
+    binding.audioLanguageText.text = appLanguageResourceHandler.getStringInLocaleWithWrapping(
+      R.string.audio_language_fragment_text,
+      appLanguageResourceHandler.getStringInLocale(R.string.app_name)
+    )
+
+    binding.audioLanguageDropdown.adapter = ArrayAdapter(
+      fragment.requireContext(),
+      R.layout.onboarding_language_dropdown_item,
+      R.id.onboarding_language_text_view,
+      getAudioLanguageList()
+    )
+
+    val currentUserProfileId = retrieveNewProfileId()
+
+    binding.onboardingNavigationContinue.setOnClickListener {
+      val intent =
+        HomeActivity.createHomeActivity(fragment.requireContext(), currentUserProfileId.internalId)
+      fragment.startActivity(intent)
+      fragment.activity?.finish()
+    }
+
+    binding.onboardingNavigationBack.setOnClickListener {
+      activity.finish()
+    }
+
+    binding.onboardingStepsCount?.visibility =
+      if (orientation == Configuration.ORIENTATION_PORTRAIT) View.VISIBLE else View.GONE
+
+    return binding.root
+  }
+
+  private fun retrieveNewProfileId(): ProfileId {
+    var profileId: ProfileId = ProfileId.getDefaultInstance()
+    profileManagementController.getProfiles().toLiveData().observe(
+      fragment,
+      { profilesResult ->
+        when (profilesResult) {
+          is AsyncResult.Failure -> {
+            oppiaLogger.e(
+              "AudioLanguageFragmentPresenter",
+              "Failed to retrieve the list of profiles",
+              profilesResult.error
+            )
+          }
+          is AsyncResult.Pending -> {}
+          is AsyncResult.Success -> {
+            val sortedProfileList = profilesResult.value.sortedBy { it.id.internalId }
+            profileId = sortedProfileList.last().id
+          }
+        }
+      }
+    )
+    return profileId
+  }
+
+  private fun getAudioLanguageList(): List<String> {
+    return AudioLanguage.values()
+      .filter { it.isValid() }
+      .map { audioLanguage ->
+        appLanguageResourceHandler.computeLocalizedDisplayName(audioLanguage)
+      }
+  }
+
+  private fun AudioLanguage.isValid(): Boolean {
+    return when (this) {
+      AudioLanguage.UNRECOGNIZED, AudioLanguage.AUDIO_LANGUAGE_UNSPECIFIED,
+      AudioLanguage.NO_AUDIO -> false
+      else -> true
+    }
+  }
+}

app/src/main/java/org/oppia/android/app/onboarding/onboardingv2/CreateLearnerProfileViewModel.kt

@@ -0,0 +1,21 @@
+package org.oppia.android.app.onboarding.onboardingv2
+
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.view.View
+import androidx.databinding.ObservableField
+import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.viewmodel.ObservableViewModel
+import javax.inject.Inject
+
+/** The ViewModel for [CreateProfileFragment]. */
+@FragmentScope
+class CreateLearnerProfileViewModel @Inject constructor() : ObservableViewModel() {
+  private val orientation = Resources.getSystem().configuration.orientation
+
+  /** ObservableField that tracks whether a nickname has been entered. */
+  val hasError = ObservableField(false)
+
+  val onboardingStepsCount =
+    if (orientation == Configuration.ORIENTATION_PORTRAIT) View.VISIBLE else View.GONE
+}