Fix #4859, #4530: Images in 'li' tags display in inline rather than block mode. #5286

Vishwajith-Shettigar · 2023-12-23T06:15:25Z

Explanation

Fixes #4859, wrapped images inside div tag to display images in block mode.
Fixes #4530, passing (maxAvailableWidth - maxContentItemPadding) instead of passing maxAvailableWidth to calculate InitialMargin helps prevent the image from being cut off.

Essential Checklist

The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
Any changes to scripts/assets files have their rationale included in the PR explanation.
The PR follows the style guide.
The PR does not contain any unnecessary code changes from Android Studio (reference).
The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

Before	After

RTL

If your PR includes UI-related changes, then:

Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
For PRs introducing new UI elements or color changes, both light and dark mode screenshots must be included
Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

Vishwajith-Shettigar · 2023-12-23T07:03:18Z

@adhiamboperes, PTAL.

oppiabot · 2023-12-30T10:56:51Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

adhiamboperes

Thanks @Vishwajith-Shettigar!

I am looking for more clarity on the intended solution here - the code added does not appear to directly solve the issue.

utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt

oppiabot · 2024-01-17T05:08:52Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-01-24T06:27:50Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

adhiamboperes

Thanks @Vishwajith-Shettigar! PTAL.

adhiamboperes · 2024-01-29T13:34:08Z

utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt

+      val regex = Regex("""<oppia-noninteractive-image [^>]*>.*?</oppia-noninteractive-image>""")
+      val modifiedHtmlContent = rawString.replace(regex) {
+        val oppiaImageTag = it.value


DRY: This code is a duplicate of the code on line 88.

Its not exactly duplicate. Regex in line no 88 makes image align explicitly using in-line CSS (Refer #5212 PR) but this doesn't.

Even so, the regex variable is a duplicate and can be extracted outside the block to be used in both places.

utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt

oppiabot · 2024-03-16T03:52:42Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-03-23T06:51:38Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-03-30T11:40:59Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-04-08T03:49:11Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-04-15T18:10:15Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-04-23T06:58:04Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-04-30T14:13:22Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-05-10T05:19:47Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-05-17T07:04:17Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

oppiabot · 2024-05-26T02:49:08Z

Hi @Vishwajith-Shettigar, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

made concep card image block

5c2f3d3

Vishwajith-Shettigar requested review from a team as code owners December 23, 2023 06:15

Vishwajith-Shettigar requested a review from adhiamboperes December 23, 2023 06:15

Vishwajith-Shettigar and others added 3 commits December 23, 2023 12:28

test fixed

0f53710

test fixed

8a562f1

Merge branch 'develop' into imageli

e3d5b50

oppiabot bot assigned adhiamboperes Dec 23, 2023

Merge branch 'develop' into imageli

3b447f3

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Dec 30, 2023

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Dec 30, 2023

adhiamboperes requested changes Jan 2, 2024

View reviewed changes

utility/src/main/java/org/oppia/android/util/parser/html/HtmlParser.kt Outdated Show resolved Hide resolved

adhiamboperes assigned Vishwajith-Shettigar and unassigned adhiamboperes Jan 2, 2024

Vishwajith-Shettigar assigned adhiamboperes Jan 3, 2024

Vishwajith-Shettigar added 2 commits January 3, 2024 10:32

Merge branch 'develop' into imageli

3ffcc4c

Merge branch 'develop' into imageli

57cf81f

Vishwajith-Shettigar mentioned this pull request Jan 15, 2024

Units place value is not clearly visible in Rounding Numbers Revision card #4530

Open

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 17, 2024

Merge branch 'develop' into imageli

d202f23

oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 17, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 24, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 24, 2024

Merge branch 'develop' into imageli

ef7b4b5

adhiamboperes requested changes Jan 29, 2024

View reviewed changes

adhiamboperes removed their assignment Jan 29, 2024

oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 9, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 16, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 16, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 23, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 23, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 30, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 1, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 8, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 8, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 15, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 16, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 23, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 23, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 30, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 3, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 10, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 10, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 17, 2024

Vishwajith-Shettigar removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 19, 2024

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #4859, #4530: Images in 'li' tags display in inline rather than block mode. #5286

Fix #4859, #4530: Images in 'li' tags display in inline rather than block mode. #5286

Vishwajith-Shettigar commented Dec 23, 2023 •

edited

Vishwajith-Shettigar commented Dec 23, 2023

oppiabot bot commented Dec 30, 2023

adhiamboperes left a comment

oppiabot bot commented Jan 17, 2024

oppiabot bot commented Jan 24, 2024

adhiamboperes left a comment

adhiamboperes Jan 29, 2024

Vishwajith-Shettigar Jan 29, 2024

adhiamboperes Jan 29, 2024

Vishwajith-Shettigar Jan 29, 2024

oppiabot bot commented Mar 16, 2024

oppiabot bot commented Mar 23, 2024

oppiabot bot commented Mar 30, 2024

oppiabot bot commented Apr 8, 2024

oppiabot bot commented Apr 15, 2024

oppiabot bot commented Apr 23, 2024

oppiabot bot commented Apr 30, 2024

oppiabot bot commented May 10, 2024

oppiabot bot commented May 17, 2024

oppiabot bot commented May 26, 2024

Fix #4859, #4530: Images in 'li' tags display in inline rather than block mode. #5286

Are you sure you want to change the base?

Fix #4859, #4530: Images in 'li' tags display in inline rather than block mode. #5286

Conversation

Vishwajith-Shettigar commented Dec 23, 2023 • edited

Explanation

Essential Checklist

For UI-specific PRs only

Vishwajith-Shettigar commented Dec 23, 2023

oppiabot bot commented Dec 30, 2023

adhiamboperes left a comment

Choose a reason for hiding this comment

oppiabot bot commented Jan 17, 2024

oppiabot bot commented Jan 24, 2024

adhiamboperes left a comment

Choose a reason for hiding this comment

adhiamboperes Jan 29, 2024

Choose a reason for hiding this comment

Vishwajith-Shettigar Jan 29, 2024

Choose a reason for hiding this comment

adhiamboperes Jan 29, 2024

Choose a reason for hiding this comment

Vishwajith-Shettigar Jan 29, 2024

Choose a reason for hiding this comment

oppiabot bot commented Mar 16, 2024

oppiabot bot commented Mar 23, 2024

oppiabot bot commented Mar 30, 2024

oppiabot bot commented Apr 8, 2024

oppiabot bot commented Apr 15, 2024

oppiabot bot commented Apr 23, 2024

oppiabot bot commented Apr 30, 2024

oppiabot bot commented May 10, 2024

oppiabot bot commented May 17, 2024

oppiabot bot commented May 26, 2024

Vishwajith-Shettigar commented Dec 23, 2023 •

edited