From bde9242067d87ff4a3e1b76a4e40403cca22a411 Mon Sep 17 00:00:00 2001
From: Priyank Shankar <75121767+shankarpriyank@users.noreply.github.com>
Date: Thu, 5 May 2022 21:28:08 +0530
Subject: [PATCH] Fix # 3581 Merge topic_lessons_story_summary.xml (#4234)

* Optimised the layout files

* Added space

* Remmoved Extra dimens
---
 .../topic_lessons_story_summary.xml           | 174 -----------------
 .../topic_lessons_story_summary.xml           |   6 +-
 .../topic_lessons_story_summary.xml           | 178 ------------------
 app/src/main/res/values-land/dimens.xml       |   7 +
 .../main/res/values-sw600dp-land/dimens.xml   |   9 +-
 .../main/res/values-sw600dp-port/dimens.xml   |   7 +-
 app/src/main/res/values/dimens.xml            |   7 +
 7 files changed, 30 insertions(+), 358 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/topic_lessons_story_summary.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/topic_lessons_story_summary.xml

diff --git a/app/src/main/res/layout-land/topic_lessons_story_summary.xml b/app/src/main/res/layout-land/topic_lessons_story_summary.xml
deleted file mode 100644
index bd2177427dd..00000000000
--- a/app/src/main/res/layout-land/topic_lessons_story_summary.xml
+++ /dev/null
@@ -1,174 +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>
-
-    <import type="android.view.View" />
-
-    <variable
-      name="isListExpanded"
-      type="Boolean" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.lessons.StorySummaryViewModel" />
-  </data>
-
-  <com.google.android.material.card.MaterialCardView
-    android:id="@+id/story_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="96dp"
-    android:layout_marginTop="12dp"
-    android:layout_marginEnd="96dp"
-    android:layout_marginBottom="12dp"
-    app:cardBackgroundColor="@color/color_def_white"
-    app:cardCornerRadius="4dp"
-    app:cardElevation="4dp"
-    app:rippleColor="@color/color_def_transparent">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="24dp"
-        android:orientation="horizontal">
-
-        <LinearLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="24dp"
-          android:gravity="center"
-          android:orientation="vertical">
-
-          <FrameLayout
-            android:id="@+id/story_progress_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@{viewModel.storyProgressPercentageText}">
-
-            <org.oppia.android.app.customview.SegmentedCircularProgressView
-              android:id="@+id/story_progress_view"
-              android:layout_width="48dp"
-              android:layout_height="48dp" />
-
-            <TextView
-              android:id="@+id/story_progress_percentage"
-              style="@style/TextViewCenter"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center"
-              android:fontFamily="sans-serif-medium"
-              android:text="@{viewModel.storyProgressPercentageText}"
-              android:textColor="@color/oppia_primary_text"
-              android:textSize="14sp"
-              android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" />
-          </FrameLayout>
-
-          <TextView
-            style="@style/TextViewCenterHorizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:fontFamily="sans-serif"
-            android:text="@{viewModel.storyPercentage != 100? @string/status_in_progress : @string/status_completed}"
-            android:textColor="@color/oppia_primary_text"
-            android:textSize="10sp"
-            android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" />
-        </LinearLayout>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:orientation="horizontal">
-
-          <LinearLayout
-            android:id="@+id/story_name_chapter_count_container"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_weight="1"
-            android:contentDescription="@{viewModel.computeStoryNameChapterCountContainerContentDescription()}"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-              android:id="@+id/story_name_text_view"
-              style="@style/TextViewStart"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:fontFamily="sans-serif-medium"
-              android:onClick="@{(v) -> viewModel.clickOnStorySummaryTitle()}"
-              android:paddingTop="24dp"
-              android:paddingBottom="4dp"
-              android:text="@{viewModel.storySummary.storyName}"
-              android:textColor="@color/oppia_primary_text"
-              android:textSize="18sp" />
-
-            <TextView
-              android:id="@+id/chapter_count"
-              style="@style/TextViewStart"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:fontFamily="sans-serif"
-              android:importantForAccessibility="no"
-              android:text="@{viewModel.computeChapterCountText()}"
-              android:textColor="@color/oppia_primary_text"
-              android:textSize="16sp" />
-          </LinearLayout>
-
-          <FrameLayout
-            android:id="@+id/expand_list_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:minWidth="48dp"
-            android:minHeight="48dp">
-
-            <ImageView
-              android:id="@+id/chapter_list_drop_down_icon"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal|bottom"
-              android:contentDescription="@{isListExpanded ? @string/hide_chapter_list : @string/show_chapter_list}"
-              app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
-              app:isRotationAnimationClockwise="@{isListExpanded}"
-              app:rotationAnimationAngle="@{180f}" />
-          </FrameLayout>
-        </LinearLayout>
-      </LinearLayout>
-
-      <LinearLayout
-        android:id="@+id/chapter_list_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/color_def_white_light"
-        android:orientation="vertical"
-        android:visibility="@{isListExpanded? View.VISIBLE : View.GONE}">
-
-        <View
-          android:id="@+id/topic_play_story_dashed_line_view"
-          android:layout_width="match_parent"
-          android:layout_height="2dp"
-          android:layout_gravity="center_horizontal"
-          android:background="@drawable/dashed_divider" />
-
-        <androidx.recyclerview.widget.RecyclerView
-          android:id="@+id/chapter_recycler_view"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="8dp"
-          android:layout_marginBottom="8dp"
-          app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-          app:list="@{viewModel.chapterSummaryItemList}" />
-      </LinearLayout>
-    </LinearLayout>
-  </com.google.android.material.card.MaterialCardView>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
index ac94d53494d..8922aad9a63 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
@@ -39,8 +39,8 @@
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginStart="16dp"
-          android:layout_marginEnd="16dp"
+          android:layout_marginStart="@dimen/topic_lessons_summary_card_view_margin_start"
+          android:layout_marginEnd="@dimen/topic_lessons_summary_card_view_margin_end"
           android:layout_marginBottom="24dp"
           android:orientation="horizontal">
 
