From b75c9ea525d46ed2d11856697bccda4119bfd669 Mon Sep 17 00:00:00 2001
From: ishant904 <52167192+ishant904@users.noreply.github.com>
Date: Tue, 12 Apr 2022 21:45:38 +0530
Subject: [PATCH] Fix #3585: Merge topic_practice_header_view.xml into single
 xml file. (#4159)

* Deleted topic_practice_header landscape for mobile and tablet

* added margin end in topic_practice_header for rtl support

* Adding constraint layout as parent in phone xml to match the tablet layout

* Adding constraint layout as parent in phone xml to match the tablet layout

* extract dimens resources in phone and tablet layout

* extract layout width from phone and tablet layout

* merge topic_practice_header_view into one xml

Co-authored-by: ishant904 <ishant.tiwari904@gmail.com>
---
 .../topic_practice_header_view.xml            | 36 ---------------
 .../topic_practice_header_view.xml            | 40 -----------------
 .../topic_practice_header_view.xml            | 40 -----------------
 .../res/layout/topic_practice_header_view.xml | 44 +++++++++++--------
 app/src/main/res/values-land/dimens.xml       |  6 +++
 .../main/res/values-sw600dp-land/dimens.xml   | 12 +++++
 .../main/res/values-sw600dp-port/dimens.xml   | 12 +++++
 app/src/main/res/values/dimens.xml            |  8 ++++
 8 files changed, 64 insertions(+), 134 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/topic_practice_header_view.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/topic_practice_header_view.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/topic_practice_header_view.xml

diff --git a/app/src/main/res/layout-land/topic_practice_header_view.xml b/app/src/main/res/layout-land/topic_practice_header_view.xml
deleted file mode 100644
index 3e3e7c76fbf..00000000000
--- a/app/src/main/res/layout-land/topic_practice_header_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="96dp"
-    android:layout_marginTop="32dp"
-    android:layout_marginEnd="96dp"
-    android:paddingBottom="24dp">
-
-    <TextView
-      android:id="@+id/master_skills_text_view"
-      style="@style/Heading2ViewStart"
-      android:text="@string/topic_practice_master_these_skills"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/skills_description_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_marginTop="4dp"
-      android:text="@string/topic_practice_skills_description"
-      android:textColor="@color/oppia_secondary_text"
-      app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
-      app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/topic_practice_header_view.xml b/app/src/main/res/layout-sw600dp-land/topic_practice_header_view.xml
deleted file mode 100644
index b904eba394a..00000000000
--- a/app/src/main/res/layout-sw600dp-land/topic_practice_header_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" />
-  </data>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="32dp"
-    android:paddingBottom="20dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:layout_width="360dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center">
-
-      <TextView
-        android:id="@+id/master_skills_text_view"
-        style="@style/Heading2ViewStart"
-        android:text="@string/topic_practice_master_these_skills"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-      <TextView
-        android:id="@+id/skills_description_text_view"
-        style="@style/Subtitle1ViewStart"
-        android:layout_marginTop="4dp"
-        android:text="@string/topic_practice_skills_description"
-        android:textColor="@color/oppia_secondary_text"
-        app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
-        app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </FrameLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/topic_practice_header_view.xml b/app/src/main/res/layout-sw600dp-port/topic_practice_header_view.xml
deleted file mode 100644
index b904eba394a..00000000000
--- a/app/src/main/res/layout-sw600dp-port/topic_practice_header_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" />
-  </data>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="32dp"
-    android:paddingBottom="20dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:layout_width="360dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center">
-
-      <TextView
-        android:id="@+id/master_skills_text_view"
-        style="@style/Heading2ViewStart"
-        android:text="@string/topic_practice_master_these_skills"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-      <TextView
-        android:id="@+id/skills_description_text_view"
-        style="@style/Subtitle1ViewStart"
-        android:layout_marginTop="4dp"
-        android:text="@string/topic_practice_skills_description"
-        android:textColor="@color/oppia_secondary_text"
-        app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
-        app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </FrameLayout>
-</layout>
diff --git a/app/src/main/res/layout/topic_practice_header_view.xml b/app/src/main/res/layout/topic_practice_header_view.xml
index 5abb7b53db8..419b8c469d1 100644
--- a/app/src/main/res/layout/topic_practice_header_view.xml
+++ b/app/src/main/res/layout/topic_practice_header_view.xml
@@ -12,26 +12,34 @@
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="32dp"
-    android:layout_marginTop="32dp"
-    android:layout_marginEnd="24dp"
-    android:paddingBottom="24dp">
+    android:layout_marginTop="@dimen/topic_practice_header_parent_constraint_layout_margin_top"
+    android:paddingBottom="@dimen/topic_practice_header_parent_constraint_layout_padding_bottom">
 
-    <TextView
-      android:id="@+id/master_skills_text_view"
-      style="@style/Heading2ViewStart"
-      android:layout_marginEnd="88dp"
-      android:text="@string/topic_practice_master_these_skills"
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="@dimen/topic_practice_header_child_constraint_layout_width"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="@dimen/topic_practice_header_child_constraint_layout_margin_start"
+      android:layout_marginEnd="@dimen/topic_practice_header_child_constraint_layout_margin_end"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
+      app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-      android:id="@+id/skills_description_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_marginTop="4dp"
-      android:text="@string/topic_practice_skills_description"
-      android:textColor="@color/oppia_secondary_text"
-      app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
-      app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
+      <TextView
+        android:id="@+id/master_skills_text_view"
+        style="@style/Heading2ViewStart"
+        android:layout_marginEnd="@dimen/master_skills_text_view_margin_end"
+        android:text="@string/topic_practice_master_these_skills"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+      <TextView
+        android:id="@+id/skills_description_text_view"
+        style="@style/Subtitle1ViewStart"
+        android:layout_marginTop="4dp"
+        android:text="@string/topic_practice_skills_description"
+        android:textColor="@color/oppia_secondary_text"
+        app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
+        app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 52554e5370b..f5f409cedb1 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -431,6 +431,12 @@
   <dimen name="topic_lessons_title_margin_start">100dp</dimen>
   <dimen name="topic_lessons_title_margin_end">100dp</dimen>
 
+  <!-- TopicPracticeHeader -->
+  <dimen name="topic_practice_header_child_constraint_layout_margin_start">96dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_margin_end">96dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">24dp</dimen>
+
   <!-- ProfileProgressRecentlyPlayedStoryCard -->
   <dimen name="profile_progress_recently_played_story_card_layout_margin_start">16dp</dimen>
   <dimen name="profile_progress_recently_played_story_card_layout_margin_end">16dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index eeb761e161c..c817c64db5e 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -443,6 +443,18 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
 
+  <!-- TopicPracticeHeader -->
+  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">20dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_margin_start">0dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_margin_end">0dp</dimen>
+  <dimen name="master_skills_text_view_margin_end">0dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_width">360dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
+
   <!-- OptionsStoryTextSize -->
   <dimen name="option_story_text_size_padding_start">16dp</dimen>
   <dimen name="option_story_text_size_padding_end">16dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 39ff2d3863a..c2167fa6646 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -442,6 +442,18 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
 
+  <!-- TopicPracticeHeader -->
+  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">20dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_margin_start">0dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_margin_end">0dp</dimen>
+  <dimen name="master_skills_text_view_margin_end">0dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_width">360dp</dimen>
+
+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
+
   <!-- OptionsStoryTextSize -->
   <dimen name="option_story_text_size_padding_start">16dp</dimen>
   <dimen name="option_story_text_size_padding_end">16dp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 117fa5271d3..3deaa804156 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -632,6 +632,14 @@
   <dimen name="topic_lessons_title_margin_top">32dp</dimen>
   <dimen name="topic_lessons_title_margin_end">32dp</dimen>
 
+  <!-- TopicPracticeHeader -->
+  <dimen name="topic_practice_header_child_constraint_layout_margin_start">32dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_margin_end">24dp</dimen>
+  <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">24dp</dimen>
+  <dimen name="master_skills_text_view_margin_end">88dp</dimen>
+  <dimen name="topic_practice_header_child_constraint_layout_width">0dp</dimen>
+
   <!-- ProfileProgressRecentlyPlayedStoryCard -->
   <dimen name="profile_progress_recently_played_story_card_layout_margin_start">8dp</dimen>
   <dimen name="profile_progress_recently_played_story_card_layout_margin_end">8dp</dimen>