From 8a8621008c1e20898da0dfaecdcab36bcb9376cf Mon Sep 17 00:00:00 2001
From: Shivam Bhardwaj <89182224+shivambh12@users.noreply.github.com>
Date: Sat, 8 Jan 2022 01:19:57 +0530
Subject: [PATCH] Merge story_fragment.xml into single xml file #3576 (#3995)

* Merge story_fragment.xml into single xml file #3576
Removed story_fragment-land and story_fragment-sw600dp
Applied Required Changes in dimens.xml

* Added layout-sw600dp/story_fragment.xml
And Applied Required Changes to dimen.xml

* Extra spaces removed and new values declared at bottom

* Asked Changes Applied.

* Asked Changes Apllied.

* Asked Changes Added.

* Nit Change
---
 .../main/res/layout-land/story_fragment.xml   | 76 -------------------
 .../res/layout-sw600dp/story_fragment.xml     |  8 +-
 app/src/main/res/layout/story_fragment.xml    |  9 ++-
 app/src/main/res/values-land/dimens.xml       |  4 +-
 app/src/main/res/values/dimens.xml            |  4 +-
 5 files changed, 17 insertions(+), 84 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/story_fragment.xml

diff --git a/app/src/main/res/layout-land/story_fragment.xml b/app/src/main/res/layout-land/story_fragment.xml
deleted file mode 100644
index c74d50d42b6..00000000000
--- a/app/src/main/res/layout-land/story_fragment.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.story.StoryViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/topic_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/story_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:fontFamily="sans-serif"
-        android:gravity="center_vertical"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
-        app:navigationIcon="?attr/homeAsUpIndicator">
-
-        <TextView
-          android:id="@+id/story_toolbar_title"
-          style="@style/MarqueeToolbarTitleTextView"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="20dp"
-          android:text="@{viewModel.storyNameLiveData}" />
-      </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/topic_app_bar_layout">
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/story_chapter_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white"
-        android:clipToPadding="false"
-        android:overScrollMode="never"
-        android:paddingBottom="60dp"
-        android:scrollbars="none"
-        app:data="@{viewModel.storyChapterLiveData}"
-        tools:listitem="@layout/story_chapter_view" />
-
-      <View
-        android:id="@+id/story_shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp/story_fragment.xml b/app/src/main/res/layout-sw600dp/story_fragment.xml
index 25263f12269..81a860ae9e2 100644
--- a/app/src/main/res/layout-sw600dp/story_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/story_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -61,11 +62,12 @@
         android:background="@color/white"
         android:clipToPadding="false"
         android:overScrollMode="never"
+        android:paddingBottom="@dimen/story_fragment_padding_bottom"
         android:paddingStart="64dp"
         android:paddingEnd="64dp"
-        android:paddingBottom="@dimen/bottom_white_space"
         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/layout/story_fragment.xml b/app/src/main/res/layout/story_fragment.xml
index 92af858b737..3c3746ba720 100644
--- 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://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <data>
 
@@ -57,12 +58,14 @@
         android:id="@+id/story_chapter_list"
         android:layout_width="match_parent"
         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/story_fragment_padding_bottom"
         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
index e1d3796248e..1f9a370a128 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -392,5 +392,7 @@
 
   <!-- AudioLanguageFragment -->
   <dimen name="audio_language_recycler_view_padding_bottom">96dp</dimen>
-
+  
+  <!-- StoryFragment -->
+  <dimen name="story_fragment_padding_bottom">60dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 6a40dc53c4f..77a9131d321 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -590,5 +590,7 @@
 
   <!-- AudioLanguageFragment -->
   <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>
-
+   
+  <!-- StoryFragment -->
+  <dimen name="story_fragment_padding_bottom">160dp</dimen>
 </resources>