Fixes part of oppia#3362: Fix test cases for AccessibilityChecks (opp…

…ia#3372) * Fixes some A11yChecks failure * Nit fix Co-authored-by: Rajat Talesra <[email protected]>
kritigupta45 · Jun 24, 2021 · 0a3cdb6 · 0a3cdb6
1 parent 847d52c
commit 0a3cdb6
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 116 deletions.
diff --git a/app/src/main/res/layout-land/story_fragment.xml b/app/src/main/res/layout-land/story_fragment.xml
@@ -46,6 +46,7 @@
  android:focusableInTouchMode="true"
  android:fontFamily="sans-serif"
  android:marqueeRepeatLimit="1"
+ android:minHeight="48dp"
  android:requiresFadingEdge="horizontal"
  android:scrollHorizontally="true"
  android:singleLine="true"

diff --git a/app/src/main/res/layout-sw600dp/story_fragment.xml b/app/src/main/res/layout-sw600dp/story_fragment.xml
@@ -45,6 +45,7 @@
  android:focusableInTouchMode="true"
  android:fontFamily="sans-serif"
  android:marqueeRepeatLimit="1"
+ android:minHeight="48dp"
  android:requiresFadingEdge="horizontal"
  android:scrollHorizontally="true"
  android:singleLine="true"

diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml
@@ -23,41 +23,21 @@
  app:explorationSplitViewMarginEnd="@{@dimen/content_item_exploration_split_view_margin_end}"
  app:explorationSplitViewMarginStart="@{@dimen/content_item_exploration_split_view_margin_start}"
  app:explorationSplitViewMarginTop="@{@dimen/content_item_exploration_split_view_margin_top}"
- app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
- app:explorationSplitViewPaddingBottom="@{@dimen/content_item_exploration_split_view_padding_bottom}"
- app:explorationSplitViewPaddingEnd="@{@dimen/content_item_exploration_split_view_padding_end}"
- app:explorationSplitViewPaddingStart="@{@dimen/content_item_exploration_split_view_padding_start}"
- app:explorationSplitViewPaddingTop="@{@dimen/content_item_exploration_split_view_padding_top}"
  app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
  app:explorationViewMarginBottom="@{@dimen/space_0dp}"
  app:explorationViewMarginEnd="@{@dimen/content_item_exploration_view_margin_end}"
  app:explorationViewMarginStart="@{@dimen/content_item_exploration_view_margin_start}"
  app:explorationViewMarginTop="@{@dimen/content_item_exploration_view_margin_top}"
- app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
- app:explorationViewPaddingBottom="@{@dimen/content_item_exploration_view_padding_bottom}"
- app:explorationViewPaddingEnd="@{@dimen/content_item_exploration_view_padding_end}"
- app:explorationViewPaddingStart="@{@dimen/content_item_exploration_view_padding_start}"
- app:explorationViewPaddingTop="@{@dimen/content_item_exploration_view_padding_top}"
  app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
  app:questionSplitViewMarginBottom="@{@dimen/content_item_question_split_view_margin_bottom}"
  app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
  app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
  app:questionSplitViewMarginTop="@{@dimen/content_item_question_split_view_margin_top}"
- app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
- app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
- app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}"
- app:questionSplitViewPaddingStart="@{@dimen/space_0dp}"
- app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
  app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
  app:questionViewMarginBottom="@{@dimen/content_item_question_view_margin_bottom}"
  app:questionViewMarginEnd="@{@dimen/content_item_question_view_margin_end}"
  app:questionViewMarginStart="@{@dimen/content_item_question_view_margin_start}"
- app:questionViewMarginTop="@{@dimen/content_item_question_view_margin_top}"
- app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
- app:questionViewPaddingBottom="@{@dimen/space_0dp}"
- app:questionViewPaddingEnd="@{@dimen/space_0dp}"
- app:questionViewPaddingStart="@{@dimen/space_0dp}"
- app:questionViewPaddingTop="@{@dimen/space_0dp}">
+ app:questionViewMarginTop="@{@dimen/content_item_question_view_margin_top}">
 
  <TextView
  android:id="@+id/content_text_view"
@@ -68,6 +48,16 @@
  android:text="@{htmlContent}"
  android:textColor="@color/oppiaPrimaryText"
  android:textSize="16sp"
- android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}" />
+ android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
+ app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
+ app:explorationSplitViewPaddingBottom="@{@dimen/content_item_exploration_split_view_padding_bottom}"
+ app:explorationSplitViewPaddingEnd="@{@dimen/content_item_exploration_split_view_padding_end}"
+ app:explorationSplitViewPaddingStart="@{@dimen/content_item_exploration_split_view_padding_start}"
+ app:explorationSplitViewPaddingTop="@{@dimen/content_item_exploration_split_view_padding_top}"
+ app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
+ app:explorationViewPaddingBottom="@{@dimen/content_item_exploration_view_padding_bottom}"
+ app:explorationViewPaddingEnd="@{@dimen/content_item_exploration_view_padding_end}"
+ app:explorationViewPaddingStart="@{@dimen/content_item_exploration_view_padding_start}"
+ app:explorationViewPaddingTop="@{@dimen/content_item_exploration_view_padding_top}" />
  </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/exploration_activity.xml b/app/src/main/res/layout/exploration_activity.xml
