Skip to content

Commit

Permalink
Merge story_fragment.xml into single xml file #3576 (#3995)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
shivambh12 committed Jan 7, 2022
1 parent 5d278b2 commit 8a86210
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 84 deletions.
76 changes: 0 additions & 76 deletions app/src/main/res/layout-land/story_fragment.xml

This file was deleted.

8 changes: 5 additions & 3 deletions app/src/main/res/layout-sw600dp/story_fragment.xml
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions app/src/main/res/layout/story_fragment.xml
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values-land/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 3 additions & 1 deletion app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 8a86210

Please sign in to comment.