Fix part of #2003: Replacing space_48dp,space_36dp (#2115)

Fixes part of #2003 This PR replaces the use of space_48dp and space_36dp with the dimensions having contextful names.
oppia · Nov 17, 2020 · 8337af7 · 8337af7
1 parent 6e550ed
commit 8337af7
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 27 deletions.
diff --git a/app/src/main/res/layout-land/content_item.xml b/app/src/main/res/layout-land/content_item.xml
@@ -31,7 +31,7 @@
     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/space_48dp}"
+    app:explorationViewMarginStart="@{@dimen/content_item_exploration_view_margin_start}"
     app:explorationViewMarginTop="@{@dimen/space_16dp}"
     app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:explorationViewPaddingBottom="@{@dimen/space_16dp}"

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
@@ -31,7 +31,7 @@
     app:explorationSplitViewMarginTop="@{@dimen/space_40dp}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.splitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/space_48dp}"
+    app:explorationViewMarginEnd="@{@dimen/drag_drop_item_exploration_view_margin_end}"
     app:explorationViewMarginStart="@{@dimen/content_item_exploration_view_margin_start}"
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.splitView}"

diff --git a/app/src/main/res/layout-land/feedback_item.xml b/app/src/main/res/layout-land/feedback_item.xml
@@ -31,7 +31,7 @@
     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/space_48dp}"
+    app:explorationViewMarginStart="@{@dimen/feedback_item_exploration_view_margin_start}"
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:explorationViewPaddingBottom="@{@dimen/space_16dp}"

diff --git a/app/src/main/res/layout-land/fraction_interaction_item.xml b/app/src/main/res/layout-land/fraction_interaction_item.xml
@@ -20,7 +20,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:padding="0dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_48dp : @dimen/space_64dp}"
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_end : @dimen/space_64dp}"
     app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_start : @dimen/space_64dp}">
 
     <org.oppia.android.app.customview.interaction.FractionInputInteractionView

diff --git a/app/src/main/res/layout-land/numeric_input_interaction_item.xml b/app/src/main/res/layout-land/numeric_input_interaction_item.xml
@@ -20,7 +20,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:padding="0dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_48dp : @dimen/space_64dp}"
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_end : @dimen/space_64dp}"
     app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_start : @dimen/space_64dp}">
 
     <org.oppia.android.app.customview.interaction.NumericInputInteractionView

diff --git a/app/src/main/res/layout-land/selection_interaction_item.xml b/app/src/main/res/layout-land/selection_interaction_item.xml
@@ -25,7 +25,7 @@
     android:orientation="vertical"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_48dp : @dimen/space_64dp}"
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/selection_interaction_item_conversation_view_margin_end : @dimen/space_64dp}"
     app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/selection_interaction_item_conversation_view_margin_start : @dimen/space_64dp}"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintTop_toTopOf="parent">

diff --git a/app/src/main/res/layout-land/submitted_answer_item.xml b/app/src/main/res/layout-land/submitted_answer_item.xml
@@ -29,7 +29,7 @@
     app:explorationSplitViewMarginTop="@{@dimen/space_24dp}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationViewMarginEnd="@{@dimen/space_48dp}"
+    app:explorationViewMarginEnd="@{@dimen/submitted_answer_item_exploration_view_margin_end}"
     app:explorationViewMarginStart="@{@dimen/submitted_answer_item_exploration_view_margin_start}"
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"

diff --git a/app/src/main/res/layout-land/text_input_interaction_item.xml b/app/src/main/res/layout-land/text_input_interaction_item.xml
@@ -18,7 +18,7 @@
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:padding="0dp"
-    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_48dp : @dimen/space_64dp}"
+    app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_end : @dimen/space_64dp}"
     app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_margin_start : @dimen/space_64dp}">
 
     <org.oppia.android.app.customview.interaction.TextInputInteractionView

diff --git a/app/src/main/res/layout-sw600dp-land/previous_button_item.xml b/app/src/main/res/layout-sw600dp-land/previous_button_item.xml
@@ -18,7 +18,7 @@
     app:explorationSplitViewMarginApplicable="@{buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:explorationSplitViewMarginEnd="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_48dp}"
+    app:explorationSplitViewMarginStart="@{@dimen/previous_button_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/previous_button_item_exploration_split_view_margin_top}"
     app:explorationSplitViewPaddingApplicable="@{buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}"
@@ -38,7 +38,7 @@
     app:questionSplitViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:questionSplitViewMarginEnd="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_48dp}"
+    app:questionSplitViewMarginStart="@{@dimen/previous_button_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/previous_button_item_question_split_view_margin_top}"
     app:questionSplitViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@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
@@ -48,7 +48,7 @@
         android:layout_width="108dp"
         android:layout_height="108dp"
         android:src="@drawable/ic_add_profile"
-        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_48dp : @dimen/space_0dp}"
+        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_add_view_circular_image_margin_top_profile_already_added : @dimen/space_0dp}"
         app:civ_border_color="@color/avatarBorder"
         app:civ_border_width="1dp" />
 

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
@@ -48,7 +48,7 @@
         android:layout_height="108dp"
         app:civ_border_color="@color/avatarBorder"
         app:civ_border_width="1dp"
