From fce4b836859b133450f6f5e5dfe484299a9bda14 Mon Sep 17 00:00:00 2001 From: ARJUPTA <64064110+ARJUPTA@users.noreply.github.com> Date: Tue, 17 Nov 2020 01:57:24 +0530 Subject: [PATCH 01/11] 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. --- app/src/main/res/layout-land/content_item.xml | 6 ++-- .../drag_drop_interaction_item.xml | 8 ++--- .../main/res/layout-land/feedback_item.xml | 4 +-- .../res/layout-land/submitted_answer_item.xml | 4 +-- .../res/layout-sw600dp-land/content_item.xml | 4 +-- .../drag_drop_interaction_item.xml | 8 ++--- .../res/layout-sw600dp-land/feedback_item.xml | 4 +-- .../profile_chooser_add_view.xml | 2 +- .../profile_chooser_profile_view.xml | 6 ++-- .../res/layout-sw600dp-port/content_item.xml | 4 +-- .../drag_drop_interaction_item.xml | 8 ++--- .../res/layout-sw600dp-port/feedback_item.xml | 4 +-- .../profile_chooser_add_view.xml | 2 +- .../profile_chooser_profile_view.xml | 4 +-- .../layout-sw600dp-port/state_fragment.xml | 4 +-- app/src/main/res/layout/content_item.xml | 8 ++--- .../res/layout/drag_drop_interaction_item.xml | 12 +++---- app/src/main/res/layout/feedback_item.xml | 8 ++--- .../res/layout/fraction_interaction_item.xml | 4 +-- .../layout/numeric_input_interaction_item.xml | 4 +-- .../layout/ratio_input_interaction_item.xml | 4 +-- .../res/layout/selection_interaction_item.xml | 4 +-- app/src/main/res/layout/state_fragment.xml | 4 +-- .../main/res/layout/submitted_answer_item.xml | 8 ++--- .../layout/text_input_interaction_item.xml | 4 +-- app/src/main/res/values/dimens.xml | 36 +++++++++++++++++++ 26 files changed, 102 insertions(+), 66 deletions(-) diff --git a/app/src/main/res/layout-land/content_item.xml b/app/src/main/res/layout-land/content_item.xml index 9a66eff57c3..da5587836ba 100644 --- 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 && 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 && viewModel.isSplitView}" app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}" @@ -52,7 +52,7 @@ app:questionViewMarginBottom="@{@dimen/space_16dp}" app:questionViewMarginEnd="@{@dimen/space_64dp}" app:questionViewMarginStart="@{@dimen/space_64dp}" - app:questionViewMarginTop="@{@dimen/space_32dp}" + app:questionViewMarginTop="@{@dimen/content_item_question_view_margin_top}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !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 index 6864adeb42d..73672ed10d5 100644 --- 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 && 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 && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" @@ -36,8 +36,8 @@ app:explorationViewMarginTop="@{@dimen/space_24dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && 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 && !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 index 911d283a783..75ec2ca5c41 100644 --- 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 && 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 && 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 index e6ec382ed7a..c78f761cc00 100644 --- a/app/src/main/res/layout-land/submitted_answer_item.xml +++ b/app/src/main/res/layout-land/submitted_answer_item.xml @@ -38,8 +38,8 @@ app:explorationViewMarginTop="@{@dimen/space_24dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && 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 && !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 index ba44b40a3a5..beb3012f462 100644 --- 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 && 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 && 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 index a75de801fa9..10b8fb42226 100644 --- 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 && 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 && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" @@ -36,8 +36,8 @@ app:explorationViewMarginTop="@{@dimen/space_24dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && 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 && !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 index 26cc0a8c7d0..13ac6c84b4f 100644 --- 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 && 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 && 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 index dc49877abc6..0c0b190b3f3 100644 --- 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}"> @@ -93,7 +93,7 @@ android:textSize="16sp" android:textStyle="italic" android:visibility="@{viewModel.profile.isAdmin && 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}" /> 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 37cad934c20..31aa3f5d761 100644 --- 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 && 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 && 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 index 176d76b6280..024be555d22 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 @@ -26,8 +26,8 @@ android:padding="0dp" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && 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 && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" @@ -36,8 +36,8 @@ app:explorationViewMarginTop="@{@dimen/space_24dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && 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 && !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 index 30697dbf801..f2ac8fcb2f6 100644 --- 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 && 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 && 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 index e898f2b556b..4e582f19af7 100644 --- 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}"> + app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_textview_margin_start_profile_not_added}" /> diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml index 6f3fe46e54b..72dc84a6f07 100644 --- 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 && 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 && viewModel.isSplitView}" app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}" @@ -50,8 +50,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !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/space_36dp}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !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 index 5e325d79932..57f3b92b165 100644 --- a/app/src/main/res/layout/drag_drop_interaction_item.xml +++ b/app/src/main/res/layout/drag_drop_interaction_item.xml @@ -27,8 +27,8 @@ app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && 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 && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/space_24dp}" @@ -36,13 +36,13 @@ app:explorationViewMarginTop="@{@dimen/space_24dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && 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 && !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}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_24dp : @dimen/fraction_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_40dp : @dimen/fraction_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_24dp : @dimen/numeric_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_40dp : @dimen/numeric_input_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_24dp : @dimen/ratio_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_40dp : @dimen/ratio_input_interaction_item_non_conversation_view_margin_start}"> diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml index c0060a82de2..fc23f68c2f6 100755 --- a/app/src/main/res/layout/state_fragment.xml +++ b/app/src/main/res/layout/state_fragment.xml @@ -70,8 +70,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="top" - app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/space_28dp}" - app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/space_32dp : @dimen/space_28dp}" + app:layoutMarginEnd="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_end : @dimen/space_28dp}" + app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_start : @dimen/space_28dp}" 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/submitted_answer_item.xml b/app/src/main/res/layout/submitted_answer_item.xml index fb0d736db9b..7a407fb982e 100644 --- a/app/src/main/res/layout/submitted_answer_item.xml +++ b/app/src/main/res/layout/submitted_answer_item.xml @@ -42,13 +42,13 @@ app:explorationViewMarginTop="@{@dimen/space_24dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && 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 && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_32dp}" - app:questionViewMarginStart="@{@dimen/space_32dp}" + 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:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_24dp : @dimen/text_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_40dp : @dimen/text_input_interaction_item_non_conversation_view_margin_start}"> 80dp 80dp 80dp + + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp From 17ade996e37982527c39b5fd62b98b0266d28dc3 Mon Sep 17 00:00:00 2001 From: ARJUPTA <64064110+ARJUPTA@users.noreply.github.com> Date: Tue, 17 Nov 2020 23:01:25 +0530 Subject: [PATCH 02/11] Resloving conflicts --- app/src/main/res/values-land/dimens.xml | 1 + app/src/main/res/values-sw600dp-port/dimens.xml | 1 + app/src/main/res/values/dimens.xml | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 6e8c1ed5dde..2ce1dc6c7f7 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -8,4 +8,5 @@ 36dp 48dp + 32dp diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index c464910b32d..16bd15c32d3 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -9,4 +9,5 @@ 48dp 48dp + 36dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index db17987c391..ccf5b651816 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -140,7 +140,6 @@ 32dp 32dp 32dp - 32dp 32dp 32dp 32dp From 670fe253ac63eb28b1ff54b4f5597263727cfb3b Mon Sep 17 00:00:00 2001 From: ARJUPTA <64064110+ARJUPTA@users.noreply.github.com> Date: Thu, 19 Nov 2020 00:25:56 +0530 Subject: [PATCH 03/11] Overiding dimensions --- app/src/main/res/values-land/dimens.xml | 11 +++++++++++ app/src/main/res/values-sw600dp-land/dimens.xml | 10 ++++++++++ app/src/main/res/values-sw600dp-port/dimens.xml | 12 ++++++++++++ app/src/main/res/values/dimens.xml | 5 ++--- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 2ce1dc6c7f7..f26f404d6a7 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -9,4 +9,15 @@ 48dp 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index 855b5cb57c6..ff52a4e85fc 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -6,4 +6,14 @@ 64dp 96dp 64dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index 16bd15c32d3..3a91731d5a6 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -10,4 +10,16 @@ 48dp 48dp 36dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp + 32dp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index ccf5b651816..68da53720ec 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,7 +17,6 @@ 160dp 128dp 64dp - 32dp 24dp 16dp 12dp @@ -142,14 +141,14 @@ 32dp 32dp 32dp - 32dp + 32dp // 32dp 32dp 32dp 32dp 32dp 32dp - 32dp + 32dp // 32dp 32dp 32dp From 0f28eaa4fa12aa330c756f5f4962bdeea6f9d519 Mon Sep 17 00:00:00 2001 From: ARJUPTA <64064110+ARJUPTA@users.noreply.github.com> Date: Sun, 22 Nov 2020 23:46:04 +0530 Subject: [PATCH 04/11] Fixes part of #2003: Replacing space_24dp Fixes part of #2003 This PR replaces the use of space_24dp with the dimensions having contextful names. --- app/src/main/res/layout-land/content_item.xml | 2 +- .../drag_drop_interaction_item.xml | 6 +- .../main/res/layout-land/feedback_item.xml | 10 +-- .../previous_responses_header_item.xml | 8 +- .../layout-land/profile_chooser_add_view.xml | 2 +- .../profile_chooser_profile_view.xml | 2 +- .../res/layout-land/submitted_answer_item.xml | 10 +-- .../walkthrough_final_fragment.xml | 4 +- .../res/layout-sw600dp-land/content_item.xml | 2 +- .../drag_drop_interaction_item.xml | 4 +- .../res/layout-sw600dp-land/feedback_item.xml | 8 +- .../previous_responses_header_item.xml | 8 +- .../profile_chooser_add_view.xml | 6 +- .../profile_chooser_profile_view.xml | 4 +- .../submitted_answer_item.xml | 12 +-- .../res/layout-sw600dp-port/content_item.xml | 2 +- .../drag_drop_interaction_item.xml | 4 +- .../res/layout-sw600dp-port/feedback_item.xml | 10 +-- .../previous_responses_header_item.xml | 8 +- .../profile_chooser_add_view.xml | 6 +- .../profile_chooser_fragment.xml | 2 +- .../profile_chooser_profile_view.xml | 2 +- .../submitted_answer_item.xml | 12 +-- app/src/main/res/layout/content_item.xml | 6 +- .../res/layout/continue_interaction_item.xml | 8 +- .../continue_navigation_button_item.xml | 8 +- .../res/layout/drag_drop_interaction_item.xml | 6 +- app/src/main/res/layout/feedback_item.xml | 10 +-- .../res/layout/fraction_interaction_item.xml | 2 +- app/src/main/res/layout/next_button_item.xml | 8 +- .../layout/numeric_input_interaction_item.xml | 2 +- .../main/res/layout/previous_button_item.xml | 8 +- .../layout/previous_responses_header_item.xml | 8 +- .../res/layout/profile_chooser_add_view.xml | 4 +- .../layout/profile_chooser_profile_view.xml | 4 +- .../layout/ratio_input_interaction_item.xml | 2 +- .../main/res/layout/replay_button_item.xml | 8 +- .../layout/return_to_topic_button_item.xml | 8 +- .../res/layout/selection_interaction_item.xml | 2 +- .../main/res/layout/submit_button_item.xml | 8 +- .../main/res/layout/submitted_answer_item.xml | 12 +-- .../layout/text_input_interaction_item.xml | 2 +- .../res/layout/walkthrough_final_fragment.xml | 4 +- app/src/main/res/values-land/dimens.xml | 29 +++++++ .../main/res/values-sw600dp-land/dimens.xml | 23 ++++- .../main/res/values-sw600dp-port/dimens.xml | 26 +++++- app/src/main/res/values/dimens.xml | 85 ++++++++++++++++--- ...tFontScaleConfigurationUtilActivityTest.kt | 2 +- 48 files changed, 275 insertions(+), 144 deletions(-) diff --git a/app/src/main/res/layout-land/content_item.xml b/app/src/main/res/layout-land/content_item.xml index bd04a2fd31b..2bcabdc9600 100644 --- a/app/src/main/res/layout-land/content_item.xml +++ b/app/src/main/res/layout-land/content_item.xml @@ -21,7 +21,7 @@ app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}" - app:explorationSplitViewMarginStart="@{@dimen/space_24dp}" + app:explorationSplitViewMarginStart="@{@dimen/content_item_exploration_split_view_margin_start}" app:explorationSplitViewMarginTop="@{@dimen/space_40dp}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@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 index 063c4370541..5b9f6ad336b 100644 --- a/app/src/main/res/layout-land/drag_drop_interaction_item.xml +++ b/app/src/main/res/layout-land/drag_drop_interaction_item.xml @@ -32,8 +32,8 @@ app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" 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:explorationViewMarginStart="@{@dimen/drag_drop_interaction_item_exploration_view_margin_start}" + app:explorationViewMarginTop="@{@dimen/drag_drop_item_exploration_view_margin_top}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.splitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}" @@ -43,7 +43,7 @@ app:questionViewMarginBottom="@{@dimen/space_0dp}" 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}"> + app:questionViewMarginTop="@{@dimen/drag_drop_item_question_view_margin_top}"> + app:questionViewMarginTop="@{@dimen/previous_responses_item_question_view_margin_top}"> + app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_16dp : @dimen/profile_chooser_add_view_margin_top_profile_not_added}"> diff --git a/app/src/main/res/layout-land/submitted_answer_item.xml b/app/src/main/res/layout-land/submitted_answer_item.xml index 23101041061..e6728f28f81 100644 --- a/app/src/main/res/layout-land/submitted_answer_item.xml +++ b/app/src/main/res/layout-land/submitted_answer_item.xml @@ -24,24 +24,24 @@ android:layout_height="wrap_content" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/space_24dp}" + app:explorationSplitViewMarginEnd="@{@dimen/submitted_answer_exploration_split_view_margin_end}" app:explorationSplitViewMarginStart="@{@dimen/space_40dp}" - app:explorationSplitViewMarginTop="@{@dimen/space_24dp}" + app:explorationSplitViewMarginTop="@{@dimen/submitted_answer_exploration_split_view_margin_top}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" 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:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" 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:questionSplitViewMarginTop="@{@dimen/submitted_answer_question_split_view_margin_top}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" app:questionViewMarginEnd="@{@dimen/submitted_answer_question_view_margin_end}" app:questionViewMarginStart="@{@dimen/submitted_answer_question_view_margin_start}" - app:questionViewMarginTop="@{@dimen/space_24dp}"> + app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}"> + app:contentPadding="@dimen/walkthrough_final_fragment_card_content_padding"> + app:contentPadding="@dimen/walkthrough_final_fragment_card_content_padding"> + app:questionViewMarginTop="@{@dimen/drag_drop_item_question_view_margin_top}"> + app:questionViewMarginTop="@{@dimen/previous_responses_item_question_view_margin_top}"> + app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_description_margin_start_profile_not_added}"> diff --git a/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml b/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml index 8a61a6be245..efbbfb89e45 100644 --- a/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml +++ b/app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml @@ -24,9 +24,9 @@ android:layout_height="wrap_content" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_end_extra_interaction_answer : @dimen/space_24dp}" + app:explorationSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer}" app:explorationSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_start_extra_interaction_answer : @dimen/space_40dp}" - app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/space_24dp}" + app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}" app:explorationSplitViewPaddingEnd="@{@dimen/space_0dp}" @@ -36,7 +36,7 @@ app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/space_176dp}" app:explorationViewMarginStart="@{@dimen/space_208dp}" - app:explorationViewMarginTop="@{@dimen/space_24dp}" + app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_0dp}" app:explorationViewPaddingEnd="@{@dimen/space_0dp}" @@ -44,9 +44,9 @@ app:explorationViewPaddingTop="@{@dimen/space_0dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" - app:questionSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_end_extra_interaction_answer : @dimen/space_24dp}" + app:questionSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_end_no_extra_interaction_answer}" app:questionSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_start_extra_interaction_answer : @dimen/space_40dp}" - app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/space_24dp}" + app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/submitted_answer_question_split_view_margin_top_no_extra_interaction_answer}" app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}" app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}" @@ -56,7 +56,7 @@ app:questionViewMarginBottom="@{@dimen/space_0dp}" app:questionViewMarginEnd="@{@dimen/space_192dp}" app:questionViewMarginStart="@{@dimen/space_192dp}" - app:questionViewMarginTop="@{@dimen/space_24dp}" + app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_0dp}" app:questionViewPaddingEnd="@{@dimen/space_0dp}" 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 1bd6f92a0b3..2c18a34fac9 100644 --- a/app/src/main/res/layout-sw600dp-port/content_item.xml +++ b/app/src/main/res/layout-sw600dp-port/content_item.xml @@ -21,7 +21,7 @@ app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}" - app:explorationSplitViewMarginStart="@{@dimen/space_24dp}" + app:explorationSplitViewMarginStart="@{@dimen/content_item_exploration_split_view_margin_start}" app:explorationSplitViewMarginTop="@{@dimen/space_40dp}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@dimen/space_16dp}" 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 112848f6c81..50618abb998 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 @@ -33,7 +33,7 @@ app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/space_112dp}" app:explorationViewMarginStart="@{@dimen/space_144dp}" - app:explorationViewMarginTop="@{@dimen/space_24dp}" + app:explorationViewMarginTop="@{@dimen/drag_drop_item_exploration_view_margin_top}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.splitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}" @@ -43,7 +43,7 @@ app:questionViewMarginBottom="@{@dimen/space_0dp}" 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}"> + app:questionViewMarginTop="@{@dimen/drag_drop_item_question_view_margin_top}"> + app:questionViewMarginTop="@{@dimen/previous_responses_item_question_view_margin_top}"> + app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_description_margin_start_profile_not_added}"> 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 index 1f87aa19c08..cc01b19a926 100644 --- 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 @@ -38,7 +38,7 @@ android:orientation="@{hasProfileEverBeenAddedValue ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL}" app:layoutMarginEnd="@{hasProfileEverBeenAddedValue ? @dimen/space_16dp : @dimen/profile_view_not_added_margin}" app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_16dp : @dimen/profile_view_not_added_margin}" - app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_24dp}" + app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_margin_top_profile_not_added}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" profile:ignore="RtlSymmetry"> 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 cdce73ca6a0..b75b513715e 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 @@ -24,9 +24,9 @@ android:layout_height="wrap_content" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_end_extra_interaction_answer : @dimen/space_24dp}" + app:explorationSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_end_no_extra_interaction_answer}" app:explorationSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_start_extra_interaction_answer : @dimen/space_40dp}" - app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/space_24dp}" + app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@dimen/space_0dp}" app:explorationSplitViewPaddingEnd="@{@dimen/space_0dp}" @@ -36,7 +36,7 @@ app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/space_112dp}" app:explorationViewMarginStart="@{@dimen/space_144dp}" - app:explorationViewMarginTop="@{@dimen/space_24dp}" + app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_0dp}" app:explorationViewPaddingEnd="@{@dimen/space_0dp}" @@ -44,9 +44,9 @@ app:explorationViewPaddingTop="@{@dimen/space_0dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" - app:questionSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_end_extra_interaction_answer : @dimen/space_24dp}" + app:questionSplitViewMarginEnd="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_end_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_end_no_extra_interaction_answer}" app:questionSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_start_extra_interaction_answer : @dimen/space_40dp}" - app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/space_24dp}" + app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/space_40dp : @dimen/submitted_answer_question_split_view_margin_top_no_extra_interaction_answer}" app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}" app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}" @@ -56,7 +56,7 @@ app:questionViewMarginBottom="@{@dimen/space_0dp}" 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:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_0dp}" app:questionViewPaddingEnd="@{@dimen/space_0dp}" diff --git a/app/src/main/res/layout/content_item.xml b/app/src/main/res/layout/content_item.xml index f78a99a4f3c..7b4d44d89f5 100644 --- a/app/src/main/res/layout/content_item.xml +++ b/app/src/main/res/layout/content_item.xml @@ -21,7 +21,7 @@ app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}" - app:explorationSplitViewMarginStart="@{@dimen/space_24dp}" + app:explorationSplitViewMarginStart="@{@dimen/content_item_exploration_split_view_margin_start}" app:explorationSplitViewMarginTop="@{@dimen/space_40dp}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@dimen/space_16dp}" @@ -31,8 +31,8 @@ app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/space_40dp}" - app:explorationViewMarginStart="@{@dimen/space_24dp}" - app:explorationViewMarginTop="@{@dimen/space_24dp}" + app:explorationViewMarginStart="@{@dimen/content_item_exploration_view_margin_start}" + app:explorationViewMarginTop="@{@dimen/content_item_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_12dp}" app:explorationViewPaddingEnd="@{@dimen/content_item_exploration_view_padding_end}" diff --git a/app/src/main/res/layout/continue_interaction_item.xml b/app/src/main/res/layout/continue_interaction_item.xml index 430b30cb493..d3022a5d3c3 100644 --- a/app/src/main/res/layout/continue_interaction_item.xml +++ b/app/src/main/res/layout/continue_interaction_item.xml @@ -26,8 +26,8 @@ app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_24dp}" - app:explorationViewMarginStart="@{@dimen/space_24dp}" + app:explorationViewMarginEnd="@{@dimen/continue_interaction_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/continue_interaction_item_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/space_16dp}" app:explorationViewPaddingApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_16dp}" @@ -46,8 +46,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_24dp}" - app:questionViewMarginStart="@{@dimen/space_24dp}" + app:questionViewMarginEnd="@{@dimen/continue_interaction_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/continue_interaction_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/space_16dp}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_16dp}" diff --git a/app/src/main/res/layout/continue_navigation_button_item.xml b/app/src/main/res/layout/continue_navigation_button_item.xml index d0a8757af26..d38517c2b3a 100644 --- a/app/src/main/res/layout/continue_navigation_button_item.xml +++ b/app/src/main/res/layout/continue_navigation_button_item.xml @@ -26,8 +26,8 @@ app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}" app:explorationViewMarginApplicable="@{buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_24dp}" - app:explorationViewMarginStart="@{@dimen/space_24dp}" + app:explorationViewMarginEnd="@{@dimen/continue_navigation_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/continue_navigation_item_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/space_16dp}" app:explorationViewPaddingApplicable="@{buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_16dp}" @@ -46,8 +46,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_24dp}" - app:questionViewMarginStart="@{@dimen/space_24dp}" + app:questionViewMarginEnd="@{@dimen/continue_navigation_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/continue_navigation_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/space_16dp}" app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_16dp}" diff --git a/app/src/main/res/layout/drag_drop_interaction_item.xml b/app/src/main/res/layout/drag_drop_interaction_item.xml index 57f3b92b165..6af87a3306a 100644 --- a/app/src/main/res/layout/drag_drop_interaction_item.xml +++ b/app/src/main/res/layout/drag_drop_interaction_item.xml @@ -31,9 +31,9 @@ app:explorationSplitViewMarginTop="@{@dimen/drag_drop_item_exploration_split_view_margin_top}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_24dp}" + app:explorationViewMarginEnd="@{@dimen/drag_drop_item_exploration_view_margin_end}" app:explorationViewMarginStart="@{@dimen/space_40dp}" - app:explorationViewMarginTop="@{@dimen/space_24dp}" + app:explorationViewMarginTop="@{@dimen/drag_drop_item_exploration_view_margin_top}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.splitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" app:questionSplitViewMarginEnd="@{@dimen/drag_drop_item_question_split_view_margin_end}" @@ -43,7 +43,7 @@ app:questionViewMarginBottom="@{@dimen/space_0dp}" 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}"> + app:questionViewMarginTop="@{@dimen/drag_drop_item_question_view_margin_top}"> + app:questionViewMarginTop="@{@dimen/previous_responses_item_question_view_margin_top}"> + app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_margin_top_profile_not_added}"> + app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_add_view_description_parent_margin_start_profile_not_added}"> diff --git a/app/src/main/res/layout/ratio_input_interaction_item.xml b/app/src/main/res/layout/ratio_input_interaction_item.xml index 26c1a61b1bd..d1b4ebcf297 100644 --- a/app/src/main/res/layout/ratio_input_interaction_item.xml +++ b/app/src/main/res/layout/ratio_input_interaction_item.xml @@ -20,7 +20,7 @@ android:focusableInTouchMode="true" android:orientation="vertical" android:padding="0dp" - app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_24dp : @dimen/ratio_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/ratio_input_interaction_item_conversation_view_margin_end : @dimen/ratio_input_interaction_item_non_conversation_view_margin_end}" app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_40dp : @dimen/ratio_input_interaction_item_non_conversation_view_margin_start}">