From 9d8606ab1b1e7eca29f45803ea2c39d05f2454b1 Mon Sep 17 00:00:00 2001
From: Arjun Gupta <arjupta.90@gmail.com>
Date: Thu, 19 Nov 2020 11:35:56 +0530
Subject: [PATCH] Fix part of #2003: Replacing space_128dp (#2111)

* Fixes part of #2003: Replacing space_128dp

This PR replaces the use of space_128dp with dimensions of contextful names

* Failing Tests

* Overriding for sw600dp-port

* Failing Tests
---
 .../res/layout-sw600dp-port/content_item.xml  |  4 +--
 .../continue_interaction_item.xml             |  4 +--
 .../continue_navigation_button_item.xml       |  4 +--
 .../drag_drop_interaction_item.xml            |  4 +--
 .../res/layout-sw600dp-port/feedback_item.xml |  4 +--
 .../fraction_interaction_item.xml             |  4 +--
 .../layout-sw600dp-port/next_button_item.xml  |  4 +--
 .../numeric_input_interaction_item.xml        |  4 +--
 .../previous_button_item.xml                  |  2 +-
 .../replay_button_item.xml                    |  8 ++---
 .../return_to_topic_button_item.xml           |  8 ++---
 .../selection_interaction_item.xml            |  4 +--
 .../layout-sw600dp-port/state_fragment.xml    |  6 ++--
 .../submit_button_item.xml                    |  4 +--
 .../submitted_answer_item.xml                 |  4 +--
 .../text_input_interaction_item.xml           |  4 +--
 .../main/res/values-sw600dp-port/dimens.xml   | 35 +++++++++++++++++++
 app/src/main/res/values/dimens.xml            | 22 +++++++++++-
 18 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp-port/content_item.xml b/app/src/main/res/layout-sw600dp-port/content_item.xml
index a167240b7fb..a7b6c9a1b40 100644
--- a/app/src/main/res/layout-sw600dp-port/content_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/content_item.xml
@@ -50,8 +50,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    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}"
diff --git a/app/src/main/res/layout-sw600dp-port/continue_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/continue_interaction_item.xml
index de5df1802c4..8d43c409725 100644
--- a/app/src/main/res/layout-sw600dp-port/continue_interaction_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/continue_interaction_item.xml
@@ -46,8 +46,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/continue_interaction_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/continue_interaction_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/continue_item_question_view_margin_top}"
     app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/continue_navigation_button_item.xml b/app/src/main/res/layout-sw600dp-port/continue_navigation_button_item.xml
index 6eab96f52d2..19a2f1619d5 100644
--- a/app/src/main/res/layout-sw600dp-port/continue_navigation_button_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/continue_navigation_button_item.xml
@@ -46,8 +46,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/continue_navigation_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/continue_navigation_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/continue_navigation_item_question_view_margin_top}"
     app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml
index 176d76b6280..ffe8d744361 100644
--- a/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/drag_drop_interaction_item.xml
@@ -41,8 +41,8 @@
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/drag_drop_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/drag_drop_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/space_24dp}">
 
     <TextView
diff --git a/app/src/main/res/layout-sw600dp-port/feedback_item.xml b/app/src/main/res/layout-sw600dp-port/feedback_item.xml
index 30697dbf801..e2add89c289 100644
--- a/app/src/main/res/layout-sw600dp-port/feedback_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/feedback_item.xml
@@ -48,8 +48,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/feedback_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/feedback_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/space_24dp}"
     app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/fraction_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/fraction_interaction_item.xml
index ea82d6a291f..8ff89159400 100644
--- a/app/src/main/res/layout-sw600dp-port/fraction_interaction_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/fraction_interaction_item.xml
@@ -20,8 +20,8 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:padding="0dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/space_128dp}"
-    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/space_128dp}">
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/fraction_interaction_item_non_conversation_view_margin_end}"
+    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/fraction_interaction_item_non_conversation_view_margin_start}">
 
     <org.oppia.android.app.customview.interaction.FractionInputInteractionView
       android:id="@+id/fraction_input_interaction_view"
diff --git a/app/src/main/res/layout-sw600dp-port/next_button_item.xml b/app/src/main/res/layout-sw600dp-port/next_button_item.xml
index 12a1f6950f8..d2dfdda5a8b 100644
--- a/app/src/main/res/layout-sw600dp-port/next_button_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/next_button_item.xml
@@ -47,8 +47,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/next_button_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/next_button_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/next_button_item_question_view_margin_top}"
     app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/numeric_input_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/numeric_input_interaction_item.xml
index 02234179bb9..7d21ed60ddf 100644
--- a/app/src/main/res/layout-sw600dp-port/numeric_input_interaction_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/numeric_input_interaction_item.xml
@@ -20,8 +20,8 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:padding="0dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/space_128dp}"
-    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/space_128dp}">
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/numeric_input_interaction_item_non_conversation_view_margin_end}"
+    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/numeric_input_interaction_item_non_conversation_view_margin_start}">
 
     <org.oppia.android.app.customview.interaction.NumericInputInteractionView
       android:id="@+id/numeric_input_interaction_view"