@@ -96,7 +96,7 @@
               android:id="@+id/story_name_chapter_count_container"
               android:layout_width="0dp"
               android:layout_height="wrap_content"
-              android:layout_marginStart="20dp"
+              android:layout_marginStart="@dimen/topic_lessons_summary_story_name_chapter_count_container_margin_start"
               android:layout_weight="1"
               android:contentDescription="@{viewModel.computeStoryNameChapterCountContainerContentDescription()}"
               android:gravity="center_vertical"
diff --git a/app/src/main/res/layout-sw600dp-port/topic_lessons_story_summary.xml b/app/src/main/res/layout-sw600dp-port/topic_lessons_story_summary.xml
deleted file mode 100644
index 084ac551da8..00000000000
--- a/app/src/main/res/layout-sw600dp-port/topic_lessons_story_summary.xml
+++ /dev/null
@@ -1,178 +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>
-
-    <import type="android.view.View" />
-
-    <variable
-      name="isListExpanded"
-      type="Boolean" />
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.topic.lessons.StorySummaryViewModel" />
-  </data>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.card.MaterialCardView
-      android:id="@+id/story_container"
-      android:layout_width="528dp"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:layout_marginTop="12dp"
-      android:layout_marginBottom="12dp"
-      app:cardBackgroundColor="@color/color_def_white"
-      app:cardCornerRadius="4dp"
-      app:cardElevation="4dp"
-      app:rippleColor="@color/color_def_transparent">
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="12dp"
-          android:layout_marginEnd="12dp"
-          android:layout_marginBottom="24dp"
-          android:orientation="horizontal">
-
-          <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <FrameLayout
-              android:id="@+id/story_progress_container"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:contentDescription="@{viewModel.storyProgressPercentageText}">
-
-              <org.oppia.android.app.customview.SegmentedCircularProgressView
-                android:id="@+id/story_progress_view"
-                android:layout_width="48dp"
-                android:layout_height="48dp" />
-
-              <TextView
-                android:id="@+id/story_progress_percentage"
-                style="@style/TextViewCenter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:fontFamily="sans-serif-medium"
-                android:text="@{viewModel.storyProgressPercentageText}"
-                android:textColor="@color/oppia_primary_text"
-                android:textSize="14sp"
-                android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" />
-            </FrameLayout>
-
-            <TextView
-              style="@style/TextViewCenterHorizontal"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginTop="4dp"
-              android:fontFamily="sans-serif"
-              android:text="@{viewModel.storyPercentage != 100? @string/status_in_progress : @string/status_completed}"
-              android:textColor="@color/oppia_primary_text"
-              android:textSize="10sp"
-              android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" />
-          </LinearLayout>
-
-          <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <LinearLayout
-              android:id="@+id/story_name_chapter_count_container"
-              android:layout_width="0dp"
-              android:layout_height="wrap_content"
-              android:layout_marginStart="12dp"
-              android:layout_weight="1"
-              android:contentDescription="@{viewModel.computeStoryNameChapterCountContainerContentDescription()}"
-              android:gravity="center_vertical"
-              android:orientation="vertical">
-
-              <TextView
-                android:id="@+id/story_name_text_view"
-                style="@style/TextViewStart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-medium"
-                android:onClick="@{(v) -> viewModel.clickOnStorySummaryTitle()}"
-                android:paddingTop="24dp"
-                android:paddingBottom="4dp"
-                android:text="@{viewModel.storySummary.storyName}"
-                android:textColor="@color/oppia_primary_text"
-                android:textSize="18sp" />
-
-              <TextView
-                android:id="@+id/chapter_count"
-                style="@style/TextViewStart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif"
-                android:importantForAccessibility="no"
-                android:text="@{viewModel.computeChapterCountText()}"
-                android:textColor="@color/oppia_primary_text"
-                android:textSize="16sp" />
-            </LinearLayout>
-
-            <FrameLayout
-              android:id="@+id/expand_list_icon"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="bottom"
-              android:minWidth="48dp"
-              android:minHeight="48dp">
-
-              <ImageView
-                android:id="@+id/chapter_list_drop_down_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:contentDescription="@{isListExpanded ? @string/hide_chapter_list : @string/show_chapter_list}"
-                app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
-                app:isRotationAnimationClockwise="@{isListExpanded}"
-                app:rotationAnimationAngle="@{180f}" />
-            </FrameLayout>
-          </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-          android:id="@+id/chapter_list_container"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="@color/color_def_white_light"
-          android:orientation="vertical"
-          android:visibility="@{isListExpanded? View.VISIBLE : View.GONE}">
-
-          <View
-            android:id="@+id/topic_play_story_dashed_line_view"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/dashed_divider" />
-
-          <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/chapter_recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:list="@{viewModel.chapterSummaryItemList}" />
-        </LinearLayout>
-      </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
-  </FrameLayout>
-</layout>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 26b78d51765..ebd721a1ef7 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -488,6 +488,13 @@
   <dimen name="option_audio_language_padding_start">36dp</dimen>
   <dimen name="option_audio_language_padding_end">36dp</dimen>
 
