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.

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

Fix #429: Image left/centre side issue #452

Merged
merged 3 commits into from
Nov 20, 2019
Merged

Conversation

rt4914
Copy link
Contributor

@rt4914 rt4914 commented Nov 20, 2019

Explanation

This PR makes sure, that images are left in options and centre in content card.
Screenshot_1574252776
Screenshot_1574252895

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
Copy link
Contributor Author

rt4914 commented Nov 20, 2019

@veena14cs Please check whether the true/false has been transferred correctly across all html parser usage or not.

True for image in centre
false for image to left.

@veena14cs
Copy link
Contributor

@veena14cs Please check whether the true/false has been transferred correctly across all html parser usage or not.

True for image in centre
false for image to left.

Okay will check it through.

@@ -22,7 +22,7 @@ class HtmlParserTestActivity : InjectableAppCompatActivity() {
val rawDummyString =
"\u003cp\u003e\"Let's try one last question,\" said Mr. Baker. \"Here's a pineapple cake cut into pieces.\"\u003c/p\u003e\u003coppia-noninteractive-image alt-with-value=\"\u0026amp;quot;Pineapple cake with 7/9 having cherries.\u0026amp;quot;\" caption-with-value=\"\u0026amp;quot;\u0026amp;quot;\" filepath-with-value=\"\u0026amp;quot;pineapple_cake_height_479_width_480.png\u0026amp;quot;\"\u003e\u003c/oppia-noninteractive-image\u003e\u003cp\u003e\u00a0\u003c/p\u003e\u003cp\u003e\u003cstrong\u003eQuestion 6\u003c/strong\u003e: What fraction of the cake has big red cherries in the pineapple slices?\u003c/p\u003e"
val htmlResult: Spannable =
htmlParserFactory.create( /* entityType= */ "exploration", /* entityId= */ "oppia")
htmlParserFactory.create( /* entityType= */ "exploration", /* entityId= */ "oppia", /* imageCenterAlign= */ false)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@veena14cs Is this correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

it should be true here. As it is checking content.

Copy link
Contributor

@veena14cs veena14cs left a comment

Choose a reason for hiding this comment

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

LGTM

@veena14cs veena14cs assigned rt4914 and unassigned veena14cs Nov 20, 2019
@oppia oppia deleted a comment from rt4914 Nov 20, 2019
@oppia oppia deleted a comment from rt4914 Nov 20, 2019
@rt4914 rt4914 merged commit 8cec4f4 into develop Nov 20, 2019
@rt4914 rt4914 deleted the images-center-code-fix branch November 20, 2019 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants