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

Fix #3266: [RTL] High-fi Image from rich text is center aligned in Exploration Player. #3267

Merged
merged 61 commits into from
Aug 5, 2021
Merged

Fix #3266: [RTL] High-fi Image from rich text is center aligned in Exploration Player. #3267

Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
5cf6df0
Update content_item.xml
veena14cs Jun 6, 2021
76c542f
Update selection_interaction_item.xml
veena14cs Jun 20, 2021
03dbae2
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 20, 2021
1eaa794
Update selection_interaction_item.xml
veena14cs Jun 20, 2021
c122fa9
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 22, 2021
fa01718
Update return_to_topic_button_item.xml
veena14cs Jun 24, 2021
1ddff1b
Update return_to_topic_button_item.xml
veena14cs Jun 24, 2021
75f3191
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 24, 2021
0153870
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jun 30, 2021
b655173
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 2, 2021
251b720
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 4, 2021
21402ab
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 4, 2021
4788b2e
resolved conflicts
veena14cs Jul 5, 2021
77ed59c
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 9, 2021
dd9379c
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 10, 2021
8762054
Update UrlImageParser.kt
veena14cs Jul 14, 2021
14dc4a3
Update UrlImageParser.kt
veena14cs Jul 14, 2021
43104c7
Update UrlImageParser.kt
veena14cs Jul 14, 2021
eceec2f
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 15, 2021
0a3386a
moved rtl changes in html parser
veena14cs Jul 16, 2021
b136ffc
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 16, 2021
e48c154
Merge branch 'develop' into rtl-image
veena14cs Jul 16, 2021
37d53b0
Update UrlImageParser.kt
veena14cs Jul 16, 2021
d01b5e6
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 17, 2021
a43f2cd
Merge branch 'develop' into rtl-image
veena14cs Jul 17, 2021
0871e3f
Update HtmlParser.kt
veena14cs Jul 17, 2021
7218966
Update UrlImageParser.kt
veena14cs Jul 21, 2021
65d7e5d
Added tests
veena14cs Jul 21, 2021
1494b90
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 23, 2021
231a322
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 23, 2021
9735918
revert file
veena14cs Jul 23, 2021
de34033
Update HtmlParserTest.kt
veena14cs Jul 23, 2021
a682b59
Update HtmlParserTest.kt
veena14cs Jul 23, 2021
9f0c918
Merge branch 'develop' into rtl-image
veena14cs Jul 23, 2021
2d744e1
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 25, 2021
8ad7ec4
Merge branch 'develop' into rtl-image
veena14cs Jul 25, 2021
77d9961
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 26, 2021
6f2ffbb
fixed xhanges
veena14cs Jul 28, 2021
37b1915
Replaced getDecorView with ViewCompat
veena14cs Jul 28, 2021
9c74647
Update HtmlParserTest.kt
veena14cs Jul 28, 2021
26bd197
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 29, 2021
754b2b1
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 29, 2021
9f7090d
Merge branch 'develop' into rtl-image
veena14cs Jul 29, 2021
3cd3bff
Fixed RTL testcase
veena14cs Jul 29, 2021
77e5aa9
fixed testcases
veena14cs Jul 30, 2021
36fc285
Removed post call from Html parser and removed testcoroutines from test
veena14cs Jul 31, 2021
0f02fca
Update HtmlParserTest.kt
veena14cs Jul 31, 2021
839e45a
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Jul 31, 2021
5270752
Merge branch 'develop' into rtl-image
veena14cs Jul 31, 2021
c5fccad
Update HtmlParserTest.kt
veena14cs Jul 31, 2021
005553c
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 1, 2021
9df6ef9
Merge branch 'develop' into rtl-image
veena14cs Aug 1, 2021
8fa1abd
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 3, 2021
33a5b9a
Merge branch 'develop' into rtl-image
veena14cs Aug 3, 2021
3b6cbda
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 3, 2021
1f46d54
Merge branch 'develop' into rtl-image
veena14cs Aug 3, 2021
d089c26
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 4, 2021
0d46c43
Merge branch 'develop' into rtl-image
veena14cs Aug 4, 2021
8e81c36
Update HtmlParserTest.kt
veena14cs Aug 4, 2021
4e49e45
Merge remote-tracking branch 'upstream/develop' into develop
veena14cs Aug 4, 2021
095fe08
Merge branch 'develop' into rtl-image
veena14cs Aug 4, 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
Prev Previous commit
Next Next commit
Update HtmlParserTest.kt
  • Loading branch information
@veena14cs
veena14cs committed Jul 31, 2021
commit c5fccad5a6f32a3b699775977ecbbf560675d8b9
1 change: 0 additions & 1 deletion app/src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ class HtmlParserTest {
imageCenterAlign = true
)
arrangeTextViewWithLayoutDirection(htmlParser, View.LAYOUT_DIRECTION_RTL)

val textView = arrangeTextViewWithLayoutDirection(
htmlParser,
ViewCompat.LAYOUT_DIRECTION_LTR
Expand Down