From 9e5461e981e0389bd449d92d842a236675a747b2 Mon Sep 17 00:00:00 2001 From: Rajat Talesra <talesra@google.com> Date: Wed, 12 May 2021 15:58:46 +0530 Subject: [PATCH 1/5] All dimens created --- .../previous_responses_header_item.xml | 76 ------------------ .../previous_responses_header_item.xml | 77 ------------------- .../previous_responses_header_item.xml | 75 ------------------ .../layout/previous_responses_header_item.xml | 2 +- app/src/main/res/values-land/dimens.xml | 28 +++++-- .../main/res/values-sw600dp-land/dimens.xml | 28 +++++-- .../main/res/values-sw600dp-port/dimens.xml | 30 +++++--- app/src/main/res/values/dimens.xml | 32 +++++--- 8 files changed, 81 insertions(+), 267 deletions(-) delete mode 100644 app/src/main/res/layout-land/previous_responses_header_item.xml delete mode 100644 app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml delete mode 100644 app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml diff --git a/app/src/main/res/layout-land/previous_responses_header_item.xml b/app/src/main/res/layout-land/previous_responses_header_item.xml deleted file mode 100644 index 1a5fae2160e..00000000000 --- a/app/src/main/res/layout-land/previous_responses_header_item.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <data> - - <variable - name="viewModel" - type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> - </data> - - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/previous_response_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clickable="true" - android:focusable="true" - android:padding="0dp" - android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}" - app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" - app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}" - app:explorationSplitViewMarginStart="@{@dimen/previous_responses_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/previous_responses_item_exploration_split_view_margin_top}" - app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" - app:explorationViewMarginBottom="@{@dimen/space_0dp}" - 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}" - app:questionSplitViewMarginEnd="@{@dimen/previous_responses_item_question_split_view_margin_end}" - app:questionSplitViewMarginStart="@{@dimen/previous_responses_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/previous_responses_item_question_split_view_margin_top}" - app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" - app:questionViewMarginBottom="@{@dimen/space_0dp}" - 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}"> - - <FrameLayout - android:layout_width="0dp" - android:layout_height="2dp" - android:background="@color/mid_grey" - app:layout_constraintBottom_toBottomOf="@+id/previous_responses_header_text" - app:layout_constraintEnd_toStartOf="@+id/previous_responses_header_text" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/previous_responses_header_text" /> - - <TextView - android:id="@+id/previous_responses_header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableEnd="@{viewModel.isExpanded ? @drawable/ic_arrow_down_grey_24dp : @drawable/ic_arrow_right_grey_24dp}" - android:fontFamily="sans-serif-medium" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:text="@{@string/previous_responses_header(viewModel.previousAnswerCount)}" - android:textAllCaps="true" - android:textColor="@color/mid_grey" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <FrameLayout - android:layout_width="0dp" - android:layout_height="2dp" - android:background="@color/mid_grey" - app:layout_constraintBottom_toBottomOf="@+id/previous_responses_header_text" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/previous_responses_header_text" - app:layout_constraintTop_toTopOf="@+id/previous_responses_header_text" /> - </androidx.constraintlayout.widget.ConstraintLayout> -</layout> diff --git a/app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml b/app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml deleted file mode 100644 index 8d1544397a2..00000000000 --- a/app/src/main/res/layout-sw600dp-land/previous_responses_header_item.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <data> - - <variable - name="viewModel" - type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> - </data> - - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/previous_response_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clickable="true" - android:focusable="true" - android:minHeight="48dp" - android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}" - android:padding="0dp" - app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" - app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}" - app:explorationSplitViewMarginStart="@{@dimen/previous_responses_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/previous_responses_item_exploration_split_view_margin_top}" - app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" - app:explorationViewMarginBottom="@{@dimen/space_0dp}" - 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}" - app:questionSplitViewMarginEnd="@{@dimen/previous_responses_item_question_split_view_margin_end}" - app:questionSplitViewMarginStart="@{@dimen/previous_responses_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/previous_responses_item_question_split_view_margin_top}" - app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" - app:questionViewMarginBottom="@{@dimen/space_0dp}" - 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}"> - - <FrameLayout - android:layout_width="0dp" - android:layout_height="2dp" - android:background="@color/mid_grey" - app:layout_constraintBottom_toBottomOf="@+id/previous_responses_header_text" - app:layout_constraintEnd_toStartOf="@+id/previous_responses_header_text" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/previous_responses_header_text" /> - - <TextView - android:id="@+id/previous_responses_header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableEnd="@{viewModel.isExpanded ? @drawable/ic_arrow_down_grey_24dp : @drawable/ic_arrow_right_grey_24dp}" - android:fontFamily="sans-serif-medium" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:text="@{@string/previous_responses_header(viewModel.previousAnswerCount)}" - android:textAllCaps="true" - android:textColor="@color/mid_grey" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <FrameLayout - android:layout_width="0dp" - android:layout_height="2dp" - android:background="@color/mid_grey" - app:layout_constraintBottom_toBottomOf="@+id/previous_responses_header_text" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/previous_responses_header_text" - app:layout_constraintTop_toTopOf="@+id/previous_responses_header_text" /> - </androidx.constraintlayout.widget.ConstraintLayout> -</layout> diff --git a/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml b/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml deleted file mode 100644 index 6a5f3f6aac3..00000000000 --- a/app/src/main/res/layout-sw600dp-port/previous_responses_header_item.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <data> - - <variable - name="viewModel" - type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> - </data> - - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/previous_response_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clickable="true" - android:focusable="true" - android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}" - app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" - app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" - app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}" - app:explorationSplitViewMarginStart="@{@dimen/previous_responses_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/previous_responses_item_exploration_split_view_margin_top}" - app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" - app:explorationViewMarginBottom="@{@dimen/space_0dp}" - 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}" - app:questionSplitViewMarginEnd="@{@dimen/previous_responses_item_question_split_view_margin_end}" - app:questionSplitViewMarginStart="@{@dimen/previous_responses_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/previous_responses_item_question_split_view_margin_top}" - app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" - app:questionViewMarginBottom="@{@dimen/space_0dp}" - 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}"> - - <FrameLayout - android:layout_width="0dp" - android:layout_height="2dp" - android:background="@color/mid_grey" - app:layout_constraintBottom_toBottomOf="@+id/previous_responses_header_text" - app:layout_constraintEnd_toStartOf="@+id/previous_responses_header_text" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@+id/previous_responses_header_text" /> - - <TextView - android:id="@+id/previous_responses_header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableEnd="@{viewModel.isExpanded ? @drawable/ic_arrow_down_grey_24dp : @drawable/ic_arrow_right_grey_24dp}" - android:fontFamily="sans-serif-medium" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:text="@{@string/previous_responses_header(viewModel.previousAnswerCount)}" - android:textAllCaps="true" - android:textColor="@color/mid_grey" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <FrameLayout - android:layout_width="0dp" - android:layout_height="2dp" - android:background="@color/mid_grey" - app:layout_constraintBottom_toBottomOf="@+id/previous_responses_header_text" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/previous_responses_header_text" - app:layout_constraintTop_toTopOf="@+id/previous_responses_header_text" /> - </androidx.constraintlayout.widget.ConstraintLayout> -</layout> 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 3151fa44136..960f9350d9f 100644 --- a/app/src/main/res/layout/previous_responses_header_item.xml +++ b/app/src/main/res/layout/previous_responses_header_item.xml @@ -15,8 +15,8 @@ android:layout_height="wrap_content" android:clickable="true" android:focusable="true" + android:minHeight="@dimen/clickable_item_min_height" android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}" - android:padding="0dp" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}" diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 34916512f64..f8aeffabf66 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -28,10 +28,6 @@ <dimen name="text_input_interaction_item_conversation_view_margin_end">48dp</dimen> <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen> <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="profile_chooser_add_view_margin_top_profile_not_added">24dp</dimen> <dimen name="profile_chooser_profile_view_margin_top_profile_not_added">24dp</dimen> @@ -57,10 +53,6 @@ <dimen name="state_fragment_non_split_view_margin_end">120dp</dimen> <dimen name="state_fragment_non_split_view_margin_start">120dp</dimen> <dimen name="numeric_input_interaction_item_conversation_view_margin_start">80dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">80dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_start">80dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">80dp</dimen> - <dimen name="previous_responses_item_question_view_margin_start">80dp</dimen> <dimen name="selection_interaction_item_conversation_view_margin_start">80dp</dimen> <dimen name="drag_drop_item_exploration_split_view_margin_top">40dp</dimen> <dimen name="drag_drop_item_question_split_view_margin_top">40dp</dimen> @@ -141,4 +133,24 @@ <!-- Selection Interaction Item --> <dimen name="selection_interaction_item_padding_start">16dp</dimen> <dimen name="selection_interaction_item_padding_end">16dp</dimen> + + <!-- Previous Responses Item: Exploration Split View --> + <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + + <!-- Previous Responses Item: Exploration View --> + <dimen name="previous_responses_item_exploration_view_margin_start">48dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">80dp</dimen> + + <!-- Previous Responses Item: Question Split View --> + <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + + <!-- Previous Responses Item: Question View --> + <dimen name="previous_responses_item_question_view_margin_start">64dp</dimen> + <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">64dp</dimen> </resources> diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index c1961d4de30..0848f0d056b 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -17,10 +17,6 @@ <dimen name="state_fragment_split_view_margin_start">64dp</dimen> <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen> <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="profile_chooser_add_view_margin_top_profile_not_added">40dp</dimen> <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen> <dimen name="profile_chooser_add_view_margin_start_profile_not_added">24dp</dimen> @@ -48,10 +44,6 @@ <dimen name="profile_chooser_profile_view_parent_margin_end_profile_not_added">298dp</dimen> <dimen name="numeric_input_interaction_item_conversation_view_margin_start">208dp</dimen> <dimen name="drag_drop_item_exploration_view_margin_start">208dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">208dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_start">208dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">208dp</dimen> - <dimen name="previous_responses_item_question_view_margin_start">208dp</dimen> <dimen name="selection_interaction_item_conversation_view_margin_start">208dp</dimen> <dimen name="submitted_answer_exploration_view_margin_start">208dp</dimen> <dimen name="text_input_interaction_item_conversation_view_margin_start">208dp</dimen> @@ -189,4 +181,24 @@ <!-- Selection Interaction Item --> <dimen name="selection_interaction_item_padding_start">24dp</dimen> <dimen name="selection_interaction_item_padding_end">24dp</dimen> + + <!-- Previous Responses Item: Exploration Split View --> + <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + + <!-- Previous Responses Item: Exploration View --> + <dimen name="previous_responses_item_exploration_view_margin_start">176dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">208dp</dimen> + + <!-- Previous Responses Item: Question Split View --> + <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + + <!-- Previous Responses Item: Question View --> + <dimen name="previous_responses_item_question_view_margin_start">192dp</dimen> + <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">192dp</dimen> </resources> diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index cf96740f8c1..5df6b05d849 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -6,8 +6,6 @@ <dimen name="home_inner_margin">60dp</dimen> <dimen name="recently_played_margin_max">120dp</dimen> <dimen name="recently_played_margin_min">60dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_end">48dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_end">48dp</dimen> <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen> <dimen name="drag_drop_item_exploration_split_view_margin_end">32dp</dimen> <dimen name="drag_drop_item_question_split_view_margin_end">32dp</dimen> @@ -44,10 +42,6 @@ <dimen name="drag_drop_item_exploration_view_margin_top">24dp</dimen> <dimen name="drag_drop_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="profile_chooser_add_view_margin_top_profile_not_added">72dp</dimen> <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen> <dimen name="profile_chooser_add_view_margin_start_profile_not_added">24dp</dimen> @@ -78,10 +72,6 @@ <dimen name="drag_drop_item_exploration_view_margin_start">144dp</dimen> <dimen name="numeric_input_interaction_item_conversation_view_margin_start">144dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">144dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_start">144dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">144dp</dimen> - <dimen name="previous_responses_item_question_view_margin_start">144dp</dimen> <dimen name="selection_interaction_item_conversation_view_margin_start">144dp</dimen> <dimen name="submitted_answer_item_exploration_view_margin_start">144dp</dimen> <dimen name="text_input_interaction_item_conversation_view_margin_start">144dp</dimen> @@ -194,4 +184,24 @@ <!-- Selection Interaction Item --> <dimen name="selection_interaction_item_padding_start">24dp</dimen> <dimen name="selection_interaction_item_padding_end">24dp</dimen> + + <!-- Previous Responses Item: Exploration Split View --> + <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + + <!-- Previous Responses Item: Exploration View --> + <dimen name="previous_responses_item_exploration_view_margin_start">112dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">144dp</dimen> + + <!-- Previous Responses Item: Question Split View --> + <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + + <!-- Previous Responses Item: Question View --> + <dimen name="previous_responses_item_question_view_margin_start">128dp</dimen> + <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">128dp</dimen> </resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 6f3259ef108..d92aa8894ae 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -68,10 +68,6 @@ <dimen name="drag_drop_item_exploration_view_margin_start">40dp</dimen> <dimen name="drag_drop_item_question_split_view_margin_top">40dp</dimen> <dimen name="numeric_input_interaction_item_conversation_view_margin_start">40dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">40dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_start">40dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">40dp</dimen> - <dimen name="previous_responses_item_question_view_margin_start">40dp</dimen> <dimen name="ratio_input_interaction_item_conversation_view_margin_start">40dp</dimen> <dimen name="selection_interaction_item_conversation_view_margin_start">40dp</dimen> <dimen name="submitted_answer_exploration_split_view_margin_start">40dp</dimen> @@ -175,10 +171,6 @@ <dimen name="previous_button_question_view_padding_end">24dp</dimen> <dimen name="previous_button_exploration_view_padding_start">24dp</dimen> <dimen name="previous_button_question_view_padding_start">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="profile_chooser_add_view_margin_top_profile_not_added">84dp</dimen> <dimen name="profile_chooser_description_margin_start_profile_not_added">24dp</dimen> <dimen name="profile_chooser_add_view_margin_end_profile_not_added">24dp</dimen> @@ -288,10 +280,6 @@ <dimen name="profile_chooser_margin_start_profile_already_added">72dp</dimen> <dimen name="profile_chooser_margin_end_profile_already_added">72dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_end">80dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_start">80dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_end">80dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_start">80dp</dimen> <dimen name="drag_drop_interaction_item_exploration_view_margin_start">80dp</dimen> <dimen name="submitted_answer_item_exploration_view_margin_start">80dp</dimen> <dimen name="text_input_interaction_item_margin_start">80dp</dimen> @@ -395,4 +383,24 @@ <!-- Selection Interaction Item --> <dimen name="selection_interaction_item_padding_start">16dp</dimen> <dimen name="selection_interaction_item_padding_end">16dp</dimen> + + <!-- Previous Responses Item: Exploration Split View --> + <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + + <!-- Previous Responses Item: Exploration View --> + <dimen name="previous_responses_item_exploration_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">40dp</dimen> + + <!-- Previous Responses Item: Question Split View --> + <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + + <!-- Previous Responses Item: Question View --> + <dimen name="previous_responses_item_question_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">32dp</dimen> </resources> From d0ed7c53d8935d1c3a76ae58a6fd468cc08081e3 Mon Sep 17 00:00:00 2001 From: Rajat Talesra <talesra@google.com> Date: Wed, 12 May 2021 16:03:11 +0530 Subject: [PATCH 2/5] Added 12dp to start/end of margins --- app/src/main/res/values-land/dimens.xml | 16 ++++++++-------- app/src/main/res/values-sw600dp-land/dimens.xml | 16 ++++++++-------- app/src/main/res/values-sw600dp-port/dimens.xml | 16 ++++++++-------- app/src/main/res/values/dimens.xml | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index f8aeffabf66..22fe92fb5b8 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -135,22 +135,22 @@ <dimen name="selection_interaction_item_padding_end">16dp</dimen> <!-- Previous Responses Item: Exploration Split View --> - <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> - <dimen name="previous_responses_item_exploration_view_margin_start">48dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_start">60dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">80dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">92dp</dimen> <!-- Previous Responses Item: Question Split View --> - <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> - <dimen name="previous_responses_item_question_view_margin_start">64dp</dimen> + <dimen name="previous_responses_item_question_view_margin_start">76dp</dimen> <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">64dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">76dp</dimen> </resources> diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index 0848f0d056b..1d4dd2811b5 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -183,22 +183,22 @@ <dimen name="selection_interaction_item_padding_end">24dp</dimen> <!-- Previous Responses Item: Exploration Split View --> - <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> - <dimen name="previous_responses_item_exploration_view_margin_start">176dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_start">188dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">208dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">220dp</dimen> <!-- Previous Responses Item: Question Split View --> - <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> - <dimen name="previous_responses_item_question_view_margin_start">192dp</dimen> + <dimen name="previous_responses_item_question_view_margin_start">204dp</dimen> <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">192dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">204dp</dimen> </resources> diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index 5df6b05d849..50115dda5c1 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -186,22 +186,22 @@ <dimen name="selection_interaction_item_padding_end">24dp</dimen> <!-- Previous Responses Item: Exploration Split View --> - <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> - <dimen name="previous_responses_item_exploration_view_margin_start">112dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_start">124dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">144dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">156dp</dimen> <!-- Previous Responses Item: Question Split View --> - <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> - <dimen name="previous_responses_item_question_view_margin_start">128dp</dimen> + <dimen name="previous_responses_item_question_view_margin_start">140dp</dimen> <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">128dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">140dp</dimen> </resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d92aa8894ae..db4042f8b96 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -385,22 +385,22 @@ <dimen name="selection_interaction_item_padding_end">16dp</dimen> <!-- Previous Responses Item: Exploration Split View --> - <dimen name="previous_responses_item_exploration_split_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_end">40dp</dimen> + <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> - <dimen name="previous_responses_item_exploration_view_margin_start">24dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_start">36dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_end">40dp</dimen> + <dimen name="previous_responses_item_exploration_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Question Split View --> - <dimen name="previous_responses_item_question_split_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_end">32dp</dimen> + <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> - <dimen name="previous_responses_item_question_view_margin_start">32dp</dimen> + <dimen name="previous_responses_item_question_view_margin_start">44dp</dimen> <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> - <dimen name="previous_responses_item_question_view_margin_end">32dp</dimen> + <dimen name="previous_responses_item_question_view_margin_end">44dp</dimen> </resources> From e8ae36a42fe5fecc3d419f0e23b3f5a39da3098c Mon Sep 17 00:00:00 2001 From: Rajat Talesra <talesra@google.com> Date: Wed, 12 May 2021 16:34:40 +0530 Subject: [PATCH 3/5] Nit fixes --- app/src/main/res/layout/previous_responses_header_item.xml | 1 + 1 file changed, 1 insertion(+) 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 960f9350d9f..fbc0bbf3f4f 100644 --- a/app/src/main/res/layout/previous_responses_header_item.xml +++ b/app/src/main/res/layout/previous_responses_header_item.xml @@ -53,6 +53,7 @@ android:layout_height="wrap_content" android:drawableEnd="@{viewModel.isExpanded ? @drawable/ic_arrow_down_grey_24dp : @drawable/ic_arrow_right_grey_24dp}" android:fontFamily="sans-serif-medium" + android:gravity="center_vertical" android:paddingStart="8dp" android:paddingEnd="8dp" android:text="@{@string/previous_responses_header(viewModel.previousAnswerCount)}" From 629d2b715698d3d44ba799a49dba9ae690a929ad Mon Sep 17 00:00:00 2001 From: Rajat Talesra <talesra@google.com> Date: Wed, 12 May 2021 17:22:32 +0530 Subject: [PATCH 4/5] Nit change --- .../main/res/layout/previous_responses_header_item.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 fbc0bbf3f4f..2559e684437 100644 --- a/app/src/main/res/layout/previous_responses_header_item.xml +++ b/app/src/main/res/layout/previous_responses_header_item.xml @@ -17,26 +17,27 @@ android:focusable="true" android:minHeight="@dimen/clickable_item_min_height" android:onClick="@{(v) -> viewModel.onResponsesHeaderClicked()}" + android:paddingTop="24dp" app:explorationSplitViewMarginApplicable="@{viewModel.hasConversationView && viewModel.isSplitView}" app:explorationSplitViewMarginBottom="@{@dimen/space_0dp}" app:explorationSplitViewMarginEnd="@{@dimen/previous_responses_item_exploration_split_view_margin_end}" app:explorationSplitViewMarginStart="@{@dimen/previous_responses_item_exploration_split_view_margin_start}" - app:explorationSplitViewMarginTop="@{@dimen/previous_responses_item_exploration_split_view_margin_top}" + app:explorationSplitViewMarginTop="@{@dimen/space_0dp}" app:explorationViewMarginApplicable="@{viewModel.hasConversationView && !viewModel.isSplitView}" app:explorationViewMarginBottom="@{@dimen/space_0dp}" 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:explorationViewMarginTop="@{@dimen/space_0dp}" app:questionSplitViewMarginApplicable="@{!viewModel.hasConversationView && viewModel.isSplitView}" app:questionSplitViewMarginBottom="@{@dimen/space_0dp}" app:questionSplitViewMarginEnd="@{@dimen/previous_responses_item_question_split_view_margin_end}" app:questionSplitViewMarginStart="@{@dimen/previous_responses_item_question_split_view_margin_start}" - app:questionSplitViewMarginTop="@{@dimen/previous_responses_item_question_split_view_margin_top}" + app:questionSplitViewMarginTop="@{@dimen/space_0dp}" app:questionViewMarginApplicable="@{!viewModel.hasConversationView && !viewModel.isSplitView}" app:questionViewMarginBottom="@{@dimen/space_0dp}" 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:questionViewMarginTop="@{@dimen/space_0dp}"> <FrameLayout android:layout_width="0dp" From c34b8ff54bd6a4d067e5925e0c0884cedffa83a1 Mon Sep 17 00:00:00 2001 From: Rajat Talesra <talesra@google.com> Date: Wed, 12 May 2021 17:25:30 +0530 Subject: [PATCH 5/5] Removed margin top dimens --- app/src/main/res/values-land/dimens.xml | 4 ---- app/src/main/res/values-sw600dp-land/dimens.xml | 4 ---- app/src/main/res/values-sw600dp-port/dimens.xml | 4 ---- app/src/main/res/values/dimens.xml | 4 ---- 4 files changed, 16 deletions(-) diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 22fe92fb5b8..615d6d2a64f 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -136,21 +136,17 @@ <!-- Previous Responses Item: Exploration Split View --> <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> <dimen name="previous_responses_item_exploration_view_margin_start">60dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_end">92dp</dimen> <!-- Previous Responses Item: Question Split View --> <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> <dimen name="previous_responses_item_question_view_margin_start">76dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_view_margin_end">76dp</dimen> </resources> diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml index 1d4dd2811b5..ec49e5e58e1 100644 --- a/app/src/main/res/values-sw600dp-land/dimens.xml +++ b/app/src/main/res/values-sw600dp-land/dimens.xml @@ -184,21 +184,17 @@ <!-- Previous Responses Item: Exploration Split View --> <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> <dimen name="previous_responses_item_exploration_view_margin_start">188dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_end">220dp</dimen> <!-- Previous Responses Item: Question Split View --> <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> <dimen name="previous_responses_item_question_view_margin_start">204dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_view_margin_end">204dp</dimen> </resources> diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml index 50115dda5c1..ac7251fdd90 100644 --- a/app/src/main/res/values-sw600dp-port/dimens.xml +++ b/app/src/main/res/values-sw600dp-port/dimens.xml @@ -187,21 +187,17 @@ <!-- Previous Responses Item: Exploration Split View --> <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> <dimen name="previous_responses_item_exploration_view_margin_start">124dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_end">156dp</dimen> <!-- Previous Responses Item: Question Split View --> <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> <dimen name="previous_responses_item_question_view_margin_start">140dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_view_margin_end">140dp</dimen> </resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index db4042f8b96..f6739877b03 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -386,21 +386,17 @@ <!-- Previous Responses Item: Exploration Split View --> <dimen name="previous_responses_item_exploration_split_view_margin_start">36dp</dimen> - <dimen name="previous_responses_item_exploration_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_split_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Exploration View --> <dimen name="previous_responses_item_exploration_view_margin_start">36dp</dimen> - <dimen name="previous_responses_item_exploration_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_exploration_view_margin_end">52dp</dimen> <!-- Previous Responses Item: Question Split View --> <dimen name="previous_responses_item_question_split_view_margin_start">44dp</dimen> - <dimen name="previous_responses_item_question_split_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_split_view_margin_end">44dp</dimen> <!-- Previous Responses Item: Question View --> <dimen name="previous_responses_item_question_view_margin_start">44dp</dimen> - <dimen name="previous_responses_item_question_view_margin_top">24dp</dimen> <dimen name="previous_responses_item_question_view_margin_end">44dp</dimen> </resources>