Fixes oppia#3569 Merged promoted_story_list.xml files (oppia#4083)

* merged promoted-story-list files into single xml file * added style attribute to text views as suggested
bhaktideshmukh · Jan 25, 2022 · 6ad4785 · 6ad4785
1 parent 807593d
commit 6ad4785
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 209 deletions.
diff --git a/app/src/main/res/layout-land/promoted_story_list.xml b/app/src/main/res/layout-land/promoted_story_list.xml
diff --git a/app/src/main/res/layout-sw600dp-land/promoted_story_list.xml b/app/src/main/res/layout-sw600dp-land/promoted_story_list.xml
diff --git a/app/src/main/res/layout-sw600dp-port/promoted_story_list.xml b/app/src/main/res/layout-sw600dp-port/promoted_story_list.xml
diff --git a/app/src/main/res/layout/promoted_story_list.xml b/app/src/main/res/layout/promoted_story_list.xml
@@ -25,9 +25,10 @@
 
  <TextView
  android:id="@+id/recently_played_stories_text_view"
+ style="@style/TextViewStart"
  android:layout_width="0dp"
  android:layout_height="wrap_content"
- android:layout_marginStart="28dp"
+ android:layout_marginStart="@dimen/promoted_story_list_layout_margin_start"
  android:layout_weight="1"
  android:fontFamily="sans-serif-medium"
  android:text="@{viewModel.getHeader()}"
@@ -36,10 +37,11 @@
 
  <TextView
  android:id="@+id/view_all_text_view"
+ style="@style/TextViewCenterVertical"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginStart="8dp"
- android:layout_marginEnd="28dp"
+ android:layout_marginEnd="@dimen/promoted_story_list_layout_margin_end"
  android:fontFamily="sans-serif-medium"
  android:gravity="center_vertical"
  android:minHeight="48dp"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -390,6 +390,10 @@
  <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">72dp</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>
 

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -396,6 +396,10 @@
  <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">96dp</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>
 

diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -398,6 +398,10 @@
  <dimen name="section_title_text_view_layout_margin_top">32dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">120dp</dimen>
 
+ <!-- PromotedStoryList-->
+ <dimen name="promoted_story_list_layout_margin_end">120dp</dimen>
+ <dimen name="promoted_story_list_layout_margin_start">120dp</dimen>
+
  <!-- AudioLanguageFragment -->
  <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
 

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -67,8 +67,6 @@
  <dimen name="home_welcome_outer_padding">28dp</dimen>
  <dimen name="home_welcome_text_view_margin_end">4dp</dimen>
  <dimen name="home_inner_margin">8dp</dimen>
- <dimen name="home_tablet_land_outer_margin">96dp</dimen>
- <dimen name="home_tablet_port_outer_margin">120dp</dimen>
  <dimen name="recently_played_margin_max">28dp</dimen>
  <dimen name="recently_played_margin_min">8dp</dimen>
  <dimen name="coming_soon_padding_end">16dp</dimen>
@@ -588,6 +586,10 @@
  <dimen name="section_title_text_view_layout_margin_top">28dp</dimen>
  <dimen name="section_title_text_view_layout_margin_end">32dp</dimen>
 
+ <!-- PromotedStoryList-->
+ <dimen name="promoted_story_list_layout_margin_end">28dp</dimen>
+ <dimen name="promoted_story_list_layout_margin_start">28dp</dimen>
+
  <!-- AudioLanguageFragment -->
  <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>