From ac29306265c5438838cd0b837f73e240db6ea38f Mon Sep 17 00:00:00 2001 From: Arjun Gupta Date: Tue, 24 Nov 2020 00:18:44 +0530 Subject: [PATCH] Fix part of #2003: Replacing all dimensions except space_0dp (#2160) * 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 * 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. * Resolving conflicts * Failing tests * Fix part of #2003: Replacing space_16dp,space_12dp Fixes part of #2003: This PR replaces the use of space_16dp and space_12dp with the dimensions having contextful names. * Failing Tests * Commiting for updating the replacing-space-16dp-12dp branch * Fix part of #2003: Replacing all dimensions except space_0dp Fixes part of # 2003: This PR replaces all the dimensions with the one having contextful names (except space_0dp) * Failing tests --- .../home/recentlyplayed/OngoingListAdapter.kt | 11 +- app/src/main/res/layout-land/content_item.xml | 6 +- .../drag_drop_interaction_item.xml | 4 +- .../main/res/layout-land/feedback_item.xml | 2 +- .../layout-land/profile_chooser_add_view.xml | 2 +- .../profile_chooser_profile_view.xml | 2 +- .../main/res/layout-land/state_fragment.xml | 6 +- .../res/layout-land/submitted_answer_item.xml | 2 +- .../res/layout-sw600dp-land/content_item.xml | 18 +-- .../continue_interaction_item.xml | 8 +- .../continue_navigation_button_item.xml | 8 +- .../drag_drop_interaction_item.xml | 12 +- .../res/layout-sw600dp-land/feedback_item.xml | 12 +- .../fraction_interaction_item.xml | 4 +- .../layout-sw600dp-land/next_button_item.xml | 8 +- .../numeric_input_interaction_item.xml | 4 +- .../previous_button_item.xml | 4 +- .../previous_responses_header_item.xml | 8 +- .../profile_chooser_add_view.xml | 4 +- .../profile_chooser_fragment.xml | 2 +- .../profile_chooser_profile_view.xml | 10 +- .../replay_button_item.xml | 8 +- .../return_to_topic_button_item.xml | 8 +- .../selection_interaction_item.xml | 4 +- .../layout-sw600dp-land/state_fragment.xml | 4 +- .../submit_button_item.xml | 8 +- .../submitted_answer_item.xml | 16 +-- .../text_input_interaction_item.xml | 4 +- .../res/layout-sw600dp-port/content_item.xml | 10 +- .../continue_interaction_item.xml | 4 +- .../continue_navigation_button_item.xml | 4 +- .../drag_drop_interaction_item.xml | 8 +- .../res/layout-sw600dp-port/feedback_item.xml | 6 +- .../fraction_interaction_item.xml | 4 +- .../layout-sw600dp-port/next_button_item.xml | 4 +- .../numeric_input_interaction_item.xml | 4 +- .../previous_button_item.xml | 2 +- .../previous_responses_header_item.xml | 8 +- .../profile_chooser_add_view.xml | 4 +- .../profile_chooser_fragment.xml | 2 +- .../profile_chooser_profile_view.xml | 8 +- .../selection_interaction_item.xml | 4 +- .../submit_button_item.xml | 4 +- .../submitted_answer_item.xml | 12 +- .../text_input_interaction_item.xml | 4 +- app/src/main/res/layout/content_item.xml | 8 +- .../continue_navigation_button_item.xml | 2 +- .../res/layout/drag_drop_interaction_item.xml | 6 +- app/src/main/res/layout/feedback_item.xml | 6 +- .../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 +- .../layout/profile_chooser_profile_view.xml | 2 +- .../layout/ratio_input_interaction_item.xml | 2 +- .../main/res/layout/replay_button_item.xml | 4 +- .../layout/return_to_topic_button_item.xml | 8 +- .../res/layout/selection_interaction_item.xml | 2 +- app/src/main/res/layout/state_fragment.xml | 6 +- .../main/res/layout/submit_button_item.xml | 8 +- .../main/res/layout/submitted_answer_item.xml | 4 +- .../layout/text_input_interaction_item.xml | 2 +- app/src/main/res/values-land/dimens.xml | 23 ++++ .../main/res/values-sw600dp-land/dimens.xml | 95 ++++++++++++++ .../main/res/values-sw600dp-port/dimens.xml | 60 +++++++++ app/src/main/res/values/dimens.xml | 123 ++++++++++++------ ...tFontScaleConfigurationUtilActivityTest.kt | 2 +- 68 files changed, 446 insertions(+), 226 deletions(-) diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt index 8d6b1cf3596..39d435cea95 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt @@ -68,17 +68,22 @@ class OngoingListAdapter( val params = holder.binding.ongoingStoryCardView.layoutParams as (ViewGroup.MarginLayoutParams) val marginTop = if (activity.resources.getBoolean(R.bool.isTablet)) { - (activity as Context).resources.getDimensionPixelSize(R.dimen.space_28dp) + (activity as Context).resources + .getDimensionPixelSize(R.dimen.ongoing_story_card_view_is_tablet_margin_top) } else { if (orientation == Configuration.ORIENTATION_PORTRAIT) { if (storyGridPosition > 2) { (activity as Context).resources .getDimensionPixelSize(R.dimen.ongoing_story_card_view_margin_top_portrait) } else { - (activity as Context).resources.getDimensionPixelSize(R.dimen.space_28dp) + (activity as Context).resources + .getDimensionPixelSize( + R.dimen.ongoing_story_card_view_margin_top_portrait_story_grid_greater_then_2 + ) } } else { - (activity as Context).resources.getDimensionPixelSize(R.dimen.space_28dp) + (activity as Context).resources + .getDimensionPixelSize(R.dimen.ongoing_story_card_view_margin_top_landscape) } } val marginBottom = 0 diff --git a/app/src/main/res/layout-land/content_item.xml b/app/src/main/res/layout-land/content_item.xml index b3e8e19db65..d84d39c1219 100644 --- a/app/src/main/res/layout-land/content_item.xml +++ b/app/src/main/res/layout-land/content_item.xml @@ -20,9 +20,9 @@ android:background="@{viewModel.hasConversationView ? @drawable/content_blue_background : @drawable/transparent_background}" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}" + app:explorationSplitViewMarginEnd="@{@dimen/content_item_exploration_split_view_margin_end}" app:explorationSplitViewMarginStart="@{@dimen/content_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/space_40dp}" + app:explorationSplitViewMarginTop="@{@dimen/content_item_exploration_split_view_margin_top}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@dimen/content_item_exploration_split_view_padding_bottom}" app:explorationSplitViewPaddingEnd="@{@dimen/content_item_exploration_split_view_padding_end}" @@ -42,7 +42,7 @@ app:questionSplitViewMarginBottom="@{@dimen/content_item_question_split_view_margin_bottom}" app:questionSplitViewMarginEnd="@{@dimen/content_item_question_split_view_margin_end}" app:questionSplitViewMarginStart="@{@dimen/content_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/space_40dp}" + app:questionSplitViewMarginTop="@{@dimen/content_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-land/drag_drop_interaction_item.xml b/app/src/main/res/layout-land/drag_drop_interaction_item.xml index 5b9f6ad336b..09ad65110df 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 @@ -28,7 +28,7 @@ app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" 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:explorationSplitViewMarginTop="@{@dimen/drag_drop_item_exploration_split_view_margin_top}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.splitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" app:explorationViewMarginEnd="@{@dimen/drag_drop_item_exploration_view_margin_end}" @@ -38,7 +38,7 @@ app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" 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:questionSplitViewMarginTop="@{@dimen/drag_drop_item_question_split_view_margin_top}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.splitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" app:questionViewMarginEnd="@{@dimen/drag_drop_item_question_view_margin_end}" diff --git a/app/src/main/res/layout-land/feedback_item.xml b/app/src/main/res/layout-land/feedback_item.xml index 105fc523658..0501a8308db 100644 --- a/app/src/main/res/layout-land/feedback_item.xml +++ b/app/src/main/res/layout-land/feedback_item.xml @@ -20,7 +20,7 @@ android:background="@{viewModel.hasConversationView ? @drawable/content_blue_background : @drawable/transparent_background}" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}" + app:explorationSplitViewMarginEnd="@{@dimen/feedback_item_exploration_split_view_margin_end}" app:explorationSplitViewMarginStart="@{@dimen/feedback_item_exploration_split_view_margin_start}" app:explorationSplitViewMarginTop="@{@dimen/feedback_item_exploration_split_view_margin_top}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" diff --git a/app/src/main/res/layout-land/profile_chooser_add_view.xml b/app/src/main/res/layout-land/profile_chooser_add_view.xml index 7fb6a0a6beb..cc069fe4069 100644 --- a/app/src/main/res/layout-land/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-land/profile_chooser_add_view.xml @@ -32,7 +32,7 @@ android:layout_marginBottom="24dp" android:gravity="center_horizontal" android:orientation="vertical" - app:layoutMarginBottom="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_margin : @dimen/space_28dp}" + app:layoutMarginBottom="@{hasProfileEverBeenAddedValue ? @dimen/profile_view_already_added_margin : @dimen/profile_chooser_add_view_margin_bottom_profile_not_added}" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_add_view_margin_top_profile_already_added : @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 b4b8159e1f4..913916b4a95 100644 --- a/app/src/main/res/layout-land/submitted_answer_item.xml +++ b/app/src/main/res/layout-land/submitted_answer_item.xml @@ -25,7 +25,7 @@ app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/submitted_answer_exploration_split_view_margin_end}" - app:explorationSplitViewMarginStart="@{@dimen/space_40dp}" + app:explorationSplitViewMarginStart="@{@dimen/submitted_answer_exploration_split_view_margin_start}" app:explorationSplitViewMarginTop="@{@dimen/submitted_answer_exploration_split_view_margin_top}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@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 68521074d13..07248f18994 100644 --- a/app/src/main/res/layout-sw600dp-land/content_item.xml +++ b/app/src/main/res/layout-sw600dp-land/content_item.xml @@ -20,9 +20,9 @@ android:background="@{viewModel.hasConversationView ? @drawable/content_blue_background : @drawable/transparent_background}" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/space_40dp}" + app:explorationSplitViewMarginEnd="@{@dimen/content_item_exploration_split_view_margin_end}" app:explorationSplitViewMarginStart="@{@dimen/content_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/space_40dp}" + app:explorationSplitViewMarginTop="@{@dimen/content_item_exploration_split_view_margin_top}" app:explorationSplitViewPaddingApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewPaddingBottom="@{@dimen/content_item_exploration_split_view_padding_bottom}" app:explorationSplitViewPaddingEnd="@{@dimen/content_item_exploration_split_view_padding_end}" @@ -30,9 +30,9 @@ app:explorationSplitViewPaddingTop="@{@dimen/content_item_exploration_split_view_padding_top}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_208dp}" - app:explorationViewMarginStart="@{@dimen/space_176dp}" - app:explorationViewMarginTop="@{@dimen/space_40dp}" + app:explorationViewMarginEnd="@{@dimen/content_item_exploration_margin_end}" + 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/content_item_exploration_view_padding_bottom}" app:explorationViewPaddingEnd="@{@dimen/content_item_exploration_view_padding_end}" @@ -42,7 +42,7 @@ app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" 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:questionSplitViewMarginTop="@{@dimen/content_item_question_split_view_margin_top}" app:questionSplitViewPaddingApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewPaddingBottom="@{@dimen/space_0dp}" app:questionSplitViewPaddingEnd="@{@dimen/space_0dp}" @@ -50,9 +50,9 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_192dp}" - app:questionViewMarginStart="@{@dimen/space_192dp}" - app:questionViewMarginTop="@{@dimen/space_40dp}" + 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 && !viewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_0dp}" app:questionViewPaddingEnd="@{@dimen/space_0dp}" diff --git a/app/src/main/res/layout-sw600dp-land/continue_interaction_item.xml b/app/src/main/res/layout-sw600dp-land/continue_interaction_item.xml index 746cf76cc5c..f740c3e3faf 100644 --- a/app/src/main/res/layout-sw600dp-land/continue_interaction_item.xml +++ b/app/src/main/res/layout-sw600dp-land/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_176dp}" - app:explorationViewMarginStart="@{@dimen/space_176dp}" + app:explorationViewMarginEnd="@{@dimen/continue_interaction_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/continue_interaction_item_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/continue_item_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_0dp}" @@ -46,8 +46,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_192dp}" - app:questionViewMarginStart="@{@dimen/space_192dp}" + app:questionViewMarginEnd="@{@dimen/continue_interaction_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/continue_interaction_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/continue_item_question_view_margin_top}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_0dp}" diff --git a/app/src/main/res/layout-sw600dp-land/continue_navigation_button_item.xml b/app/src/main/res/layout-sw600dp-land/continue_navigation_button_item.xml index 2890617eb9d..4231f022ed3 100644 --- a/app/src/main/res/layout-sw600dp-land/continue_navigation_button_item.xml +++ b/app/src/main/res/layout-sw600dp-land/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_176dp}" - app:explorationViewMarginStart="@{@dimen/space_176dp}" + app:explorationViewMarginEnd="@{@dimen/continue_navigation_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/continue_navigation_item_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/continue_navigation_item_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_0dp}" @@ -46,8 +46,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_192dp}" - app:questionViewMarginStart="@{@dimen/space_192dp}" + app:questionViewMarginEnd="@{@dimen/continue_navigation_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/continue_navigation_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/continue_navigation_item_question_view_margin_top}" app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:questionViewPaddingBottom="@{@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 21467e3ccea..131d15bd685 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 @@ -28,21 +28,21 @@ app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" 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: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_176dp}" - app:explorationViewMarginStart="@{@dimen/space_208dp}" + app:explorationViewMarginEnd="@{@dimen/drag_drop_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/drag_drop_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}" app:questionSplitViewMarginStart="@{@dimen/drag_drop_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/space_40dp}" + app:questionSplitViewMarginTop="@{@dimen/drag_drop_item_question_split_view_margin_top}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.splitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_192dp}" - app:questionViewMarginStart="@{@dimen/space_192dp}" + app:questionViewMarginEnd="@{@dimen/drag_drop_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/drag_drop_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/drag_drop_item_question_view_margin_top}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_end : @dimen/fraction_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_start : @dimen/fraction_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_end : @dimen/numeric_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_start : @dimen/numeric_input_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_parent_margin_end_profile_not_added}" + app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_parent_margin_start_profile_not_added}"> diff --git a/app/src/main/res/layout-sw600dp-land/state_fragment.xml b/app/src/main/res/layout-sw600dp-land/state_fragment.xml index 458868939b4..bde4d5e6b9f 100644 --- a/app/src/main/res/layout-sw600dp-land/state_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/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/state_fragment_split_view_margin_end : @dimen/space_192dp}" - app:layoutMarginStart="@{viewModel.isSplitView() ? @dimen/state_fragment_split_view_margin_start : @dimen/space_192dp}" + 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-sw600dp-land/submit_button_item.xml b/app/src/main/res/layout-sw600dp-land/submit_button_item.xml index 249ee1848f8..cc4472af0a7 100644 --- a/app/src/main/res/layout-sw600dp-land/submit_button_item.xml +++ b/app/src/main/res/layout-sw600dp-land/submit_button_item.xml @@ -27,8 +27,8 @@ app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}" app:explorationViewMarginApplicable="@{buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_176dp}" - app:explorationViewMarginStart="@{@dimen/space_176dp}" + app:explorationViewMarginEnd="@{@dimen/submit_button_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/submit_button_item_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/submit_button_item_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_0dp}" @@ -47,8 +47,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_192dp}" - app:questionViewMarginStart="@{@dimen/space_192dp}" + app:questionViewMarginEnd="@{@dimen/submit_button_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/submit_button_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/submit_button_item_question_view_margin_top}" app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_0dp}" 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 efbbfb89e45..042745a363d 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 @@ -25,8 +25,8 @@ 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/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/submitted_answer_exploration_split_view_margin_top_no_extra_interaction_answer}" + app:explorationSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_start_extra_interaction_answer : @dimen/submitted_answer_exploration_split_view_margin_start_no_extra_interaction_answer}" + app:explorationSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_exploration_split_view_margin_top_extra_interaction_answer : @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}" @@ -34,8 +34,8 @@ app:explorationSplitViewPaddingTop="@{@dimen/space_0dp}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_176dp}" - app:explorationViewMarginStart="@{@dimen/space_208dp}" + app:explorationViewMarginEnd="@{@dimen/submitted_answer_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/submitted_answer_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewPaddingBottom="@{@dimen/space_0dp}" @@ -45,8 +45,8 @@ 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/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/submitted_answer_question_split_view_margin_top_no_extra_interaction_answer}" + app:questionSplitViewMarginStart="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_start_extra_interaction_answer : @dimen/submitted_answer_question_split_view_margin_start_no_extra_interaction_answer}" + app:questionSplitViewMarginTop="@{viewModel.isExtraInteractionAnswerCorrect() ? @dimen/submitted_answer_question_split_view_margin_top_extra_interaction_answer : @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}" @@ -54,8 +54,8 @@ app:questionSplitViewPaddingTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_192dp}" - app:questionViewMarginStart="@{@dimen/space_192dp}" + app:questionViewMarginEnd="@{@dimen/submitted_answer_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/submitted_answer_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/submitted_answer_question_view_margin_top}" app:questionViewPaddingApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewPaddingBottom="@{@dimen/space_0dp}" diff --git a/app/src/main/res/layout-sw600dp-land/text_input_interaction_item.xml b/app/src/main/res/layout-sw600dp-land/text_input_interaction_item.xml index 642f52927a1..3821e4ec6f3 100644 --- a/app/src/main/res/layout-sw600dp-land/text_input_interaction_item.xml +++ b/app/src/main/res/layout-sw600dp-land/text_input_interaction_item.xml @@ -18,8 +18,8 @@ android:focusableInTouchMode="true" android:orientation="vertical" android:padding="0dp" - app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/space_176dp : @dimen/space_192dp}" - app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_208dp : @dimen/space_192dp}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_end : @dimen/text_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_start : @dimen/text_input_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_end : @dimen/fraction_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_start : @dimen/fraction_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_end : @dimen/numeric_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_start : @dimen/numeric_input_interaction_item_non_conversation_view_margin_start}"> 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 0d548eed786..da256fe8710 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 @@ -25,10 +25,10 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_margin="@dimen/profile_chooser_profile_view_margin" - android:padding="@dimen/space_4dp" + android:padding="@dimen/profile_chooser_profile_view_parent_padding" app:layoutMarginBottom="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_0dp}" - app:layoutMarginEnd="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_170dp}" - app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/space_170dp}"> + app:layoutMarginEnd="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_parent_margin_end_profile_not_added}" + app:layoutMarginStart="@{hasProfileEverBeenAddedValue ? @dimen/space_0dp : @dimen/profile_chooser_profile_view_parent_margin_start_profile_not_added}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/selection_interaction_item_conversation_view_margin_end : @dimen/selection_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/selection_interaction_item_conversation_view_margin_start : @dimen/selection_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_end : @dimen/text_input_interaction_item_non_conversation_view_margin_end}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_start : @dimen/text_input_interaction_item_non_conversation_view_margin_start}"> + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/fraction_interaction_item_conversation_view_margin_start : @dimen/fraction_interaction_item_non_conversation_view_margin_start}"> diff --git a/app/src/main/res/layout/numeric_input_interaction_item.xml b/app/src/main/res/layout/numeric_input_interaction_item.xml index b10a7bfc9ab..6c694f96c02 100644 --- a/app/src/main/res/layout/numeric_input_interaction_item.xml +++ b/app/src/main/res/layout/numeric_input_interaction_item.xml @@ -21,7 +21,7 @@ android:orientation="vertical" android:padding="0dp" app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_end : @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:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/numeric_input_interaction_item_conversation_view_margin_start : @dimen/numeric_input_interaction_item_non_conversation_view_margin_start}"> diff --git a/app/src/main/res/layout/previous_responses_header_item.xml b/app/src/main/res/layout/previous_responses_header_item.xml index 330597499a2..3151fa44136 100644 --- a/app/src/main/res/layout/previous_responses_header_item.xml +++ b/app/src/main/res/layout/previous_responses_header_item.xml @@ -24,8 +24,8 @@ app:explorationSplitViewMarginTop="@{@dimen/previous_responses_item_exploration_split_view_margin_top}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" - app:explorationViewMarginEnd="@{@dimen/space_40dp}" - app:explorationViewMarginStart="@{@dimen/space_40dp}" + app:explorationViewMarginEnd="@{@dimen/previous_responses_item_exploration_view_margin_end}" + app:explorationViewMarginStart="@{@dimen/previous_responses_item_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/previous_responses_item_exploration_view_margin_top}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" @@ -34,8 +34,8 @@ app:questionSplitViewMarginTop="@{@dimen/previous_responses_item_question_split_view_margin_top}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" - app:questionViewMarginEnd="@{@dimen/space_40dp}" - app:questionViewMarginStart="@{@dimen/space_40dp}" + app:questionViewMarginEnd="@{@dimen/previous_responses_item_question_view_margin_end}" + app:questionViewMarginStart="@{@dimen/previous_responses_item_question_view_margin_start}" app:questionViewMarginTop="@{@dimen/previous_responses_item_question_view_margin_top}"> + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/ratio_input_interaction_item_conversation_view_margin_start : @dimen/ratio_input_interaction_item_non_conversation_view_margin_start}"> diff --git a/app/src/main/res/layout/selection_interaction_item.xml b/app/src/main/res/layout/selection_interaction_item.xml index 6a2aa4720cb..db61d9211f1 100644 --- a/app/src/main/res/layout/selection_interaction_item.xml +++ b/app/src/main/res/layout/selection_interaction_item.xml @@ -26,7 +26,7 @@ android:paddingTop="12dp" android:paddingBottom="12dp" app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/selection_interaction_item_conversation_view_margin_end : @dimen/selection_interaction_item_non_conversation_view_margin_end}" - app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/space_40dp : @dimen/selection_interaction_item_non_conversation_view_margin_start}" + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/selection_interaction_item_conversation_view_margin_start : @dimen/selection_interaction_item_non_conversation_view_margin_start}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml index 73131f9713e..6d103727bb2 100755 --- a/app/src/main/res/layout/state_fragment.xml +++ b/app/src/main/res/layout/state_fragment.xml @@ -32,7 +32,7 @@ android:clipToPadding="false" android:divider="@android:color/transparent" android:overScrollMode="never" - android:paddingTop="@{viewModel.isSplitView() ? (viewModel.isAudioBarVisible ? @dimen/space_96dp : @dimen/space_0dp) : (viewModel.isAudioBarVisible ? @dimen/state_fragment_split_view_with_audio_bar_visible_padding_top : @dimen/space_0dp)}" + android:paddingTop="@{viewModel.isSplitView() ? (viewModel.isAudioBarVisible ? @dimen/state_fragment_split_view_with_audio_bar_visible_padding_top : @dimen/space_0dp) : (viewModel.isAudioBarVisible ? @dimen/state_fragment_non_split_view_with_audio_bar_visible_padding_top : @dimen/space_0dp)}" android:scrollbars="none" app:data="@{viewModel.itemList}" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" @@ -70,8 +70,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="top" - 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: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/submit_button_item.xml b/app/src/main/res/layout/submit_button_item.xml index 80a389c8cba..9d39625dd6b 100644 --- a/app/src/main/res/layout/submit_button_item.xml +++ b/app/src/main/res/layout/submit_button_item.xml @@ -29,9 +29,9 @@ app:explorationViewMarginBottom="@{@dimen/submit_button_exploration_view_margin_bottom}" app:explorationViewMarginEnd="@{@dimen/space_0dp}" app:explorationViewMarginStart="@{@dimen/space_0dp}" - app:explorationViewMarginTop="@{@dimen/space_56dp}" + app:explorationViewMarginTop="@{@dimen/submit_button_item_exploration_view_margin_top}" app:explorationViewPaddingApplicable="@{buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" - app:explorationViewPaddingBottom="@{@dimen/space_28dp}" + app:explorationViewPaddingBottom="@{@dimen/submit_button_item_exploration_view_padding_bottom}" app:explorationViewPaddingEnd="@{@dimen/submit_button_item_exploration_view_padding_end}" app:explorationViewPaddingStart="@{@dimen/submit_button_item_exploration_view_padding_start}" app:explorationViewPaddingTop="@{@dimen/space_0dp}" @@ -49,9 +49,9 @@ app:questionViewMarginBottom="@{@dimen/submit_button_question_view_margin_bottom}" app:questionViewMarginEnd="@{@dimen/space_0dp}" app:questionViewMarginStart="@{@dimen/space_0dp}" - app:questionViewMarginTop="@{@dimen/space_56dp}" + app:questionViewMarginTop="@{@dimen/submit_button_item_question_view_margin_top}" app:questionViewPaddingApplicable="@{!buttonViewModel.hasConversationView && !buttonViewModel.isSplitView}" - app:questionViewPaddingBottom="@{@dimen/space_28dp}" + app:questionViewPaddingBottom="@{@dimen/submit_button_item_question_view_padding_bottom}" app:questionViewPaddingEnd="@{@dimen/submit_button_item_question_view_padding_end}" app:questionViewPaddingStart="@{@dimen/submit_button_item_question_view_padding_start}" app:questionViewPaddingTop="@{@dimen/space_0dp}"> diff --git a/app/src/main/res/layout/submitted_answer_item.xml b/app/src/main/res/layout/submitted_answer_item.xml index 5a840ad8eb2..f2479cbb3da 100644 --- a/app/src/main/res/layout/submitted_answer_item.xml +++ b/app/src/main/res/layout/submitted_answer_item.xml @@ -31,12 +31,12 @@ app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/submitted_answer_exploration_split_view_margin_end}" - app:explorationSplitViewMarginStart="@{@dimen/space_40dp}" + app:explorationSplitViewMarginStart="@{@dimen/submitted_answer_exploration_split_view_margin_start}" 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_exploration_view_margin_end}" - app:explorationViewMarginStart="@{@dimen/space_40dp}" + app:explorationViewMarginStart="@{@dimen/submitted_answer_exploration_view_margin_start}" app:explorationViewMarginTop="@{@dimen/submitted_answer_exploration_view_margin_top}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" diff --git a/app/src/main/res/layout/text_input_interaction_item.xml b/app/src/main/res/layout/text_input_interaction_item.xml index a8e97ad1fcc..3821e4ec6f3 100644 --- a/app/src/main/res/layout/text_input_interaction_item.xml +++ b/app/src/main/res/layout/text_input_interaction_item.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:padding="0dp" app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_end : @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}"> + app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/text_input_interaction_item_conversation_view_margin_start : @dimen/text_input_interaction_item_non_conversation_view_margin_start}"> 12dp 12dp 12dp + + 28dp + 28dp + 72dp + 96dp + 120dp + 120dp + 80dp + 80dp + 80dp + 80dp + 80dp + 80dp + 80dp + 80dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index 49d02eb70d1..5098bd0f7df 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -67,4 +67,99 @@ 8dp 8dp 8dp + 298dp + 298dp + 298dp + 298dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + 208dp + + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + 192dp + + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 176dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index 8a246238156..3949ea215f9 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -110,4 +110,64 @@ 12dp 8dp + 28dp + + 170dp + 170dp + 170dp + 170dp + + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 144dp + 124dp + + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 112dp + 84dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + 72dp + + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4481ae0a9c0..1b11bf7bf64 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -15,26 +15,85 @@ 8dp 8dp 160dp - 28dp - 96dp - 298dp - 208dp - 192dp - 176dp - 170dp - 144dp - 124dp - 120dp - 112dp - 84dp - 68dp - 56dp - 44dp - 40dp - 4dp + + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + 28dp + + 96dp + + 298dp + 298dp + 298dp + 298dp + + 176dp + 176dp + 176dp + 176dp + + 124dp + + 84dp + + 56dp + 56dp + 56dp + 56dp + 56dp + 56dp + 56dp + 56dp + 56dp + 56dp + + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + 40dp + + 4dp + 4dp + 4dp + 4dp + 0dp - 2dp - 1dp + 12dp 12dp 60dp @@ -112,10 +171,10 @@ 12dp 12dp 12dp - 12dp 24dp 24dp + 24dp 24dp 24dp 24dp @@ -219,8 +278,6 @@ 128dp 128dp 128dp - 128dp - 128dp 128dp 128dp @@ -253,39 +310,21 @@ 72dp 72dp 72dp - 72dp - 72dp 72dp 72dp - 72dp - 72dp 72dp 72dp - 72dp - 72dp - 72dp + 72dp 72dp 72dp - 72dp - 72dp 72dp 72dp - 72dp 80dp 80dp 80dp 80dp - 80dp 80dp - 80dp - 80dp - 80dp - 80dp - 80dp - 80dp - 80dp - 80dp 80dp 80dp @@ -294,14 +333,12 @@ 32dp 32dp 32dp - 32dp 32dp 32dp 32dp 32dp 32dp 32dp - 32dp 32dp 32dp 32dp diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt index d5e355a1ae0..de8ba44a1de 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt @@ -140,7 +140,7 @@ class TestFontScaleConfigurationUtilActivityTest { onView(withId(R.id.font_scale_content_text_view)).check( matches( withFontSize( - context.resources.getDimension(R.dimen.space_28dp) + context.resources.getDimension(R.dimen.font_scale_content_extra_large_text_view_size) ) ) )