Merge story_fragment.xml into single xml file oppia#3576

Removed story_fragment-land and story_fragment-sw600dp Applied Required Changes in dimens.xml
shivambh12 · Nov 16, 2021 · 9ed6f6e · 9ed6f6e
1 parent 7465b0b
commit 9ed6f6e
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 157 deletions.
diff --git a/app/src/main/res/layout-land/story_fragment.xml b/app/src/main/res/layout-land/story_fragment.xml
diff --git a/app/src/main/res/layout-sw600dp/story_fragment.xml b/app/src/main/res/layout-sw600dp/story_fragment.xml
diff --git a/app/src/main/res/layout/story_fragment.xml b/app/src/main/res/layout/story_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http:https://schemas.android.com/apk/res/android"
- xmlns:app="http:https://schemas.android.com/apk/res-auto">
+ xmlns:app="http:https://schemas.android.com/apk/res-auto"
+ xmlns:tools="http:https://schemas.android.com/tools">
 
  <data>
 
@@ -55,14 +56,18 @@
 
  <androidx.recyclerview.widget.RecyclerView
  android:id="@+id/story_chapter_list"
- android:layout_width="match_parent"
+ android:layout_width="@dimen/vertical_border_height"
  android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
  android:background="@color/white"
  android:clipToPadding="false"
  android:overScrollMode="never"
- android:paddingBottom="@dimen/bottom_white_space"
+ android:paddingBottom="@dimen/padding_bottom"
+ android:paddingStart="@dimen/story_padding_end"
+ android:paddingEnd="@dimen/story_padding_end"
  android:scrollbars="none"
- app:data="@{viewModel.storyChapterLiveData}" />
+ app:data="@{viewModel.storyChapterLiveData}"
+ tools:listitem="@layout/story_chapter_view" />
 
  <View
  android:id="@+id/story_shadow_view"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+ <!-- Story Fragment- land dimens. -->
+ <dimen name="padding_bottom">60dp</dimen>
+ <dimen name="custom_match_parent">-1px</dimen>
+ <dimen name="vertical_border_height">@dimen/custom_match_parent</dimen>
+ <dimen name="story_padding_end">1dp</dimen>
+
  <dimen name="home_padding_end">64dp</dimen>
  <dimen name="home_padding_start">64dp</dimen>
  <dimen name="home_outer_margin">72dp</dimen>

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+ <!-- Story Fragment dimens. -->
+ <dimen name="padding_bottom">160dp</dimen>
+ <dimen name="custom_match_parent">528dp</dimen>
+ <dimen name="vertical_border_height">@dimen/custom_match_parent</dimen>
+ <dimen name="story_padding_end">64dp</dimen>
+
  <dimen name="home_padding_end">64dp</dimen>
  <dimen name="home_padding_start">96dp</dimen>
  <dimen name="home_outer_margin">96dp</dimen>

diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+ <!-- Story Fragment dimens. -->
+ <dimen name="padding_bottom">160dp</dimen>
+ <dimen name="custom_match_parent">528dp</dimen>
+ <dimen name="vertical_border_height">@dimen/custom_match_parent</dimen>
+ <dimen name="story_padding_end">64dp</dimen>
+
  <dimen name="home_padding_end">96dp</dimen>
  <dimen name="home_padding_start">120dp</dimen>
  <dimen name="home_outer_margin">120dp</dimen>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+ <!-- Story Fragment dimens. -->
+ <dimen name="padding_bottom">160dp</dimen>
+ <dimen name="custom_match_parent">-1px</dimen>
+ <dimen name="vertical_border_height">@dimen/custom_match_parent</dimen>
+ <dimen name="story_padding_end">1dp</dimen>
+
  <!-- Default screen margins, per the Android Design guidelines. -->
  <dimen name="activity_horizontal_margin">16dp</dimen>
  <dimen name="activity_vertical_margin">16dp</dimen>