Fix part of #2003: Replacing space_32dp (#2121)

* Fix part of #2003: Replacing space_32dp Fixes part of #2003 This PR replaces the use of space_32dp with the dimensions having contextful names. * Resloving conflicts * Overiding dimensions
oppia · Nov 21, 2020 · 9581bff · 9581bff
1 parent 10a297c
commit 9581bff
Show file tree

Hide file tree

Showing 29 changed files with 157 additions and 85 deletions.
diff --git a/app/src/main/res/layout-land/content_item.xml b/app/src/main/res/layout-land/content_item.xml
@@ -40,8 +40,8 @@
     app:explorationViewPaddingTop="@{@dimen/space_16dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_16dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
@@ -52,7 +52,7 @@
     app:questionViewMarginBottom="@{@dimen/space_16dp}"
     app:questionViewMarginEnd="@{@dimen/content_item_question_view_margin_end}"
     app:questionViewMarginStart="@{@dimen/content_item_question_view_margin_start}"
-    app:questionViewMarginTop="@{@dimen/space_32dp}"
+    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}"

diff --git a/app/src/main/res/layout-land/drag_drop_interaction_item.xml b/app/src/main/res/layout-land/drag_drop_interaction_item.xml
@@ -26,8 +26,8 @@
     android:padding="0dp"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:explorationSplitViewMarginEnd="@{@dimen/drag_drop_item_exploration_split_view_margin_end}"
+    app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
@@ -36,8 +36,8 @@
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-land/feedback_item.xml b/app/src/main/res/layout-land/feedback_item.xml
@@ -40,8 +40,8 @@
     app:explorationViewPaddingTop="@{@dimen/space_16dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/feedback_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/feedback_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-land/submitted_answer_item.xml b/app/src/main/res/layout-land/submitted_answer_item.xml
@@ -34,8 +34,8 @@
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/submitted_answer_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/submitted_answer_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-sw600dp-land/content_item.xml b/app/src/main/res/layout-sw600dp-land/content_item.xml
@@ -40,8 +40,8 @@
     app:explorationViewPaddingTop="@{@dimen/space_16dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-sw600dp-land/drag_drop_interaction_item.xml b/app/src/main/res/layout-sw600dp-land/drag_drop_interaction_item.xml
@@ -26,8 +26,8 @@
     android:padding="0dp"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:explorationSplitViewMarginEnd="@{@dimen/drag_drop_item_exploration_split_view_margin_end}"
+    app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
@@ -36,8 +36,8 @@
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-sw600dp-land/feedback_item.xml b/app/src/main/res/layout-sw600dp-land/feedback_item.xml
@@ -39,8 +39,8 @@
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:questionSplitViewMarginEnd="@{@dimen/space_40dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginTop="@{@dimen/space_32dp}"
+    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}"

diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml
@@ -58,7 +58,7 @@
         android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
         android:orientation="vertical"
         app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}">
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_margin_start_profile_not_added}">
 
         <TextView
           android:id="@+id/add_profile_text"

diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml
@@ -61,7 +61,7 @@
         android:singleLine="false"
         android:text="@{viewModel.profile.name}"
         android:textColor="@color/white"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
         app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}" />
 
       <TextView
@@ -76,7 +76,7 @@
         android:textSize="16sp"
         android:textStyle="italic"
         android:visibility="@{viewModel.profile.lastLoggedInTimestampMs > 0 ? View.VISIBLE : View.GONE}"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
         app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_4dp}"
         profile:lastVisited="@{viewModel.profile.lastLoggedInTimestampMs}" />
 
@@ -93,7 +93,7 @@
         android:textSize="16sp"
         android:textStyle="italic"
         android:visibility="@{viewModel.profile.isAdmin &amp;&amp; hasProfileEverBeenAddedValue ? View.VISIBLE : View.GONE}"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
         app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}" />
     </LinearLayout>
 

diff --git a/app/src/main/res/layout-sw600dp-port/content_item.xml b/app/src/main/res/layout-sw600dp-port/content_item.xml
@@ -40,8 +40,8 @@
     app:explorationViewPaddingTop="@{@dimen/space_16dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@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
@@ -26,8 +26,8 @@
     android:padding="0dp"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:explorationSplitViewMarginEnd="@{@dimen/drag_drop_item_exploration_split_view_margin_end}"
+    app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
@@ -36,8 +36,8 @@
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-sw600dp-port/feedback_item.xml b/app/src/main/res/layout-sw600dp-port/feedback_item.xml
@@ -38,8 +38,8 @@
     app:explorationViewPaddingTop="@{@dimen/space_16dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/feedback_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/feedback_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml
@@ -58,7 +58,7 @@
         android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
         android:orientation="vertical"
         app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}">
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_margin_start_profile_not_added}">
 
         <TextView
           android:id="@+id/add_profile_text"

diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
@@ -62,7 +62,7 @@
         android:singleLine="false"
         android:text="@{viewModel.profile.name}"
         android:textColor="@color/white"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}"
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}"
         app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_description_parent_margin_top : @dimen/space_0dp}" />
 
       <TextView
@@ -93,7 +93,7 @@
         android:textSize="16sp"
         android:textStyle="italic"
         android:visibility="@{viewModel.profile.isAdmin &amp;&amp; hasProfileEverBeenAddedValue ? View.VISIBLE : View.GONE}"
-        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_32dp}" />
+        app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}" />
     </LinearLayout>
 
     <View

diff --git 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/state_fragment_non_split_view_margin_end}"
-        app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/state_fragment_non_split_view_margin_start}"
+        app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_end : @dimen/state_fragment_non_split_view_margin_end}"
+        app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_start : @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">

diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml
@@ -40,8 +40,8 @@
     app:explorationViewPaddingTop="@{@dimen/space_12dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_12dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"
@@ -50,8 +50,8 @@
     app:questionSplitViewPaddingTop="@{@dimen/space_0dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:questionViewMarginBottom="@{@dimen/space_12dp}"
-    app:questionViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionViewMarginStart="@{@dimen/space_32dp}"
+    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/drag_drop_interaction_item.xml b/app/src/main/res/layout/drag_drop_interaction_item.xml
@@ -27,22 +27,22 @@
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_32dp}"
-    app:explorationSplitViewMarginTop="@{@dimen/space_32dp}"
+    app:explorationSplitViewMarginStart="@{@dimen/drag_drop_item_exploration_split_view_margin_start}"
+    app:explorationSplitViewMarginTop="@{@dimen/drag_drop_item_exploration_split_view_margin_top}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
     app:explorationViewMarginEnd="@{@dimen/space_24dp}"
     app:explorationViewMarginStart="@{@dimen/space_40dp}"
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_32dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}"
+    app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_40dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionViewMarginEnd="@{@dimen/space_32dp}"
-    app:questionViewMarginStart="@{@dimen/space_32dp}"
+    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