Fix #3582 :Merge topic_lessons_title.xml into single xml file (#4036)

* topic_lessons_title port and land merged * No such changes * topic_lessons_title merged into 2 xml. And, Required changes applied to dimens.xml * No such changes * Removed extra space * Required Changes Applied * Nit Changes
oppia · Jan 17, 2022 · bc78d97 · bc78d97
1 parent ed89131
commit bc78d97
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 54 deletions.
diff --git a/app/src/main/res/layout-land/topic_lessons_title.xml b/app/src/main/res/layout-land/topic_lessons_title.xml
diff --git a/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml
diff --git a/...yout-sw600dp-land/topic_lessons_title.xml → ...es/layout-sw600dp/topic_lessons_title.xml b/...yout-sw600dp-land/topic_lessons_title.xml → ...es/layout-sw600dp/topic_lessons_title.xml
@@ -13,7 +13,7 @@
  <FrameLayout
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
- android:layout_marginTop="32dp">
+ android:layout_marginTop="@dimen/topic_lessons_title_margin_top">
 
  <TextView
  android:id="@+id/topic_play_text_view"

diff --git a/app/src/main/res/layout/topic_lessons_title.xml b/app/src/main/res/layout/topic_lessons_title.xml
@@ -17,9 +17,9 @@
  <TextView
  android:id="@+id/topic_play_text_view"
  style="@style/Heading2ViewStart"
- android:layout_marginStart="32dp"
- android:layout_marginTop="32dp"
- android:layout_marginEnd="32dp"
+ android:layout_marginStart="@dimen/topic_lessons_title_margin_start"
+ android:layout_marginTop="@dimen/topic_lessons_title_margin_top"
+ android:layout_marginEnd="@dimen/topic_lessons_title_margin_end"
  android:text="@string/stories_you_can_play"/>
  </FrameLayout>
 </layout>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -399,4 +399,8 @@
 
  <!-- StoryFragment -->
  <dimen name="story_fragment_padding_bottom">60dp</dimen>
+
+ <!-- TopicLessonsTitle -->
+ <dimen name="topic_lessons_title_margin_start">100dp</dimen>
+ <dimen name="topic_lessons_title_margin_end">100dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -595,4 +595,9 @@
 
  <!-- StoryFragment -->
  <dimen name="story_fragment_padding_bottom">160dp</dimen>
+
+ <!-- TopicLessonsTitle -->
+ <dimen name="topic_lessons_title_margin_start">32dp</dimen>
+ <dimen name="topic_lessons_title_margin_top">32dp</dimen>
+ <dimen name="topic_lessons_title_margin_end">32dp</dimen>
 </resources>