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

merged 3 commits into from
May 19, 2021

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented May 11, 2021 •
edited
Loading

Explanation

Fixes part of #40
Fixes part of #42

This PR does not need to be run and check I have just changed the outer margins for the SelectionInteraction so that the UI looks consistent.

Also I have added comments below for making review simple.

Output

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

rt4914
rt4914 commented May 11, 2021
View reviewed changes
app/src/main/res/layout-land/submitted_answer_item.xml
@@ -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.

rt4914
rt4914 commented May 11, 2021
View reviewed changes
app/src/main/res/layout-sw600dp-land/submitted_answer_item.xml
@@ -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.

rt4914
rt4914 commented May 11, 2021
View reviewed changes
app/src/main/res/layout-sw600dp-port/submitted_answer_item.xml
@@ -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.

rt4914
rt4914 commented May 11, 2021
View reviewed changes
app/src/main/res/values-land/dimens.xml
@@ -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.

@rt4914 rt4914 requested a review from anandwana001 May 11, 2021 12:13
anandwana001
anandwana001 suggested changes May 17, 2021
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks @rt4914

I have one doubt, looking at these screenshots for conversation view, isn't the selection box should have the same margins as that of the question?

So, it's like:

Oppia -> margin x - "Which bird can..." - margin y
User -> margin a - "Penguin" - margin b
Oppia -> margin x - "Try again" - margin y
Oppia -> margin x - Selection dialog - margin y

Currently, it looks like the selection dialog is a user input just by looking at it.

@anandwana001 anandwana001 assigned rt4914 and unassigned anandwana001 May 17, 2021
@rt4914
Copy link
Contributor Author

rt4914 commented May 17, 2021

Thanks @rt4914

I have one doubt, looking at these screenshots for conversation view, isn't the selection box should have the same margins as that of the question?

So, it's like:

Oppia -> margin x - "Which bird can..." - margin y
User -> margin a - "Penguin" - margin b
Oppia -> margin x - "Try again" - margin y
Oppia -> margin x - Selection dialog - margin y

Currently, it looks like the selection dialog is a user input just by looking at it.

@anandwana001 Actually the current mocks are correct. All interactions are on right-hand-side. This also resonates correctly with the split-view screen (DragAndDrop).

@rt4914 rt4914 assigned anandwana001 and unassigned rt4914 May 17, 2021
anandwana001
anandwana001 approved these changes May 17, 2021
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

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

LGTM

@anandwana001 anandwana001 assigned rt4914 and unassigned anandwana001 May 17, 2021
@oppiabot oppiabot bot added the PR: LGTM label May 17, 2021
@rt4914 rt4914 merged commit 97d5212 into develop May 19, 2021
@rt4914 rt4914 deleted the selection-interaction-outer-margin branch May 19, 2021 04:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anandwana001 anandwana001 anandwana001 approved these changes

Assignees

@rt4914 rt4914

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rt4914 @anandwana001