Fix #3584: Merge 4 versions of topic_practice_fragment.xml into a sin…

…gle xml file (#4022)

* merge files & changes dimen files accordingly

* resolve merge conflict

* modified dimens file

* nit fixes

* change tablet files

* sw600dp file changes

app/src/main/res/layout/topic_practice_fragment.xml

@@ -13,9 +13,12 @@
  android:id="@+id/topic_practice_skill_list"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
+ android:background="@color/oppia_background"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingBottom="172dp"
+ android:paddingStart="@dimen/topic_practice_fragment_padding_start"
+ android:paddingEnd="@dimen/topic_practice_fragment_padding_end"
+ android:paddingBottom="@dimen/topic_practice_fragment_padding_bottom"
  android:scrollbars="none"
  app:data="@{viewModel.topicPracticeSkillLiveData}"
  app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/values-land/dimens.xml

@@ -390,10 +390,15 @@
  <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">72dp</dimen>
 
+ <!-- TopicPracticeFragment -->
+ <dimen name="topic_practice_fragment_padding_bottom">0dp</dimen>
+ <dimen name="topic_practice_fragment_padding_start">48dp</dimen>
+ <dimen name="topic_practice_fragment_padding_end">48dp</dimen>
+
  <!-- PromotedStoryList-->
  <dimen name="promoted_story_list_layout_margin_end">72dp</dimen>
  <dimen name="promoted_story_list_layout_margin_start">72dp</dimen>
- 
+
  <!-- AudioLanguageFragment -->
  <dimen name="audio_language_recycler_view_padding_bottom">96dp</dimen>
 

app/src/main/res/values-sw600dp-land/dimens.xml

@@ -396,10 +396,13 @@
  <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">96dp</dimen>
 
+ <!-- TopicPracticeFragment -->
+ <dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>
+
  <!-- PromotedStoryList-->
  <dimen name="promoted_story_list_layout_margin_end">96dp</dimen>
  <dimen name="promoted_story_list_layout_margin_start">96dp</dimen>
- 
+
  <!-- AudioLanguageFragment -->
  <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
 

app/src/main/res/values-sw600dp-port/dimens.xml

@@ -392,12 +392,15 @@
  <dimen name="solution_summary_margin_bottom_linear_layout">32dp</dimen>
  <dimen name="solution_summary_margin_top_solution_summary_label">16dp</dimen>
 
- <!-- SectionTitleFragment -->
+  <!-- SectionTitleFragment -->
  <dimen name="section_title_divider_view_layout_margin_top">48dp</dimen>
  <dimen name="section_title_text_view_layout_margin_start">120dp</dimen>
  <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">120dp</dimen>
 
+ <!-- TopicPracticeFragment -->
+ <dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>
+
  <!-- PromotedStoryList-->
  <dimen name="promoted_story_list_layout_margin_end">120dp</dimen>
  <dimen name="promoted_story_list_layout_margin_start">120dp</dimen>

app/src/main/res/values/dimens.xml

@@ -586,6 +586,11 @@
  <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">32dp</dimen>
 
+ <!-- TopicPracticeFragment -->
+ <dimen name="topic_practice_fragment_padding_bottom">172dp</dimen>
+ <dimen name="topic_practice_fragment_padding_start">0dp</dimen>
+ <dimen name="topic_practice_fragment_padding_end">0dp</dimen>
+
  <!-- PromotedStoryList-->
  <dimen name="promoted_story_list_layout_margin_end">28dp</dimen>
  <dimen name="promoted_story_list_layout_margin_start">28dp</dimen>