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 #3345 Images are not fully displayed #5234

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Fix #3345 Images are not fully displayed #5234

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ad7142
modified drawable width
Vishwajith-Shettigar Nov 17, 2023
65c7e2a
drawable width calculated
Vishwajith-Shettigar Nov 21, 2023
a0affa8
Merge branch 'develop' into imagecutoff
Vishwajith-Shettigar Nov 21, 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
9 changes: 7 additions & 2 deletions 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 @@ -268,6 +268,8 @@ class UrlImageParser private constructor(

var drawableWidth = drawable.intrinsicWidth.toFloat()
var drawableHeight = drawable.intrinsicHeight.toFloat()
val maxContentItemPadding =
context.resources.getDimensionPixelSize(R.dimen.maximum_content_item_padding)
if (autoResizeImage) {
// Treat the drawable's dimensions as dp so that the image scales for higher density
// displays.
Expand All @@ -291,8 +293,7 @@ class UrlImageParser private constructor(
drawableHeight *= multipleFactor
drawableWidth *= multipleFactor
}
val maxContentItemPadding =
context.resources.getDimensionPixelSize(R.dimen.maximum_content_item_padding)

val maximumImageSize = maxAvailableWidth - maxContentItemPadding
if (drawableWidth >= maximumImageSize) {
// The multipleFactor value is used to make sure that the aspect ratio of the image
Expand All @@ -311,6 +312,10 @@ class UrlImageParser private constructor(
}
}

if (drawableWidth >= (maxAvailableWidth - maxContentItemPadding)) {
drawableWidth -= maxContentItemPadding
}

val drawableLeft = if (imageCenterAlign && !isRTLMode()) {
calculateInitialMargin(maxAvailableWidth, drawableWidth)
} else {
Expand Down
Loading