+  <!-- TopicLessonsSummary -->
+  <dimen name="topic_lessons_summary_card_view_margin_start">96dp</dimen>
+  <dimen name="topic_lessons_summary_card_view_margin_end">96dp</dimen>
+  <dimen name="topic_lessons_summary_linear_layout_margin_start">16dp</dimen>
+  <dimen name="topic_lessons_summary_linear_layout_margin_end">16dp</dimen>
+  <dimen name="topic_lessons_summary_story_name_chapter_count_container_margin_start">20dp</dimen>
+  
   <!-- OptionsStoryTextSize -->
   <dimen name="option_story_text_size_padding_start">36dp</dimen>
   <dimen name="option_story_text_size_padding_end">36dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index c817c64db5e..60af2db02bf 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -443,6 +443,11 @@
   <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>
 
+  <!-- TopicLessonsSummary -->
+  <dimen name="topic_lessons_summary_linear_layout_margin_start">16dp</dimen>
+  <dimen name="topic_lessons_summary_linear_layout_margin_end">16dp</dimen>
+  <dimen name="topic_lessons_summary_story_name_chapter_count_container_margin_start">20dp</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>
@@ -450,11 +455,11 @@
   <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 c2167fa6646..2930a3d53d2 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -441,7 +441,12 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <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>
-
+  
+  <!-- TopicLessonsSummary -->
+  <dimen name="topic_lessons_summary_linear_layout_margin_start">12dp</dimen>
+  <dimen name="topic_lessons_summary_linear_layout_margin_end">12dp</dimen>
+  <dimen name="topic_lessons_summary_story_name_chapter_count_container_margin_start">12dp</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>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9752e225969..070409a453e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -691,6 +691,13 @@
   <dimen name="option_audio_language_padding_start">16dp</dimen>
   <dimen name="option_audio_language_padding_end">16dp</dimen>
 
+  <!-- TopicLessonsSummary -->
+  <dimen name="topic_lessons_summary_card_view_margin_start">20dp</dimen>
+  <dimen name="topic_lessons_summary_card_view_margin_end">20dp</dimen>
+  <dimen name="topic_lessons_summary_linear_layout_margin_start">12dp</dimen>
+  <dimen name="topic_lessons_summary_linear_layout_margin_end">12dp</dimen>
+  <dimen name="topic_lessons_summary_story_name_chapter_count_container_margin_start">12dp</dimen>
+  
   <!-- OptionsStoryTextSize -->
   <dimen name="option_story_text_size_padding_start">16dp</dimen>
   <dimen name="option_story_text_size_padding_end">16dp</dimen>