Fixes part of oppia#40: Added bottom padding to Question Player (oppi…

…a#3250) * Added bottom padding * Added TODO * Updated bottom padding * Updated bottom padding * Updated bottom padding correctly Co-authored-by: Rajat Talesra <[email protected]>
kritigupta45 · Jul 6, 2021 · 09e3692 · 09e3692
1 parent 31851ca
commit 09e3692
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/app/src/main/res/layout-land/question_player_fragment.xml b/app/src/main/res/layout-land/question_player_fragment.xml
@@ -59,6 +59,7 @@
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  app:data="@{viewModel.itemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toTopOf="@id/question_progress_bar"
@@ -70,9 +71,11 @@
  android:id="@+id/extra_interaction_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  android:visibility="@{viewModel.isSplitView ? View.VISIBLE : View.GONE}"
  app:data="@{viewModel.rightItemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

diff --git a/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml
@@ -55,10 +55,12 @@
  android:id="@+id/question_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
  android:paddingTop="24dp"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  app:data="@{viewModel.itemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toTopOf="@id/question_progress_bar"
@@ -70,10 +72,12 @@
  android:id="@+id/extra_interaction_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
  android:paddingTop="24dp"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  android:visibility="@{viewModel.isSplitView ? View.VISIBLE : View.GONE}"
  app:data="@{viewModel.rightItemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

diff --git a/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml
@@ -55,10 +55,12 @@
  android:id="@+id/question_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
  android:paddingTop="24dp"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  app:data="@{viewModel.itemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toTopOf="@id/question_progress_bar"
@@ -70,10 +72,12 @@
  android:id="@+id/extra_interaction_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
  android:paddingTop="24dp"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  android:visibility="@{viewModel.isSplitView ? View.VISIBLE : View.GONE}"
  app:data="@{viewModel.rightItemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

diff --git a/app/src/main/res/layout/question_player_fragment.xml b/app/src/main/res/layout/question_player_fragment.xml
@@ -55,9 +55,11 @@
  android:id="@+id/question_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  app:data="@{viewModel.itemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
  app:layout_constraintBottom_toTopOf="@id/question_progress_bar"
@@ -69,9 +71,11 @@
  android:id="@+id/extra_interaction_recycler_view"
  android:layout_width="0dp"
  android:layout_height="0dp"
+ android:clipToPadding="false"
  android:divider="@android:color/transparent"
  android:dividerHeight="8dp"
  android:overScrollMode="never"
+ android:paddingBottom="@dimen/general_screen_padding_bottom"
  android:visibility="@{viewModel.isSplitView ? View.VISIBLE : View.GONE}"
  app:data="@{viewModel.rightItemList}"
  app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -399,7 +399,7 @@
  <dimen name="faq_item_header_margin_bottom">8dp</dimen>
 
  <!-- General Bottom Padding -->
- <dimen name="general_screen_padding_bottom">160dp</dimen>
+ <dimen name="general_screen_padding_bottom">128dp</dimen>
 
  <!-- Profile Edit -->
  <dimen name="profile_edit_delete_margin_bottom">12dp</dimen>

diff --git a/.../sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/.../sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt
@@ -207,7 +207,7 @@ class QuestionPlayerActivityTest {
  }
  }
 
- @Test
+ @Test // TODO(#3370): Tests pass on Pixel 3 XL and fails on Pixel 3 because of screen size.
  fun testQuestionPlayer_landscape_forMisconception_showsLinkTextForConceptCard() {
  launchForSkillList(SKILL_ID_LIST).use {
  rotateToLandscape()
@@ -240,7 +240,7 @@ class QuestionPlayerActivityTest {
  }
  }
 
- @Test
+ @Test // TODO(#3370): Tests pass on Pixel 3 XL and fails on Pixel 3 because of screen size.
  @DisableAccessibilityChecks // TODO(#3362): Enable AccessibilityChecks
  fun testQuestionPlayer_landscape_forMisconception_clickLinkText_opensConceptCard() {
  launchForSkillList(SKILL_ID_LIST).use {