Fix #3587: Merge topic revision fragments (#3816)

* merged all the fragments into one * change 2 * Update topic_revision_fragment.xml * final changes
oppia · Oct 6, 2021 · b0a86a8 · b0a86a8
1 parent 5c3eaf3
commit b0a86a8
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 95 deletions.
diff --git a/app/src/main/res/layout-land/topic_revision_fragment.xml b/app/src/main/res/layout-land/topic_revision_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-land/topic_revision_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_revision_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-port/topic_revision_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_revision_fragment.xml
diff --git a/app/src/main/res/layout/topic_revision_fragment.xml b/app/src/main/res/layout/topic_revision_fragment.xml
@@ -20,10 +20,10 @@
       android:layout_height="wrap_content"
       android:clipToPadding="false"
       android:overScrollMode="never"
-      android:paddingStart="20dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="20dp"
-      android:paddingBottom="144dp"
+      android:paddingStart="@dimen/topic_revision_fragment_padding_start"
+      android:paddingTop="@dimen/topic_revision_fragment_padding_top"
+      android:paddingEnd="@dimen/topic_revision_fragment_padding_end"
+      android:paddingBottom="@dimen/topic_revision_fragment_padding_bottom"
       android:scrollbars="none"
       android:tag="@string/topic_revision_recyclerview_tag"
       app:data="@{viewModel.subtopicLiveData}" />

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -336,4 +336,11 @@
   <dimen name="ongoing_topic_list_fragment_padding_top">28dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_end">56dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_bottom">88dp</dimen>
+
+  <!-- TopicRevisionFragment -->
+  <dimen name="topic_revision_fragment_padding_start">56dp</dimen>
+  <dimen name="topic_revision_fragment_padding_top">20dp</dimen>
+  <dimen name="topic_revision_fragment_padding_end">56dp</dimen>
+  <dimen name="topic_revision_fragment_padding_bottom">104dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -353,4 +353,11 @@
   <dimen name="ongoing_topic_list_fragment_padding_top">24dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_end">64dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_bottom">112dp</dimen>
+
+  <!-- TopicRevisionFragment -->
+  <dimen name="topic_revision_fragment_padding_start">64dp</dimen>
+  <dimen name="topic_revision_fragment_padding_top">24dp</dimen>
+  <dimen name="topic_revision_fragment_padding_end">64dp</dimen>
+  <dimen name="topic_revision_fragment_padding_bottom">112dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -355,4 +355,11 @@
   <dimen name="ongoing_topic_list_fragment_padding_top">12dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_end">96dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_bottom">112dp</dimen>
+
+  <!-- TopicRevisionFragment -->
+  <dimen name="topic_revision_fragment_padding_start">96dp</dimen>
+  <dimen name="topic_revision_fragment_padding_top">8dp</dimen>
+  <dimen name="topic_revision_fragment_padding_end">96dp</dimen>
+  <dimen name="topic_revision_fragment_padding_bottom">112dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -526,4 +526,11 @@
   <dimen name="ongoing_topic_list_fragment_padding_top">20dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_end">20dp</dimen>
   <dimen name="ongoing_topic_list_fragment_padding_bottom">144dp</dimen>
+
+  <!-- TopicRevisionFragment -->
+  <dimen name="topic_revision_fragment_padding_start">20dp</dimen>
+  <dimen name="topic_revision_fragment_padding_top">20dp</dimen>
+  <dimen name="topic_revision_fragment_padding_end">20dp</dimen>
+  <dimen name="topic_revision_fragment_padding_bottom">144dp</dimen>
+
 </resources>