@@ -44,6 +44,7 @@
  android:layout_height="wrap_content"
  android:layout_marginEnd="20dp"
  android:layout_weight="1"
+ android:minHeight="48dp"
  android:ellipsize="marquee"
  android:fadingEdge="horizontal"
  android:fadingEdgeLength="20dp"

diff --git a/app/src/main/res/layout/feedback_item.xml b/app/src/main/res/layout/feedback_item.xml
@@ -23,41 +23,21 @@
  app:explorationSplitViewMarginEnd="@{@dimen/feedback_item_exploration_split_view_margin_end}"
  app:explorationSplitViewMarginStart="@{@dimen/feedback_item_exploration_split_view_margin_start}"
  app:explorationSplitViewMarginTop="@{@dimen/feedback_item_exploration_split_view_margin_top}"
- app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
- app:explorationSplitViewPaddingBottom="@{@dimen/feedback_item_exploration_split_view_padding_bottom}"
- app:explorationSplitViewPaddingEnd="@{@dimen/feedback_item_exploration_split_view_padding_end}"
- app:explorationSplitViewPaddingStart="@{@dimen/feedback_item_exploration_split_view_padding_start}"
- app:explorationSplitViewPaddingTop="@{@dimen/feedback_item_exploration_split_view_padding_top}"
  app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
  app:explorationViewMarginBottom="@{@dimen/space_0dp}"
  app:explorationViewMarginEnd="@{@dimen/feedback_item_exploration_view_margin_end}"
  app:explorationViewMarginStart="@{@dimen/feedback_item_exploration_view_margin_start}"
  app:explorationViewMarginTop="@{@dimen/feedback_item_exploration_view_margin_top}"
- app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
- app:explorationViewPaddingBottom="@{@dimen/feedback_item_exploration_view_padding_bottom}"
- app:explorationViewPaddingEnd="@{@dimen/feedback_item_exploration_view_padding_end}"
- app:explorationViewPaddingStart="@{@dimen/feedback_item_exploration_view_padding_start}"
- app:explorationViewPaddingTop="@{@dimen/feedback_item_exploration_view_padding_top}"
  app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
  app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
  app:questionSplitViewMarginEnd="@{@dimen/feedback_item_question_split_view_margin_end}"
  app:questionSplitViewMarginStart="@{@dimen/feedback_item_question_split_view_margin_start}"
  app:questionSplitViewMarginTop="@{@dimen/feedback_item_question_split_view_margin_top}"
- app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
- app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
- app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}"
- app:questionSplitViewPaddingStart="@{@dimen/space_0dp}"
- app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
  app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
  app:questionViewMarginBottom="@{@dimen/space_0dp}"
  app:questionViewMarginEnd="@{@dimen/feedback_item_question_view_margin_end}"
  app:questionViewMarginStart="@{@dimen/feedback_item_question_view_margin_start}"
- app:questionViewMarginTop="@{@dimen/feedback_item_question_view_margin_top}"
- app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
- app:questionViewPaddingBottom="@{@dimen/space_0dp}"
- app:questionViewPaddingEnd="@{@dimen/space_0dp}"
- app:questionViewPaddingStart="@{@dimen/space_0dp}"
- app:questionViewPaddingTop="@{@dimen/space_0dp}">
+ app:questionViewMarginTop="@{@dimen/feedback_item_question_view_margin_top}">
 
  <TextView
  android:id="@+id/feedback_text_view"
@@ -68,6 +48,16 @@
  android:text="@{htmlContent}"
  android:textColor="@color/oppiaPrimaryText"
  android:textSize="16sp"
- android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}" />
+ android:visibility="@{htmlContent.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
+ app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
+ app:explorationSplitViewPaddingBottom="@{@dimen/feedback_item_exploration_split_view_padding_bottom}"
+ app:explorationSplitViewPaddingEnd="@{@dimen/feedback_item_exploration_split_view_padding_end}"
+ app:explorationSplitViewPaddingStart="@{@dimen/feedback_item_exploration_split_view_padding_start}"
+ app:explorationSplitViewPaddingTop="@{@dimen/feedback_item_exploration_split_view_padding_top}"
+ app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
+ app:explorationViewPaddingBottom="@{@dimen/feedback_item_exploration_view_padding_bottom}"
+ app:explorationViewPaddingEnd="@{@dimen/feedback_item_exploration_view_padding_end}"
+ app:explorationViewPaddingStart="@{@dimen/feedback_item_exploration_view_padding_start}"
+ app:explorationViewPaddingTop="@{@dimen/feedback_item_exploration_view_padding_top}" />
  </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/revision_card_activity.xml b/app/src/main/res/layout/revision_card_activity.xml