diff --git a/app/src/main/res/layout-sw600dp-port/previous_button_item.xml b/app/src/main/res/layout-sw600dp-port/previous_button_item.xml
index 5b11a272216..b1f8d89f6ff 100644
--- a/app/src/main/res/layout-sw600dp-port/previous_button_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/previous_button_item.xml
@@ -48,7 +48,7 @@
     app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
     app:questionViewMarginEnd="@{@dimen/space_0dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginStart="@{@dimen/previous_button_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/previous_button_item_question_view_margin_top}"
     app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/replay_button_item.xml b/app/src/main/res/layout-sw600dp-port/replay_button_item.xml
index 288ef037bc9..237e7dca563 100644
--- a/app/src/main/res/layout-sw600dp-port/replay_button_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/replay_button_item.xml
@@ -25,8 +25,8 @@
     app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:explorationViewMarginApplicable="@{buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/space_128dp}"
-    app:explorationViewMarginStart="@{@dimen/space_128dp}"
+    app:explorationViewMarginEnd="@{@dimen/replay_button_item_exploration_view_margin_end}"
+    app:explorationViewMarginStart="@{@dimen/replay_button_item_exploration_view_margin_start}"
     app:explorationViewMarginTop="@{@dimen/replay_button_item_exploration_view_margin_top}"
     app:explorationViewPaddingApplicable="@{buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:explorationViewPaddingBottom="@{@dimen/space_0dp}"
@@ -45,8 +45,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/replay_button_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/replay_button_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/replay_button_item_question_view_margin_top}"
     app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/return_to_topic_button_item.xml b/app/src/main/res/layout-sw600dp-port/return_to_topic_button_item.xml
index 1fe3f47ea34..d651c572825 100644
--- a/app/src/main/res/layout-sw600dp-port/return_to_topic_button_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/return_to_topic_button_item.xml
@@ -27,8 +27,8 @@
     app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:explorationViewMarginApplicable="@{buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/space_128dp}"
-    app:explorationViewMarginStart="@{@dimen/space_128dp}"
+    app:explorationViewMarginEnd="@{@dimen/return_to_topic_button_item_exploration_view_margin_end}"
+    app:explorationViewMarginStart="@{@dimen/return_to_topic_button_item_exploration_view_margin_start}"
     app:explorationViewMarginTop="@{@dimen/return_to_topic_item_exploration_view_margin_top}"
     app:explorationViewPaddingApplicable="@{buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:explorationViewPaddingBottom="@{@dimen/space_0dp}"
@@ -47,8 +47,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/return_to_topic_button_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/return_to_topic_button_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/space_12dp}"
     app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/selection_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/selection_interaction_item.xml
index 52d4b3b676c..44a2742c8bb 100644
--- a/app/src/main/res/layout-sw600dp-port/selection_interaction_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/selection_interaction_item.xml
@@ -25,8 +25,8 @@
     android:orientation="vertical"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/space_128dp}"
-    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/space_128dp}">
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/selection_interaction_item_non_conversation_view_margin_end}"
+    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/selection_interaction_item_non_conversation_view_margin_start}">
 
     <TextView
       android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout-sw600dp-port/state_fragment.xml b/app/src/main/res/layout-sw600dp-port/state_fragment.xml
index b0251226be4..5d037b2d44f 100644
--- a/app/src/main/res/layout-sw600dp-port/state_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/state_fragment.xml
@@ -72,8 +72,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/space_128dp}"
-        app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/space_128dp}"
+        app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/state_fragment_non_split_view_margin_end}"
+        app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/state_fragment_non_split_view_margin_start}"
         app:layout_constraintEnd_toStartOf="@id/center_guideline"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -89,7 +89,7 @@
     <FrameLayout
       android:id="@+id/hints_and_solution_fragment_placeholder"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"></FrameLayout>
+      android:layout_height="match_parent"/>
 
     <FrameLayout
       android:id="@+id/hints_and_solution_fragment_container"
diff --git a/app/src/main/res/layout-sw600dp-port/submit_button_item.xml b/app/src/main/res/layout-sw600dp-port/submit_button_item.xml
index e977699d3cb..c888fb339aa 100644
--- a/app/src/main/res/layout-sw600dp-port/submit_button_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/submit_button_item.xml
@@ -47,8 +47,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/submit_button_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/submit_button_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/submit_button_item_question_view_margin_top}"
     app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; !buttonViewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml b/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
index 4b49a829934..cdce73ca6a0 100644
--- a/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
@@ -54,8 +54,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_128dp}"
-    app:questionViewMarginStart="@{@dimen/space_128dp}"
+    app:questionViewMarginEnd="@{@dimen/submitted_answer_item_question_view_margin_end}"
+    app:questionViewMarginStart="@{@dimen/submitted_answer_item_question_view_margin_start}"
     app:questionViewMarginTop="@{@dimen/space_24dp}"
     app:questionViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewPaddingBottom="@{@dimen/space_0dp}"
