From 4171e0dd1b540e4a5140bd1273993982dfa31b1d Mon Sep 17 00:00:00 2001
From: Kriti Gupta <82928579+kritigupta45@users.noreply.github.com>
Date: Mon, 4 Oct 2021 01:33:22 +0530
Subject: [PATCH] Fix #3586: Merge topic_practice_subtopic.xml into a single
 xml file (#3835)

* merge topic_practice_subtopic xml files & create variables in dimens.xml file

* revert unnecessary changes

* modify files for mob-landscape view

* changes dimens.xml

* revert .idea file

* modify xml file for tablet mode
---
 .../layout-land/topic_practice_subtopic.xml   | 50 ------------
 .../topic_practice_subtopic.xml               | 55 -------------
 .../topic_practice_subtopic.xml               | 55 -------------
 .../res/layout/topic_practice_subtopic.xml    | 79 +++++++++++--------
 app/src/main/res/values-land/dimens.xml       |  5 ++
 .../main/res/values-sw600dp-land/dimens.xml   |  6 ++
 .../main/res/values-sw600dp-port/dimens.xml   |  6 ++
 app/src/main/res/values/dimens.xml            |  6 ++
 8 files changed, 69 insertions(+), 193 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/topic_practice_subtopic.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/topic_practice_subtopic.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/topic_practice_subtopic.xml

diff --git a/app/src/main/res/layout-land/topic_practice_subtopic.xml b/app/src/main/res/layout-land/topic_practice_subtopic.xml
deleted file mode 100644
index 0ffb8628556..00000000000
--- a/app/src/main/res/layout-land/topic_practice_subtopic.xml
+++ /dev/null
@@ -1,50 +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="isChecked"
-      type="Boolean" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="104dp"
-    android:layout_marginEnd="96dp"
-    app:barrierDirection="end">
-
-    <androidx.constraintlayout.widget.Barrier
-      android:id="@+id/topic_practice_subtopic_barrier"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      app:barrierDirection="bottom"
-      app:constraint_referenced_ids="subtopic_check_box" />
-
-    <CheckBox
-      android:id="@+id/subtopic_check_box"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:button="@drawable/selector_checkbox"
-      android:checked="@{isChecked}"
-      android:drawableStart="@android:color/transparent"
-      android:drawablePadding="20dp"
-      android:fontFamily="sans-serif"
-      android:gravity="start|top"
-      android:minHeight="@dimen/clickable_item_min_height"
-      android:text="@{viewModel.subtopic.title}"
-      android:textAlignment="viewStart"
-      android:textColor="@color/oppiaPrimaryText"
-      android:textSize="16sp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/topic_practice_subtopic.xml b/app/src/main/res/layout-sw600dp-land/topic_practice_subtopic.xml
deleted file mode 100644
index ff4d2c56042..00000000000
--- a/app/src/main/res/layout-sw600dp-land/topic_practice_subtopic.xml
+++ /dev/null
@@ -1,55 +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="isChecked"
-      type="Boolean" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" />
-  </data>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:layout_width="360dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:layout_marginStart="8dp"
-      app:barrierDirection="end">
-
-      <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/topic_practice_subtopic_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="subtopic_check_box" />
-
-      <CheckBox
-        android:id="@+id/subtopic_check_box"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:button="@drawable/selector_checkbox"
-        android:checked="@{isChecked}"
-        android:drawableStart="@android:color/transparent"
-        android:drawablePadding="20dp"
-        android:fontFamily="sans-serif"
-        android:gravity="start|top"
-        android:minHeight="@dimen/clickable_item_min_height"
-        android:text="@{viewModel.subtopic.title}"
-        android:textAlignment="viewStart"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </FrameLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/topic_practice_subtopic.xml b/app/src/main/res/layout-sw600dp-port/topic_practice_subtopic.xml
deleted file mode 100644
index ff4d2c56042..00000000000
--- a/app/src/main/res/layout-sw600dp-port/topic_practice_subtopic.xml
+++ /dev/null
@@ -1,55 +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="isChecked"
-      type="Boolean" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" />
-  </data>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:layout_width="360dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:layout_marginStart="8dp"
-      app:barrierDirection="end">
-
-      <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/topic_practice_subtopic_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="subtopic_check_box" />
-
-      <CheckBox
-        android:id="@+id/subtopic_check_box"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:button="@drawable/selector_checkbox"
-        android:checked="@{isChecked}"
-        android:drawableStart="@android:color/transparent"
-        android:drawablePadding="20dp"
-        android:fontFamily="sans-serif"
-        android:gravity="start|top"
-        android:minHeight="@dimen/clickable_item_min_height"
-        android:text="@{viewModel.subtopic.title}"
-        android:textAlignment="viewStart"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </FrameLayout>
-</layout>
diff --git a/app/src/main/res/layout/topic_practice_subtopic.xml b/app/src/main/res/layout/topic_practice_subtopic.xml
index 15de40d4ca4..d476aef4138 100755
--- a/app/src/main/res/layout/topic_practice_subtopic.xml
+++ b/app/src/main/res/layout/topic_practice_subtopic.xml
@@ -13,39 +13,52 @@
       type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" />
   </data>
 
-  <androidx.constraintlayout.widget.ConstraintLayout
+  <FrameLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="40dp"
-    android:layout_marginEnd="48dp"
-    app:barrierDirection="end"
-    app:constraint_referenced_ids="button_example,text_view_status">
-
-    <androidx.constraintlayout.widget.Barrier
-      android:id="@+id/topic_practice_subtopic_barrier"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      app:barrierDirection="bottom"
-      app:constraint_referenced_ids="subtopic_check_box" />
-
-    <CheckBox
-      android:id="@+id/subtopic_check_box"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:button="@drawable/selector_checkbox"
-      android:checked="@{isChecked}"
-      android:drawableStart="@android:color/transparent"
-      android:drawablePadding="20dp"
-      android:fontFamily="sans-serif"
-      android:gravity="start|top"
-      android:minHeight="@dimen/clickable_item_min_height"
-      android:text="@{viewModel.subtopic.title}"
-      android:textAlignment="viewStart"
-      android:textColor="@color/oppiaPrimaryText"
-      android:textSize="16sp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
+      android:layout_height="wrap_content">
+
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="@dimen/topic_practice_subtopic_layout_width"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/topic_practice_subtopic_layout_margin_start"
+        android:layout_marginEnd="@dimen/topic_practice_subtopic_layout_margin_end"
+        app:barrierDirection="end"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.Barrier
+          android:id="@+id/topic_practice_subtopic_barrier"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          app:barrierDirection="bottom"
+          app:constraint_referenced_ids="subtopic_check_box" />
+
+        <CheckBox
+          android:id="@+id/subtopic_check_box"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:button="@drawable/selector_checkbox"
+          android:checked="@{isChecked}"
+          android:drawableStart="@android:color/transparent"
+          android:drawablePadding="20dp"
+          android:fontFamily="sans-serif"
+          android:gravity="start|top"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@{viewModel.subtopic.title}"
+          android:textAlignment="viewStart"
+          android:textColor="@color/oppiaPrimaryText"
+          android:textSize="16sp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </FrameLayout>
 </layout>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 8a6823815f0..bd21d779564 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -312,6 +312,11 @@
   <dimen name="promoted_story_card_text_size">14sp</dimen>
   <dimen name="promoted_story_card_margin_top">8dp</dimen>
 
+  <!-- Topic Practice -->
+  <dimen name="topic_practice_subtopic_layout_margin_start">104dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_margin_end">96dp</dimen>
+
   <!-- Topic Lessons Fragment -->
   <dimen name="topic_lessons_fragment_layout_padding_bottom">80dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index ab7b0d754ad..b007b27d7d2 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -332,6 +332,12 @@
   <dimen name="promoted_story_card_text_size">16sp</dimen>
   <dimen name="promoted_story_card_margin_top">4dp</dimen>
 
+  <!-- Topic Practice -->
+  <dimen name="topic_practice_subtopic_layout_margin_start">8dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_margin_end">0dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_width">360dp</dimen>
+
   <!-- Topic Lessons Fragment -->
   <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 7dd3fb12a7a..d072b929ebe 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -334,6 +334,12 @@
   <dimen name="promoted_story_card_text_size">16sp</dimen>
   <dimen name="promoted_story_card_margin_top">4dp</dimen>
 
+  <!-- Topic Practice -->
+  <dimen name="topic_practice_subtopic_layout_margin_start">8dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_margin_end">0dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_width">360dp</dimen>
+
   <!-- Topic Lessons Fragment -->
   <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index cd093945059..65106599fc5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -501,6 +501,12 @@
   <dimen name="promoted_story_card_text_size">16sp</dimen>
   <dimen name="promoted_story_card_margin_top">8dp</dimen>
 
+  <!-- Topic Practice -->
+  <dimen name="topic_practice_subtopic_layout_margin_start">40dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_margin_end">48dp</dimen>
+  <dimen name="topic_practice_subtopic_layout_width">0dp</dimen>
+
   <!-- Topic Lessons Fragment -->
   <dimen name="topic_lessons_fragment_layout_padding_bottom">128dp</dimen>
+
 </resources>