Fix #3459: Merge all topics into single XML file (#3519)

* dimens updated and xml merged into one * revert unwanted changes * reverted unwanted changes * revert unwanted change * requested changes done * Update all_topics.xml * Update dimens.xml * Update dimens.xml * Update dimens.xml
oppia · Jul 28, 2021 · 04bc03f · 04bc03f
1 parent c42dca3
commit 04bc03f
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 88 deletions.
diff --git a/app/src/main/res/layout-land/all_topics.xml b/app/src/main/res/layout-land/all_topics.xml
diff --git a/app/src/main/res/layout-sw600dp-land/all_topics.xml b/app/src/main/res/layout-sw600dp-land/all_topics.xml
diff --git a/app/src/main/res/layout-sw600dp-port/all_topics.xml b/app/src/main/res/layout-sw600dp-port/all_topics.xml
diff --git a/app/src/main/res/layout/all_topics.xml b/app/src/main/res/layout/all_topics.xml
@@ -16,10 +16,10 @@
       android:id="@+id/all_topics_text_view"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="28dp"
-      android:layout_marginTop="56dp"
-      android:layout_marginEnd="32dp"
-      android:layout_marginBottom="12dp"
+      android:layout_marginStart="@dimen/all_topics_text_margin_start"
+      android:layout_marginTop="@dimen/all_topics_text_margin_top"
+      android:layout_marginEnd="@dimen/all_topics_text_margin_end"
+      android:layout_marginBottom="@dimen/all_topics_text_margin_bottom"
       android:fontFamily="sans-serif-medium"
       android:text="@string/all_topics"
       android:textColor="@color/oppiaPrimaryText"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -253,4 +253,10 @@
   <dimen name="concept_card_explanation_text_marginTop">24dp</dimen>
   <dimen name="concept_card_explanation_text_marginEnd">64dp</dimen>
 
+  <!-- All Topics -->
+  <dimen name="all_topics_text_margin_start">72dp</dimen>
+  <dimen name="all_topics_text_margin_top">32dp</dimen>
+  <dimen name="all_topics_text_margin_end">76dp</dimen>
+  <dimen name="all_topics_text_margin_bottom">12dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -274,4 +274,10 @@
   <dimen name="concept_card_explanation_text_marginTop">16dp</dimen>
   <dimen name="concept_card_explanation_text_marginEnd">176dp</dimen>
 
+  <!-- All Topics -->
+  <dimen name="all_topics_text_margin_start">96dp</dimen>
+  <dimen name="all_topics_text_margin_top">68dp</dimen>
+  <dimen name="all_topics_text_margin_end">76dp</dimen>
+  <dimen name="all_topics_text_margin_bottom">24dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -277,4 +277,10 @@
   <dimen name="concept_card_explanation_text_marginTop">16dp</dimen>
   <dimen name="concept_card_explanation_text_marginEnd">128dp</dimen>
 
+  <!-- All Topics -->
+  <dimen name="all_topics_text_margin_start">120dp</dimen>
+  <dimen name="all_topics_text_margin_top">68dp</dimen>
+  <dimen name="all_topics_text_margin_end">76dp</dimen>
+  <dimen name="all_topics_text_margin_bottom">24dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -434,4 +434,10 @@
   <dimen name="concept_card_explanation_text_marginTop">28dp</dimen>
   <dimen name="concept_card_explanation_text_marginEnd">40dp</dimen>
 
+  <!-- All Topics -->
+  <dimen name="all_topics_text_margin_start">28dp</dimen>
+  <dimen name="all_topics_text_margin_top">56dp</dimen>
+  <dimen name="all_topics_text_margin_end">32dp</dimen>
+  <dimen name="all_topics_text_margin_bottom">12dp</dimen>
+
 </resources>