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

Fixes #4231: Adding support for svgz images #4862

Merged
merged 12 commits into from
Feb 25, 2023
Merged

Fixes #4231: Adding support for svgz images #4862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fdd9b6b
Adding check for supporting svgz images in UrlImageParser.
supreme96 Jan 28, 2023
db70784
Merge remote-tracking branch 'origin' into svg-support
supreme96 Jan 29, 2023
8c3ceb3
Merge branch 'develop' into svg-support
BenHenning Jan 31, 2023
30c22ff
Incorporating PR suggestions
supreme96 Feb 24, 2023
1f8a917
Fix #4765: The Continue animation isn't interactive (#4814)
JishnuGoyal Feb 1, 2023
025aa29
Fix #1801: Audio player running after closing (#4629)
KevinGitonga Feb 2, 2023
558502c
Dark mode implementation - Fixed Post PR Changes Part 2 (#4867)
MohitGupta121 Feb 4, 2023
bd1db5c
Dark mode implementation - Non Visible Layouts (Topic and Practice Fr…
MohitGupta121 Feb 6, 2023
9c65e3b
Remove code owner @rt4914 from all non-xml files (#4875)
rt4914 Feb 14, 2023
7626f48
Fixed #4147 : Remove colors_migrating.xml post dark mode implementati…
MohitGupta121 Feb 20, 2023
8f27270
Merge branch 'oppia:develop' into svg-support
supreme96 Feb 24, 2023
4fba898
Merge branch 'develop' into svg-support
BenHenning Feb 25, 2023
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
4 changes: 3 additions & 1 deletion utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ class UrlImageParser private constructor(
val imageUrl = "$gcsPrefix/$gcsResourceName/$imagePath"
val proxyDrawable = ProxyDrawable()
// TODO(#1039): Introduce custom type OppiaImage for rendering Bitmap and Svg.
val isSvg = machineLocale.run { imageUrl.endsWithIgnoreCase("svg") }
val isSvg = machineLocale.run {
imageUrl.endsWithIgnoreCase("svg") || imageUrl.endsWithIgnoreCase("svgz")
}
val adjustedType = if (type == INLINE_TEXT_IMAGE && !isSvg) {
// Treat non-svg in-line images as block, instead, since only SVG is supported.
consoleLogger.w("UrlImageParser", "Forcing image $filename to block image")
Expand Down
28 changes: 28 additions & 0 deletions utility/src/test/java/org/oppia/android/util/parser/image/UrlImageParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ class UrlImageParserTest {
assertThat(loadedBitmaps.first()).contains("test_image.svg")
}

@Test
fun testGetDrawable_svgz_loadsSvgzBlockImage() {
urlImageParser.getDrawable("test_image.svgz")

val loadedBitmaps = testGlideImageLoader.getLoadedBlockSvgs()
assertThat(loadedBitmaps).hasSize(1)
assertThat(loadedBitmaps.first()).contains("test_image.svgz")
}

@Test
fun testLoadDrawable_bitmap_blockType_loadsBitmapImage() {
urlImageParser.loadDrawable("test_image.png", BLOCK_IMAGE)
Expand Down Expand Up @@ -109,6 +118,15 @@ class UrlImageParserTest {
assertThat(loadedBitmaps.first()).contains("test_image.svg")
}

@Test
fun testLoadDrawable_svgz_blockType_loadsSvgzBlockImage() {
urlImageParser.loadDrawable("test_image.svgz", BLOCK_IMAGE)

val loadedBitmaps = testGlideImageLoader.getLoadedBlockSvgs()
assertThat(loadedBitmaps).hasSize(1)
assertThat(loadedBitmaps.first()).contains("test_image.svgz")
}

@Test
fun testLoadDrawable_svg_inlineType_loadsSvgTextImage() {
urlImageParser.loadDrawable("test_image.svg", INLINE_TEXT_IMAGE)
Expand All @@ -119,6 +137,16 @@ class UrlImageParserTest {
assertThat(loadedBitmaps.first()).contains("test_image.svg")
}

@Test
fun testLoadDrawable_svgz_inlineType_loadsSvgzTextImage() {
urlImageParser.loadDrawable("test_image.svgz", INLINE_TEXT_IMAGE)

// The request to load the bitmap inline is ignored since inline bitmaps aren't supported.
val loadedBitmaps = testGlideImageLoader.getLoadedTextSvgs()
assertThat(loadedBitmaps).hasSize(1)
assertThat(loadedBitmaps.first()).contains("test_image.svgz")
}

@Test
fun testLoadDrawable_latex_inlineType_loadsInlineLatexImage() {
urlImageParser.loadMathDrawable(
Expand Down