-        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_48dp : @dimen/space_0dp}"
+        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_circular_image_margin_top_profile_already_added : @dimen/space_0dp}"
         profile:src="@{viewModel.profile.avatar}" />
 
       <TextView

diff --git a/app/src/main/res/layout-sw600dp-land/state_fragment.xml b/app/src/main/res/layout-sw600dp-land/state_fragment.xml
@@ -32,7 +32,7 @@
         android:clipToPadding="false"
         android:divider="@android:color/transparent"
         android:overScrollMode="never"
-        android:paddingTop="@{viewModel.isAudioBarVisible ? @dimen/space_48dp : @dimen/space_0dp}"
+        android:paddingTop="@{viewModel.isAudioBarVisible ? @dimen/state_fragment_padding_top_audio_bar_visible : @dimen/space_0dp}"
         android:paddingBottom="112dp"
         android:scrollbars="none"
         app:data="@{viewModel.itemList}"

diff --git a/app/src/main/res/layout-sw600dp-port/content_item.xml b/app/src/main/res/layout-sw600dp-port/content_item.xml
@@ -32,7 +32,7 @@
     app:explorationViewMarginBottom="@{@dimen/space_0dp}"
     app:explorationViewMarginEnd="@{@dimen/space_144dp}"
     app:explorationViewMarginStart="@{@dimen/space_112dp}"
-    app:explorationViewMarginTop="@{@dimen/space_36dp}"
+    app:explorationViewMarginTop="@{@dimen/content_item_exploration_view_margin_top}"
     app:explorationViewPaddingApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
     app:explorationViewPaddingBottom="@{@dimen/space_16dp}"
     app:explorationViewPaddingEnd="@{@dimen/space_12dp}"
@@ -52,7 +52,7 @@
     app:questionViewMarginBottom="@{@dimen/space_0dp}"
     app:questionViewMarginEnd="@{@dimen/space_128dp}"
     app:questionViewMarginStart="@{@dimen/space_128dp}"
-    app:questionViewMarginTop="@{@dimen/space_36dp}"
+    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-sw600dp-port/previous_button_item.xml b/app/src/main/res/layout-sw600dp-port/previous_button_item.xml
@@ -18,7 +18,7 @@
     app:explorationSplitViewMarginApplicable="@{buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:explorationSplitViewMarginEnd="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_48dp}"
+    app:explorationSplitViewMarginStart="@{@dimen/previous_button_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/previous_button_item_exploration_split_view_margin_top}"
     app:explorationSplitViewPaddingApplicable="@{buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}"
@@ -38,7 +38,7 @@
     app:questionSplitViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:questionSplitViewMarginEnd="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_48dp}"
+    app:questionSplitViewMarginStart="@{@dimen/previous_button_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/previous_button_item_question_split_view_margin_top}"
     app:questionSplitViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml b/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml
@@ -18,7 +18,7 @@
     android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}"
     app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginEnd="@{@dimen/space_48dp}"
+    app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}"
     app:explorationSplitViewMarginStart="@{@dimen/previous_responses_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/space_24dp}"
     app:explorationViewMarginApplicable="@{viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"
@@ -28,7 +28,7 @@
     app:explorationViewMarginTop="@{@dimen/space_24dp}"
     app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; viewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginEnd="@{@dimen/space_48dp}"
+    app:questionSplitViewMarginEnd="@{@dimen/previous_responses_item_question_split_view_margin_end}"
     app:questionSplitViewMarginStart="@{@dimen/previous_responses_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/space_24dp}"
     app:questionViewMarginApplicable="@{!viewModel.hasConversationView &amp;&amp; !viewModel.isSplitView}"

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
@@ -48,7 +48,7 @@
         android:layout_width="108dp"
         android:layout_height="108dp"
         android:src="@drawable/ic_add_profile"
-        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_48dp : @dimen/space_0dp}"
+        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_add_view_circular_image_margin_top_profile_already_added : @dimen/space_0dp}"
         app:civ_border_color="@color/avatarBorder"
         app:civ_border_width="1dp" />
 

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
@@ -49,7 +49,7 @@
         android:layout_height="108dp"
         app:civ_border_color="@color/avatarBorder"
         app:civ_border_width="1dp"
-        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_48dp : @dimen/space_0dp}"
+        app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_circular_image_margin_top_profile_already_added : @dimen/space_0dp}"
         profile:src="@{viewModel.profile.avatar}" />
 
       <TextView

diff --git a/app/src/main/res/layout-sw600dp-port/state_fragment.xml b/app/src/main/res/layout-sw600dp-port/state_fragment.xml
@@ -32,7 +32,7 @@
         android:clipToPadding="false"
         android:divider="@android:color/transparent"
         android:overScrollMode="never"
