Fix Part of #4938: Introduce Onboarding profile type screen

app/src/main/AndroidManifest.xml

@@ -332,6 +332,10 @@
     <activity
       android:name=".app.testing.ColorBindingAdaptersTestActivity"
       android:theme="@style/OppiaThemeWithoutActionBar" />
+    <activity
+      android:name=".app.onboarding.OnboardingProfileTypeActivity"
+      android:label="@string/onboarding_profile_type_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,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.onboarding.OnboardingProfileTypeActivity
 import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity
 import org.oppia.android.app.options.AppLanguageActivity
 import org.oppia.android.app.options.AudioLanguageActivity
@@ -218,4 +219,5 @@ interface ActivityComponentImpl :
   fun inject(walkthroughActivity: WalkthroughActivity)
   fun inject(surveyActivity: SurveyActivity)
   fun inject(colorBindingAdaptersTestActivity: ColorBindingAdaptersTestActivity)
+  fun inject(onboardingProfileTypeActivity: OnboardingProfileTypeActivity)
 }

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

@@ -3,6 +3,7 @@ package org.oppia.android.app.onboarding
 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
@@ -13,6 +14,7 @@ import javax.inject.Inject
 /** The presenter for [OnboardingFragment]. */
 @FragmentScope
 class OnboardingFragmentPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val appLanguageResourceHandler: AppLanguageResourceHandler
 ) {
@@ -33,6 +35,12 @@ class OnboardingFragmentPresenter @Inject constructor(
         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/onboarding/OnboardingProfileTypeActivity.kt

@@ -0,0 +1,32 @@
+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.ScreenName.ONBOARDING_PROFILE_TYPE_ACTIVITY
+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(ONBOARDING_PROFILE_TYPE_ACTIVITY)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,41 @@
+package org.oppia.android.app.onboarding
+
+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/onboarding/OnboardingProfileTypeFragment.kt

@@ -0,0 +1,29 @@
+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 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)
+  }
+}

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

@@ -0,0 +1,41 @@
+package org.oppia.android.app.onboarding
+
+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.app.profile.ProfileChooserActivity
+import org.oppia.android.databinding.OnboardingProfileTypeFragmentBinding
+import javax.inject.Inject
+
+/** The presenter for [OnboardingProfileTypeFragment]. */
+class OnboardingProfileTypeFragmentPresenter @Inject constructor(
+  private val fragment: Fragment,
+  private val activity: AppCompatActivity
+) {
+  private lateinit var binding: OnboardingProfileTypeFragmentBinding
+
+  /** Handle creation and binding of the  OnboardingProfileTypeFragment layout. */
+  fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View {
+    binding = OnboardingProfileTypeFragmentBinding.inflate(
+      inflater,
+      container,
+      /* attachToRoot= */ false
+    )
+
+    binding.apply {
+      lifecycleOwner = fragment
+
+      profileTypeSupervisorNavigationCard.setOnClickListener {
+        val intent = ProfileChooserActivity.createProfileChooserActivity(activity)
+        fragment.startActivity(intent)
+      }
+
+      onboardingNavigationBack.setOnClickListener {
+        activity.finish()
+      }
+    }
+    return binding.root
+  }
+}

app/src/main/res/drawable/onboarding_back_button_white_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <corners android:radius="4dp" />
+  <solid android:color="@color/component_color_onboarding_shared_white_color" />
+</shape>

app/src/main/res/layout-land/onboarding_profile_type_fragment.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+      android:id="@+id/profile_type_title"
+      style="@style/OnboardingProfileTypeHeaderStyleLandscape"
+      android:layout_marginTop="@dimen/phone_shared_margin_xl"
+      android:text="@string/onboarding_profile_type_activity_header"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/profile_type_center_guide"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      app:layout_constraintGuide_percent="0.35" />
+
+    <org.oppia.android.app.customview.OppiaCurveBackgroundView
+      android:id="@+id/onboarding_profile_type_background"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      app:customBackgroundColor="@{@color/component_color_onboarding_profile_type_background_color}"
+      app:layout_constraintTop_toBottomOf="@id/profile_type_center_guide" />
+
+    <com.google.android.material.card.MaterialCardView
+      android:id="@+id/profile_type_learner_navigation_card"
+      style="@style/OnboardingProfileTypeNavigationCardStyle"
+      android:layout_width="wrap_content"
+      android:layout_height="0dp"
+      android:layout_marginStart="@dimen/phone_shared_margin_medium"
+      android:layout_marginEnd="@dimen/phone_shared_margin_medium"
+      app:layout_constraintBottom_toBottomOf="@id/profile_type_supervisor_navigation_card"
+      app:layout_constraintEnd_toStartOf="@id/profile_type_supervisor_navigation_card"
+      app:layout_constraintHorizontal_chainStyle="packed"
+      app:layout_constraintStart_toStartOf="parent">
+
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+          android:id="@+id/profile_type_learner_image"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:contentDescription="@string/onboarding_learner_otter_content_description"
+          android:scaleType="centerCrop"
+          app:layout_constraintBottom_toTopOf="@id/profile_type_learner_text"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          app:srcCompat="@drawable/learner_otter" />
+
+        <TextView
+          android:id="@+id/profile_type_learner_text"
+          style="@style/OnboardingProfileTypeTextStyle"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:text="@string/onboarding_profile_type_activity_student_text"
+          app:layout_constraintEnd_toEndOf="@id/profile_type_learner_image"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@id/profile_type_learner_image" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+      android:id="@+id/profile_type_supervisor_navigation_card"
+      style="@style/OnboardingProfileTypeNavigationCardStyle"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="@dimen/phone_shared_margin_medium"
+      android:layout_marginEnd="@dimen/phone_shared_margin_medium"
+      android:layout_marginBottom="@dimen/phone_shared_margin_x_small"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toEndOf="@id/profile_type_learner_navigation_card"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+          android:id="@+id/profile_type_parent_image"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:contentDescription="@string/onboarding_parent_otter_content_description"
+          android:scaleType="centerCrop"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          app:srcCompat="@drawable/parent_teacher_otter" />
+
+        <TextView
+          android:id="@+id/profile_type_parent_text"
+          style="@style/OnboardingProfileTypeTextStyle"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:text="@string/onboarding_profile_type_activity_parent_text"
+          app:layout_constraintEnd_toEndOf="@id/profile_type_parent_image"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@id/profile_type_parent_image" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <Button
+      android:id="@+id/onboarding_navigation_back"
+      style="@style/OnboardingNavigationSecondaryButton"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="@dimen/phone_shared_margin_large"
+      android:layout_marginBottom="@dimen/phone_shared_margin_medium"
+      android:background="@drawable/onboarding_back_button_white_background"
+      android:text="@string/onboarding_navigation_back"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>