Fix Part of #4938: Introduce Onboarding profile type screen

app/BUILD.bazel

@@ -409,9 +409,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

@@ -330,6 +330,11 @@
       android:theme="@style/OppiaThemeWithoutActionBar"
       android:windowSoftInputMode="adjustNothing" />
 
+    <activity
+      android:name=".app.onboardingv2.OnboardingProfileTypeActivity"
+      android:label="@string/onboarding_profile_type_activity_title"
+      android:theme="@style/OppiaThemeWithoutActionBar" />
+
     <provider
       android:name="androidx.work.impl.WorkManagerInitializer"
       android:authorities="${applicationId}.workmanager-init"

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

@@ -32,6 +32,7 @@ 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.onboardingv2.OnboardingProfileTypeActivity
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
 import org.oppia.android.app.options.AppLanguageActivity
 import org.oppia.android.app.options.AudioLanguageActivity
@@ -216,4 +217,5 @@ interface ActivityComponentImpl :
   fun inject(viewEventLogsTestActivity: ViewEventLogsTestActivity)
   fun inject(walkthroughActivity: WalkthroughActivity)
   fun inject(surveyActivity: SurveyActivity)
+  fun inject(onboardingProfileTypeActivity: OnboardingProfileTypeActivity)
 }

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,15 @@
 package org.oppia.android.app.customview
 
 import android.content.Context
+import android.content.res.Configuration
+import android.content.res.Resources
+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 +20,40 @@ 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 val orientation = Resources.getSystem().configuration.orientation
+
+  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,17 +70,37 @@ class SurveyOnboardingBackgroundView : View {
     val width = this.width.toFloat()
     val height = this.height.toFloat()
 
-    val controlPoint1X = width * 0.5f
-    val controlPoint1Y = 0f
-
-    val controlPoint2X = width * 0.5f
-    val controlPoint2Y = height * 0.2f
-
-    val controlPoint3X = width * 1f
-    val controlPoint3Y = height * 0.1f
+    val controlPoint1X: Float
+    val controlPoint1Y: Float
+
+    val controlPoint2X: Float
+    val controlPoint2Y: Float
+
+    val controlPoint3X: Float
+    val controlPoint3Y: Float
+
+    if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+      controlPoint1X = width * 0.55f
+      controlPoint1Y = 0f
+      controlPoint2X = width * 0.52f
+      controlPoint2Y = height * 0.2f
+      controlPoint3X = width * 1f
+      controlPoint3Y = height * 0.1f
+    } else {
+      controlPoint1X = width * 0.40f
+      controlPoint1Y = 0f
+      controlPoint2X = width * 0.60f
+      controlPoint2Y = height * 0.40f
+      controlPoint3X = width * 1f
+      controlPoint3Y = height * 0.2f
+    }
 
     path.reset()
-    path.moveTo(0f, height * 0.1f)
+    if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+      path.moveTo(0f, height * 0.10f)
+    } else {
+      path.moveTo(0f, height * 0.30f)
+    }
     path.cubicTo(
       controlPoint1X,
       controlPoint1Y,
@@ -91,11 +120,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,7 @@ 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.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 +195,5 @@ interface FragmentComponentImpl : FragmentComponent, ViewComponentBuilderInjecto
   fun inject(exitSurveyConfirmationDialogFragment: ExitSurveyConfirmationDialogFragment)
   fun inject(surveyWelcomeDialogFragment: SurveyWelcomeDialogFragment)
   fun inject(surveyOutroDialogFragment: SurveyOutroDialogFragment)
+  fun inject(onboardingProfileTypeFragment: OnboardingProfileTypeFragment)
 }

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.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/onboardingv2/OnboardingFragmentPresenter.kt

@@ -0,0 +1,48 @@
+package org.oppia.android.app.onboardingv2
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import org.oppia.android.R
+import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.databinding.OnboardingAppLanguageSelectionFragmentBinding
+import javax.inject.Inject
+
+/** The presenter for [OnboardingFragment] V2. */
+@FragmentScope
+class OnboardingFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  private val fragment: Fragment,
+  private val appLanguageResourceHandler: AppLanguageResourceHandler
+) {
+  private lateinit var binding: OnboardingAppLanguageSelectionFragmentBinding
+
+  /** Handle creation and binding of the [OnboardingFragment] V2 layout. */
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View {
+    binding = OnboardingAppLanguageSelectionFragmentBinding.inflate(
+      inflater,
+      container,
+      /* attachToRoot= */ false
+    )
+
+    binding.apply {
+      lifecycleOwner = fragment
+
+      onboardingLanguageTitle.text = appLanguageResourceHandler.getStringInLocaleWithWrapping(
+        R.string.onboarding_language_activity_title,
+        appLanguageResourceHandler.getStringInLocale(R.string.app_name)
+      )
+
+      onboardingLanguageLetsGoButton.setOnClickListener {
+        val intent =
+          OnboardingProfileTypeActivity.createOnboardingProfileTypeActivityIntent(activity)
+        fragment.startActivity(intent)
+      }
+    }
+
+    return binding.root
+  }
+}

app/src/main/java/org/oppia/android/app/onboardingv2/OnboardingProfileTypeActivity.kt

@@ -0,0 +1,32 @@
+package org.oppia.android.app.onboardingv2
+
+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.ScreenName
+import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
+import javax.inject.Inject
+
+/** The activity for showing the profile type selection screen. */
+class OnboardingProfileTypeActivity : InjectableAutoLocalizedAppCompatActivity() {
+  @Inject
+  lateinit var onboardingProfileTypeActivityPresenter: OnboardingProfileTypeActivityPresenter
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    (activityComponent as ActivityComponentImpl).inject(this)
+
+    onboardingProfileTypeActivityPresenter.handleOnCreate()
+  }
+
+  companion object {
+    /** Returns a new [Intent] open a [OnboardingProfileTypeActivity] with the specified params. */
+    fun createOnboardingProfileTypeActivityIntent(context: Context): Intent {
+      return Intent(context, OnboardingProfileTypeActivity::class.java).apply {
+        decorateWithScreenName(ScreenName.ONBOARDING_PROFILE_TYPE_ACTIVITY)
+      }
+    }
+  }
+}

app/src/main/java/org/oppia/android/app/onboardingv2/OnboardingProfileTypeActivityPresenter.kt

@@ -0,0 +1,42 @@
+package org.oppia.android.app.onboardingv2
+
+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.databinding.OnboardingProfileTypeActivityBinding
+import javax.inject.Inject
+
+private const val TAG_PROFILE_TYPE_FRAGMENT = "TAG_PROFILE_TYPE_FRAGMENT"
+
+/** The Presenter for [OnboardingProfileTypeActivity]. */
+@ActivityScope
+class OnboardingProfileTypeActivityPresenter @Inject constructor(
+  private val activity: AppCompatActivity
+) {
+  private lateinit var binding: OnboardingProfileTypeActivityBinding
+
+  /** Handle creation and binding of the  OnboardingProfileTypeActivity layout. */
+  fun handleOnCreate() {
+    binding = DataBindingUtil.setContentView(activity, R.layout.onboarding_profile_type_activity)
+    binding.apply {
+      lifecycleOwner = activity
+    }
+
+    if (getOnboardingProfileTypeFragment() == null) {
+      val onboardingProfileTypeFragment = OnboardingProfileTypeFragment()
+      activity.supportFragmentManager.beginTransaction().add(
+        R.id.profile_type_fragment_placeholder,
+        onboardingProfileTypeFragment,
+        TAG_PROFILE_TYPE_FRAGMENT
+      )
+        .commitNow()
+    }
+  }
+
+  private fun getOnboardingProfileTypeFragment(): OnboardingProfileTypeFragment? {
+    return activity.supportFragmentManager.findFragmentByTag(
+      TAG_PROFILE_TYPE_FRAGMENT
+    ) as? OnboardingProfileTypeFragment
+  }
+}

app/src/main/java/org/oppia/android/app/onboardingv2/OnboardingProfileTypeFragment.kt

@@ -0,0 +1,29 @@
+package org.oppia.android.app.onboardingv2
+
+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 profile type selection flow of the app. */
+class OnboardingProfileTypeFragment : InjectableFragment() {
+  @Inject
+  lateinit var onboardingProfileTypeFragmentPresenter: OnboardingProfileTypeFragmentPresenter
+
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    (fragmentComponent as FragmentComponentImpl).inject(this)
+  }
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View? {
+    return onboardingProfileTypeFragmentPresenter.handleCreateView(inflater, container)
+  }
+}