@@ -40,6 +40,7 @@
  android:focusableInTouchMode="true"
  android:fontFamily="sans-serif"
  android:marqueeRepeatLimit="1"
+ android:minHeight="48dp"
  android:requiresFadingEdge="horizontal"
  android:scrollHorizontally="true"
  android:singleLine="true"

diff --git a/app/src/main/res/layout/story_fragment.xml b/app/src/main/res/layout/story_fragment.xml
@@ -45,6 +45,7 @@
  android:focusableInTouchMode="true"
  android:fontFamily="sans-serif"
  android:marqueeRepeatLimit="1"
+ android:minHeight="48dp"
  android:requiresFadingEdge="horizontal"
  android:scrollHorizontally="true"
  android:singleLine="true"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -68,9 +68,9 @@
  <dimen name="content_item_exploration_view_margin_end">80dp</dimen>
 
  <dimen name="content_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="content_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Content Item: Question Split View -->
  <dimen name="content_item_question_split_view_margin_start">32dp</dimen>
@@ -100,9 +100,9 @@
  <dimen name="feedback_item_exploration_view_margin_end">80dp</dimen>
 
  <dimen name="feedback_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="feedback_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Feedback Item: Question Split View -->
  <dimen name="feedback_item_question_split_view_margin_start">32dp</dimen>

diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -87,9 +87,9 @@
  <dimen name="content_item_exploration_view_margin_end">208dp</dimen>
 
  <dimen name="content_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="content_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Content Item: Question Split View -->
  <dimen name="content_item_question_split_view_margin_start">32dp</dimen>
@@ -119,9 +119,9 @@
  <dimen name="feedback_item_exploration_view_margin_end">208dp</dimen>
 
  <dimen name="feedback_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="feedback_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Feedback Item: Question Split View -->
  <dimen name="feedback_item_question_split_view_margin_start">32dp</dimen>

diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -90,9 +90,9 @@
  <dimen name="content_item_exploration_view_margin_end">144dp</dimen>
 
  <dimen name="content_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="content_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Content Item: Question Split View -->
  <dimen name="content_item_question_split_view_margin_start">32dp</dimen>
@@ -122,9 +122,9 @@
  <dimen name="feedback_item_exploration_view_margin_end">144dp</dimen>
 
  <dimen name="feedback_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="feedback_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Feedback Item: Question Split View -->
  <dimen name="feedback_item_question_split_view_margin_start">32dp</dimen>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -212,19 +212,19 @@
  <dimen name="content_item_exploration_split_view_margin_end">40dp</dimen>
 
  <dimen name="content_item_exploration_split_view_padding_start">12dp</dimen>
- <dimen name="content_item_exploration_split_view_padding_top">12dp</dimen>
+ <dimen name="content_item_exploration_split_view_padding_top">16dp</dimen>
  <dimen name="content_item_exploration_split_view_padding_end">12dp</dimen>
- <dimen name="content_item_exploration_split_view_padding_bottom">12dp</dimen>
+ <dimen name="content_item_exploration_split_view_padding_bottom">16dp</dimen>
 
  <!-- Content Item: Exploration View -->
  <dimen name="content_item_exploration_view_margin_start">24dp</dimen>
  <dimen name="content_item_exploration_view_margin_top">24dp</dimen>
  <dimen name="content_item_exploration_view_margin_end">40dp</dimen>
 
  <dimen name="content_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="content_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="content_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="content_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Content Item: Question Split View -->
  <dimen name="content_item_question_split_view_margin_start">32dp</dimen>
@@ -244,19 +244,19 @@
  <dimen name="feedback_item_exploration_split_view_margin_end">40dp</dimen>
 
  <dimen name="feedback_item_exploration_split_view_padding_start">12dp</dimen>
- <dimen name="feedback_item_exploration_split_view_padding_top">12dp</dimen>
+ <dimen name="feedback_item_exploration_split_view_padding_top">16dp</dimen>
  <dimen name="feedback_item_exploration_split_view_padding_end">12dp</dimen>
- <dimen name="feedback_item_exploration_split_view_padding_bottom">12dp</dimen>
+ <dimen name="feedback_item_exploration_split_view_padding_bottom">16dp</dimen>
 
  <!-- Feedback Item: Exploration View -->
  <dimen name="feedback_item_exploration_view_margin_start">24dp</dimen>
  <dimen name="feedback_item_exploration_view_margin_top">24dp</dimen>
  <dimen name="feedback_item_exploration_view_margin_end">40dp</dimen>
 
  <dimen name="feedback_item_exploration_view_padding_start">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_top">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_top">16dp</dimen>
  <dimen name="feedback_item_exploration_view_padding_end">12dp</dimen>
- <dimen name="feedback_item_exploration_view_padding_bottom">12dp</dimen>
+ <dimen name="feedback_item_exploration_view_padding_bottom">16dp</dimen>
 
  <!-- Feedback Item: Question Split View -->
  <dimen name="feedback_item_question_split_view_margin_start">32dp</dimen>