Merged recently-played-fragment (#3770)

oppia · Sep 28, 2021 · 7ff1b2b · 7ff1b2b
1 parent c1d22df
commit 7ff1b2b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 174 deletions.
diff --git a/app/src/main/res/layout-land/recently_played_fragment.xml b/app/src/main/res/layout-land/recently_played_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-land/recently_played_fragment.xml b/app/src/main/res/layout-sw600dp-land/recently_played_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp-port/recently_played_fragment.xml b/app/src/main/res/layout-sw600dp-port/recently_played_fragment.xml
diff --git a/app/src/main/res/layout/recently_played_fragment.xml b/app/src/main/res/layout/recently_played_fragment.xml
@@ -44,8 +44,8 @@
  android:layout_height="match_parent"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingTop="8dp"
- android:paddingBottom="168dp"
+ android:paddingTop="@dimen/recently_played_fragment_padding_top"
+ android:paddingBottom="@dimen/recently_played_fragment_padding_bottom"
  android:scrollbars="none" />
 
  <View

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -303,6 +303,10 @@
  <dimen name="home_fragment_padding_top">40dp</dimen>
  <dimen name="home_fragment_padding_bottom">96dp</dimen>
 
+ <!-- Recently Played -->
+ <dimen name="recently_played_fragment_padding_top">8dp</dimen>
+ <dimen name="recently_played_fragment_padding_bottom">108dp</dimen>
+
  <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
  <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
  <dimen name="promoted_story_card_text_size">14sp</dimen>

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -323,6 +323,10 @@
  <dimen name="home_fragment_padding_top">48dp</dimen>
  <dimen name="home_fragment_padding_bottom">100dp</dimen>
 
+ <!-- Recently Played -->
+ <dimen name="recently_played_fragment_padding_top">0dp</dimen>
+ <dimen name="recently_played_fragment_padding_bottom">112dp</dimen>
+
  <dimen name="promoted_story_card_layout_margin_start">0dp</dimen>
  <dimen name="promoted_story_card_layout_margin_end">32dp</dimen>
  <dimen name="promoted_story_card_text_size">16sp</dimen>

diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -325,6 +325,10 @@
  <dimen name="home_fragment_padding_top">48dp</dimen>
  <dimen name="home_fragment_padding_bottom">100dp</dimen>
 
+ <!-- Recently Played -->
+ <dimen name="recently_played_fragment_padding_top">0dp</dimen>
+ <dimen name="recently_played_fragment_padding_bottom">112dp</dimen>
+
  <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
  <dimen name="promoted_story_card_layout_margin_end">24dp</dimen>
  <dimen name="promoted_story_card_text_size">16sp</dimen>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -491,6 +491,10 @@
  <dimen name="home_fragment_padding_top">36dp</dimen>
  <dimen name="home_fragment_padding_bottom">148dp</dimen>
 
+ <!-- Recently Played -->
+ <dimen name="recently_played_fragment_padding_top">8dp</dimen>
+ <dimen name="recently_played_fragment_padding_bottom">168dp</dimen>
+
  <dimen name="promoted_story_card_layout_margin_end">8dp</dimen>
  <dimen name="promoted_story_card_layout_margin_start">8dp</dimen>
  <dimen name="promoted_story_card_layout_width">280dp</dimen>