Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes part of #40 & #42: Outer margins changed for SelectionInteraction #3183

Merged
merged 3 commits into from
May 19, 2021
Merged

Fixes part of #40 & #42: Outer margins changed for SelectionInteraction #3183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9ea557
Outer margins changed for selection interaction
May 11, 2021
4ad89dd
Nit fixes and alignment fixes
May 11, 2021
e668cf3
Merged with develop
May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/layout-land/submitted_answer_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:textSize="16sp"
android:visibility="gone"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer && !viewModel.hasConversationView ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change done which was missed in #3172 but this file will eventually get removed in coming PRs. Just fixed it so that there is no confusion while checking the screenshots.

app:layout_constraintHorizontal_bias="@{viewModel.hasConversationView ? 1 : 0}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
android:textSize="16sp"
android:visibility="gone"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer && !viewModel.hasConversationView ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change done which was missed in #3172 but this file will eventually get removed in coming PRs. Just fixed it so that there is no confusion while checking the screenshots.

app:layout_constraintHorizontal_bias="@{viewModel.hasConversationView ? 1 : 0}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
android:textSize="16sp"
android:visibility="gone"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
app:layout_constraintEnd_toEndOf="@{viewModel.isCorrectAnswer && !viewModel.hasConversationView ? @id/answer_tick_guideline : ConstraintSet.PARENT_ID}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change done which was missed in #3172 but this file will eventually get removed in coming PRs. Just fixed it so that there is no confusion while checking the screenshots.

app:layout_constraintHorizontal_bias="@{viewModel.hasConversationView ? 1 : 0}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/res/layout/selection_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
android:id="@+id/interaction_container_linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="0dp"
android:background="@{viewModel.hasConversationView ? @drawable/rounded_rect_grey_border_white_background : @drawable/rounded_rect_white_background}"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
Expand All @@ -27,8 +25,9 @@
android:paddingTop="12dp"
android:paddingEnd="@dimen/selection_interaction_item_padding_end"
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/selection_interaction_item_conversation_view_margin_start : @dimen/selection_interaction_item_non_conversation_view_margin_start}"
app:layoutMarginEnd="@{viewModel.hasConversationView ? @dimen/interaction_item_exploration_view_margin_end : @dimen/interaction_item_question_view_margin_end}"
app:layoutMarginStart="@{viewModel.hasConversationView ? @dimen/interaction_item_exploration_view_margin_start : @dimen/interaction_item_question_view_margin_start}"
app:layoutMarginTop="@{viewModel.hasConversationView ? @dimen/interaction_item_exploration_view_margin_top : @dimen/interaction_item_question_view_margin_top}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">

Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/values-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,9 @@
<dimen name="drag_drop_item_question_view_margin_end">64dp</dimen>
<dimen name="drag_drop_item_question_view_margin_start">64dp</dimen>

<dimen name="selection_interaction_item_non_conversation_view_margin_end">64dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_start">64dp</dimen>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed not-required dimens in all files.


<dimen name="drag_drop_interaction_item_exploration_view_margin_start">80dp</dimen>
<dimen name="drag_drop_item_exploration_view_margin_end">48dp</dimen>
<dimen name="numeric_input_interaction_item_conversation_view_margin_end">48dp</dimen>
<dimen name="selection_interaction_item_conversation_view_margin_end">48dp</dimen>
<dimen name="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>
Expand Down Expand Up @@ -53,7 +49,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="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>
<dimen name="submitted_answer_exploration_split_view_margin_start">40dp</dimen>
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/res/values-sw600dp-land/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +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="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>

Expand All @@ -65,8 +64,6 @@
<dimen name="return_to_topic_button_item_question_view_margin_end">192dp</dimen>
<dimen name="return_to_topic_button_item_question_view_margin_start">192dp</dimen>
<dimen name="previous_button_item_question_view_margin_start">192dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_end">192dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_start">192dp</dimen>
<dimen name="state_fragment_non_split_view_margin_end">192dp</dimen>
<dimen name="state_fragment_non_split_view_margin_start">192dp</dimen>
<dimen name="submit_button_item_question_view_margin_end">192dp</dimen>
Expand All @@ -83,7 +80,6 @@
<dimen name="next_button_item_exploration_view_margin_start">176dp</dimen>
<dimen name="numeric_input_interaction_item_conversation_view_margin_end">176dp</dimen>
<dimen name="previous_button_item_exploration_view_margin_start">176dp</dimen>
<dimen name="selection_interaction_item_conversation_view_margin_end">176dp</dimen>
<dimen name="submit_button_item_exploration_view_margin_end">176dp</dimen>
<dimen name="submit_button_item_exploration_view_margin_start">176dp</dimen>
<dimen name="submitted_answer_item_exploration_view_margin_end">176dp</dimen>
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/res/values-sw600dp-port/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
<dimen name="return_to_topic_button_item_exploration_view_margin_start">128dp</dimen>
<dimen name="return_to_topic_button_item_question_view_margin_end">128dp</dimen>
<dimen name="return_to_topic_button_item_question_view_margin_start">128dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_end">128dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_start">128dp</dimen>
<dimen name="state_fragment_non_split_view_margin_end">128dp</dimen>
<dimen name="state_fragment_non_split_view_margin_start">128dp</dimen>
<dimen name="submit_button_item_question_view_margin_end">128dp</dimen>
Expand Down Expand Up @@ -72,7 +70,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="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>
<dimen name="profile_chooser_fragment_margin_top_profile_not_added">124dp</dimen>
Expand All @@ -86,7 +83,6 @@
<dimen name="next_button_item_exploration_view_margin_start">112dp</dimen>
<dimen name="numeric_input_interaction_item_conversation_view_margin_end">112dp</dimen>
<dimen name="previous_button_item_exploration_view_margin_start">112dp</dimen>
<dimen name="selection_interaction_item_conversation_view_margin_end">112dp</dimen>
<dimen name="submit_button_item_exploration_view_margin_end">112dp</dimen>
<dimen name="submit_button_item_exploration_view_margin_start">112dp</dimen>
<dimen name="submitted_answer_item_exploration_view_margin_end">112dp</dimen>
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
<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="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>
<dimen name="submitted_answer_exploration_view_margin_start">40dp</dimen>
<dimen name="text_input_interaction_item_conversation_view_margin_start">40dp</dimen>
Expand Down Expand Up @@ -188,7 +187,6 @@
<dimen name="return_to_topic_button_exploration_view_padding_start">24dp</dimen>
<dimen name="return_to_topic_button_question_view_padding_end">24dp</dimen>
<dimen name="return_to_topic_button_question_view_padding_start">24dp</dimen>
<dimen name="selection_interaction_item_conversation_view_margin_end">24dp</dimen>
<dimen name="submit_button_item_exploration_view_padding_end">24dp</dimen>
<dimen name="submit_button_item_exploration_view_padding_start">24dp</dimen>
<dimen name="submit_button_item_question_view_padding_end">24dp</dimen>
Expand Down Expand Up @@ -290,8 +288,6 @@
<dimen name="drag_drop_item_question_split_view_margin_start">32dp</dimen>
<dimen name="drag_drop_item_question_view_margin_end">32dp</dimen>
<dimen name="drag_drop_item_question_view_margin_start">32dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_start">32dp</dimen>
<dimen name="selection_interaction_item_non_conversation_view_margin_end">32dp</dimen>
<dimen name="state_fragment_split_view_margin_start">32dp</dimen>
<dimen name="state_fragment_split_view_margin_end">32dp</dimen>
<dimen name="submitted_answer_item_question_split_view_margin_end">32dp</dimen>
Expand Down