Fix Part of #4938: Introduce Onboarding profile type screen

app/src/main/AndroidManifest.xml

@@ -332,7 +332,6 @@
     <activity
       android:name=".app.testing.ColorBindingAdaptersTestActivity"
       android:theme="@style/OppiaThemeWithoutActionBar" />
-
     <activity
       android:name=".app.onboarding.OnboardingProfileTypeActivity"
       android:label="@string/onboarding_profile_type_activity_title"

app/src/main/java/org/oppia/android/app/databinding/ColorBindingAdapters.java

@@ -7,7 +7,7 @@
 public final class ColorBindingAdapters {
 
   /** Binding adapter for setting the `customBackgroundColor` for a [View]. */
-  @BindingAdapter("app:customBackgroundColor")
+  @BindingAdapter("customBackgroundColor")
   public static void setCustomBackgroundColor(View view, int color) {
     view.setBackgroundColor(color);
   }

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

@@ -14,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
 ) {

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

@@ -9,9 +9,9 @@
     <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"
-      android:layout_marginTop="@dimen/phone_shared_margin_xl"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
@@ -29,95 +29,83 @@
       app:customBackgroundColor="@{@color/component_color_onboarding_profile_type_background_color}"
       app:layout_constraintTop_toBottomOf="@id/profile_type_center_guide" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/profile_type_learner_navigation_container"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/phone_shared_margin_x_small"
-      app:layout_constraintBottom_toTopOf="@id/onboarding_navigation_back"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/profile_type_title">
-
-      <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"
-        app:layout_constraintTop_toTopOf="parent">
+    <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">
+      <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" />
+        <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>
+        <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">
+    <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">
+      <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" />
+        <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>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <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"

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

@@ -10,7 +10,7 @@
       android:id="@+id/profile_type_title"
       style="@style/OnboardingProfileTypeHeaderStyle"
       android:text="@string/onboarding_profile_type_activity_header"
-      app:layout_constraintBottom_toTopOf="@id/profile_type_learner_navigation_container"
+      app:layout_constraintBottom_toTopOf="@id/profile_type_learner_navigation_card"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent" />
 
@@ -28,98 +28,86 @@
       app:customBackgroundColor="@{@color/component_color_onboarding_profile_type_background_color}"
       app:layout_constraintTop_toBottomOf="@id/profile_type_center_guide" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/profile_type_learner_navigation_container"
+    <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="wrap_content"
-      android:layout_marginTop="@dimen/tablet_shared_margin_large"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
+      android:layout_height="0dp"
+      android:layout_marginStart="@dimen/tablet_shared_margin_medium"
+      android:layout_marginEnd="@dimen/tablet_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">
 
-      <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/tablet_shared_margin_medium"
-        android:layout_marginEnd="@dimen/tablet_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"
-        app:layout_constraintTop_toTopOf="parent">
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <ImageView
+          android:id="@+id/profile_type_learner_image"
           android:layout_width="match_parent"
-          android:layout_height="wrap_content">
+          android:layout_height="0dp"
+          android:contentDescription="@string/onboarding_learner_otter_content_description"
+          android:scaleType="centerCrop"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          app:srcCompat="@drawable/learner_otter" />
 
-          <ImageView
-            android:id="@+id/profile_type_learner_image"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:contentDescription="@string/onboarding_learner_otter_content_description"
-            android:scaleType="centerCrop"
-            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:layout_margin="@dimen/tablet_shared_margin_x_small"
+          android:text="@string/onboarding_profile_type_activity_student_text"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@id/profile_type_learner_image" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-          <TextView
-            android:id="@+id/profile_type_learner_text"
-            style="@style/OnboardingProfileTypeTextStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/tablet_shared_margin_x_small"
-            android:text="@string/onboarding_profile_type_activity_student_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            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/tablet_shared_margin_medium"
+      android:layout_marginEnd="@dimen/tablet_shared_margin_medium"
+      android:layout_marginBottom="@dimen/tablet_shared_margin_medium"
+      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">
 
-      <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/tablet_shared_margin_medium"
-        android:layout_marginEnd="@dimen/tablet_shared_margin_medium"
-        android:layout_marginBottom="@dimen/tablet_shared_margin_medium"
-        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">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <ImageView
+          android:id="@+id/profile_type_parent_image"
           android:layout_width="match_parent"
-          android:layout_height="wrap_content">
-
-          <ImageView
-            android:id="@+id/profile_type_parent_image"
-            android:layout_width="match_parent"
-            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" />
+          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:layout_margin="@dimen/tablet_shared_margin_x_small"
-            android:text="@string/onboarding_profile_type_activity_parent_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/profile_type_parent_image" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-      </com.google.android.material.card.MaterialCardView>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+          android:id="@+id/profile_type_parent_text"
+          style="@style/OnboardingProfileTypeTextStyle"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_margin="@dimen/tablet_shared_margin_x_small"
+          android:text="@string/onboarding_profile_type_activity_parent_text"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@id/profile_type_parent_image" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
       android:id="@+id/onboarding_steps_count"