diff --git a/app/src/main/res/layout-sw600dp-port/text_input_interaction_item.xml b/app/src/main/res/layout-sw600dp-port/text_input_interaction_item.xml
index d15a9ae0f2d..041e8507cea 100644
--- a/app/src/main/res/layout-sw600dp-port/text_input_interaction_item.xml
+++ b/app/src/main/res/layout-sw600dp-port/text_input_interaction_item.xml
@@ -18,8 +18,8 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:padding="0dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/space_128dp}"
-    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/space_128dp}">
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_112dp : @dimen/text_input_interaction_item_non_conversation_view_margin_end}"
+    app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_144dp : @dimen/text_input_interaction_item_non_conversation_view_margin_start}">
 
     <org.oppia.android.app.customview.interaction.TextInputInteractionView
       android:id="@+id/text_input_interaction_view"
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index c464910b32d..9ad146adf8f 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -9,4 +9,39 @@
 
   <dimen name="previous_responses_item_question_split_view_margin_end">48dp</dimen>
   <dimen name="previous_responses_item_exploration_split_view_margin_end">48dp</dimen>
+  <dimen name="previous_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="content_item_question_view_margin_end">128dp</dimen>
+  <dimen name="content_item_question_view_margin_start">128dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_end">128dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_start">128dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_end">128dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_start">128dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_end">128dp</dimen>
+  <dimen name="drag_drop_item_question_view_margin_start">128dp</dimen>
+  <dimen name="feedback_item_question_view_margin_end">128dp</dimen>
+  <dimen name="feedback_item_question_view_margin_start">128dp</dimen>
+  <dimen name="fraction_interaction_item_non_conversation_view_margin_end">128dp</dimen>
+  <dimen name="fraction_interaction_item_non_conversation_view_margin_start">128dp</dimen>
+  <dimen name="next_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="next_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="numeric_input_interaction_item_non_conversation_view_margin_end">128dp</dimen>
+  <dimen name="numeric_input_interaction_item_non_conversation_view_margin_start">128dp</dimen>
+  <dimen name="replay_button_item_exploration_view_margin_end">128dp</dimen>
+  <dimen name="replay_button_item_exploration_view_margin_start">128dp</dimen>
+  <dimen name="replay_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="replay_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="return_to_topic_button_item_exploration_view_margin_end">128dp</dimen>
+  <dimen name="return_to_topic_button_item_exploration_view_margin_start">128dp</dimen>
+  <dimen name="return_to_topic_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="return_to_topic_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="selection_interaction_item_non_conversation_view_margin_end">128dp</dimen>
+  <dimen name="selection_interaction_item_non_conversation_view_margin_start">128dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_end">128dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_start">128dp</dimen>
+  <dimen name="submit_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="submit_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_end">128dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_start">128dp</dimen>
+  <dimen name="text_input_interaction_item_non_conversation_view_margin_end">128dp</dimen>
+  <dimen name="text_input_interaction_item_non_conversation_view_margin_start">128dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d979b3e83ee..b096872cbf1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,7 +15,6 @@
   <dimen name="divider_margin_top">8dp</dimen>
   <dimen name="divider_margin_bottom">8dp</dimen>
   <dimen name="bottom_white_space">160dp</dimen>
-  <dimen name="space_128dp">128dp</dimen>
   <dimen name="space_32dp">32dp</dimen>
   <dimen name="space_24dp">24dp</dimen>
   <dimen name="space_16dp">16dp</dimen>
@@ -85,6 +84,27 @@
   <dimen name="walkthrough_final_no_button_margin_end">8dp</dimen>
   <dimen name="walkthrough_final_yes_button_margin_start">8dp</dimen>
 
+  <dimen name="continue_interaction_item_question_view_margin_end">128dp</dimen>
+  <dimen name="continue_interaction_item_question_view_margin_start">128dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_end">128dp</dimen>
+  <dimen name="continue_navigation_item_question_view_margin_start">128dp</dimen>
+  <dimen name="next_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="next_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="replay_button_item_exploration_view_margin_end">128dp</dimen>
+  <dimen name="replay_button_item_exploration_view_margin_start">128dp</dimen>
+  <dimen name="replay_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="replay_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="return_to_topic_button_item_exploration_view_margin_end">128dp</dimen>
+  <dimen name="return_to_topic_button_item_exploration_view_margin_start">128dp</dimen>
+  <dimen name="return_to_topic_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="return_to_topic_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_end">128dp</dimen>
+  <dimen name="state_fragment_non_split_view_margin_start">128dp</dimen>
+  <dimen name="submit_button_item_question_view_margin_end">128dp</dimen>
+  <dimen name="submit_button_item_question_view_margin_start">128dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_end">128dp</dimen>
+  <dimen name="submitted_answer_item_question_view_margin_start">128dp</dimen>
+
   <dimen name="continue_item_exploration_split_view_margin_end">64dp</dimen>
   <dimen name="continue_item_question_split_view_margin_end">64dp</dimen>
   <dimen name="continue_navigation_item_exploration_split_view_margin_end">64dp</dimen>