-        android:paddingTop="@{viewModel.isAudioBarVisible ? @dimen/space_48dp : @dimen/space_0dp}"
+        android:paddingTop="@{viewModel.isAudioBarVisible ? @dimen/state_fragment_padding_top_audio_bar_visible : @dimen/space_0dp}"
         android:paddingBottom="112dp"
         android:scrollbars="none"
         app:data="@{viewModel.itemList}"

diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml
@@ -52,7 +52,7 @@
     app:questionViewMarginBottom="@{@dimen/space_12dp}"
     app:questionViewMarginEnd="@{@dimen/space_32dp}"
     app:questionViewMarginStart="@{@dimen/space_32dp}"
-    app:questionViewMarginTop="@{@dimen/space_36dp}"
+    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/previous_button_item.xml b/app/src/main/res/layout/previous_button_item.xml
@@ -18,7 +18,7 @@
     app:explorationSplitViewMarginApplicable="@{buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:explorationSplitViewMarginEnd="@{@dimen/space_0dp}"
-    app:explorationSplitViewMarginStart="@{@dimen/space_48dp}"
+    app:explorationSplitViewMarginStart="@{@dimen/previous_button_item_exploration_split_view_margin_start}"
     app:explorationSplitViewMarginTop="@{@dimen/previous_button_item_exploration_split_view_margin_top}"
     app:explorationSplitViewPaddingApplicable="@{buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}"
@@ -38,7 +38,7 @@
     app:questionSplitViewMarginApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:questionSplitViewMarginBottom="@{@dimen/space_0dp}"
     app:questionSplitViewMarginEnd="@{@dimen/space_0dp}"
-    app:questionSplitViewMarginStart="@{@dimen/space_48dp}"
+    app:questionSplitViewMarginStart="@{@dimen/previous_button_item_question_split_view_margin_start}"
     app:questionSplitViewMarginTop="@{@dimen/previous_button_item_question_split_view_margin_top}"
     app:questionSplitViewPaddingApplicable="@{!buttonViewModel.hasConversationView &amp;&amp; buttonViewModel.isSplitView}"
     app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}"

diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -6,4 +6,6 @@
   <dimen name="home_margin_min">36dp</dimen>
   <dimen name="recently_played_margin_max">72dp</dimen>
   <dimen name="recently_played_margin_min">36dp</dimen>
+
+  <dimen name="content_item_exploration_view_margin_start">48dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -6,4 +6,7 @@
   <dimen name="home_margin_min">60dp</dimen>
   <dimen name="recently_played_margin_max">120dp</dimen>
   <dimen name="recently_played_margin_min">60dp</dimen>
+
+  <dimen name="previous_responses_item_question_split_view_margin_end">48dp</dimen>
+  <dimen name="previous_responses_item_exploration_split_view_margin_end">48dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -17,8 +17,6 @@
   <dimen name="bottom_white_space">160dp</dimen>
   <dimen name="space_128dp">128dp</dimen>
   <dimen name="space_64dp">64dp</dimen>
-  <dimen name="space_48dp">48dp</dimen>
-  <dimen name="space_36dp">36dp</dimen>
   <dimen name="space_32dp">32dp</dimen>
   <dimen name="space_24dp">24dp</dimen>
   <dimen name="space_16dp">16dp</dimen>
@@ -138,4 +136,21 @@
   <dimen name="selection_interaction_item_conversation_view_margin_start">80dp</dimen>
   <dimen name="submitted_answer_item_exploration_view_margin_start">80dp</dimen>
   <dimen name="text_input_interaction_item_margin_start">80dp</dimen>
+
+  <dimen name="content_item_question_view_margin_top">36dp</dimen>
+  <dimen name="content_item_exploration_view_margin_top">36dp</dimen>
+  <dimen name="previous_button_item_question_split_view_margin_start">48dp</dimen>
+  <dimen name="previous_button_item_exploration_split_view_margin_start">48dp</dimen>
+  <dimen name="previous_button_item_question_view_margin_start">48dp</dimen>
+  <dimen name="previous_button_item_exploration_view_margin_start">48dp</dimen>
+  <dimen name="drag_drop_item_exploration_view_margin_end">48dp</dimen>
+  <dimen name="feedback_item_exploration_view_margin_start">48dp</dimen>
+  <dimen name="fraction_interaction_item_conversation_view_margin_end">48dp</dimen>
+  <dimen name="numeric_input_interaction_item_conversation_view_margin_end">48dp</dimen>
+  <dimen name="selection_interaction_item_conversation_view_margin_end">48dp</dimen>
+  <dimen name="submitted_answer_item_exploration_view_margin_end">48dp</dimen>
+  <dimen name="text_input_interaction_item_conversation_view_margin_end">48dp</dimen>
+  <dimen name="profile_chooser_add_view_circular_image_margin_top_profile_already_added">48dp</dimen>
+  <dimen name="profile_chooser_profile_view_circular_image_margin_top_profile_already_added">48dp</dimen>
+  <dimen name="state_fragment_padding_top_audio_bar_visible">48dp</dimen>
 </resources>