merged files (oppia#3874)

kritigupta45 · Oct 5, 2021 · bd51d35 · bd51d35
1 parent 9e44c12
commit bd51d35
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 211 deletions.
diff --git a/app/src/main/res/layout-land/ongoing_topic_list_fragment.xml b/app/src/main/res/layout-land/ongoing_topic_list_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-land/ongoing_topic_list_fragment.xml b/app/src/main/res/layout-sw600dp-land/ongoing_topic_list_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-port/ongoing_topic_list_fragment.xml b/app/src/main/res/layout-sw600dp-port/ongoing_topic_list_fragment.xml
diff --git a/app/src/main/res/layout/ongoing_topic_list_fragment.xml b/app/src/main/res/layout/ongoing_topic_list_fragment.xml
@@ -51,10 +51,10 @@
  android:layout_height="match_parent"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingStart="20dp"
- android:paddingTop="20dp"
- android:paddingEnd="20dp"
- android:paddingBottom="144dp"
+ android:paddingStart="@dimen/ongoing_topic_list_fragment_padding_start"
+ android:paddingTop="@dimen/ongoing_topic_list_fragment_padding_top"
+ android:paddingEnd="@dimen/ongoing_topic_list_fragment_padding_end"
+ android:paddingBottom="@dimen/ongoing_topic_list_fragment_padding_bottom"
  android:scrollbars="none"
  android:tag="@string/ongoing_recycler_view_tag"
  app:data="@{viewModel.ongoingTopicListViewModelLiveData}" />

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -322,4 +322,10 @@
  <!-- Story Header View -->
  <dimen name="story_header_view_layout_margin_start">76dp</dimen>
  <dimen name="story_header_view_layout_margin_end">72dp</dimen>
+
+ <!-- Ongoing Topic List Fragment -->
+ <dimen name="ongoing_topic_list_fragment_padding_start">56dp</dimen>
+ <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>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -340,4 +340,9 @@
  <!-- Topic Lessons Fragment -->
  <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
 
+ <!-- Ongoing Topic List Fragment -->
+ <dimen name="ongoing_topic_list_fragment_padding_start">64dp</dimen>
+ <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>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -342,4 +342,9 @@
  <!-- Topic Lessons Fragment -->
  <dimen name="topic_lessons_fragment_layout_padding_bottom">100dp</dimen>
 
+ <!-- Ongoing Topic List Fragment -->
+ <dimen name="ongoing_topic_list_fragment_padding_start">96dp</dimen>
+ <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>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -512,4 +512,10 @@
  <!-- Story Header View -->
  <dimen name="story_header_view_layout_margin_start">32dp</dimen>
  <dimen name="story_header_view_layout_margin_end">32dp</dimen>
+
+ <!-- Ongoing Topic List Fragment -->
+ <dimen name="ongoing_topic_list_fragment_padding_start">20dp</dimen>
+ <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>
 </resources>