Merge xml (oppia#3845)

* merged topic_lessons_fragment xml files * xml-merged * added runConf * runConf * runConf diff
kritigupta45 · Sep 30, 2021 · 1173afc · 1173afc
1 parent e631ffe
commit 1173afc
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 97 deletions.
diff --git a/app/src/main/res/layout-land/topic_lessons_fragment.xml b/app/src/main/res/layout-land/topic_lessons_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-port/topic_lessons_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_lessons_fragment.xml
diff --git a/app/src/main/res/layout/topic_lessons_fragment.xml b/app/src/main/res/layout/topic_lessons_fragment.xml
@@ -20,7 +20,7 @@
  android:layout_height="0dp"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingBottom="128dp"
+ android:paddingBottom="@dimen/topic_lessons_fragment_layout_padding_bottom"
  android:scrollbars="none"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -311,4 +311,7 @@
  <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
  <dimen name="promoted_story_card_text_size">14sp</dimen>
  <dimen name="promoted_story_card_margin_top">8dp</dimen>
+
+ <!-- Topic Lessons Fragment -->
+ <dimen name="topic_lessons_fragment_layout_padding_bottom">80dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -331,4 +331,7 @@
  <dimen name="promoted_story_card_layout_margin_end">32dp</dimen>
  <dimen name="promoted_story_card_text_size">16sp</dimen>
  <dimen name="promoted_story_card_margin_top">4dp</dimen>
+
+ <!-- Topic Lessons Fragment -->
+ <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -333,4 +333,7 @@
  <dimen name="promoted_story_card_layout_margin_end">24dp</dimen>
  <dimen name="promoted_story_card_text_size">16sp</dimen>
  <dimen name="promoted_story_card_margin_top">4dp</dimen>
+
+ <!-- Topic Lessons Fragment -->
+ <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -500,4 +500,7 @@
  <dimen name="promoted_story_card_layout_width">280dp</dimen>
  <dimen name="promoted_story_card_text_size">16sp</dimen>
  <dimen name="promoted_story_card_margin_top">8dp</dimen>
+
+ <!-- Topic Lessons Fragment -->
+ <dimen name="topic_lessons_fragment_layout_padding_bottom">128dp</dimen>
 </resources>