Merge branch 'technical-analytics-milestone-2' of github.com:kkmurerw…

…a/oppia-android into technical-analytics-milestone-2
oppia · Nov 24, 2023 · f8f0062 · f8f0062
2 parents 493d4c1 + 4de5981
commit f8f0062
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt b/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
@@ -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.
@@ -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
@@ -311,6 +312,10 @@ class UrlImageParser private constructor(
           }
         }
 
+        if (drawableWidth >= (maxAvailableWidth - maxContentItemPadding)) {
+          drawableWidth -= maxContentItemPadding
+        }
+
         val drawableLeft = if (imageCenterAlign && !isRTLMode()) {
           calculateInitialMargin(maxAvailableWidth, drawableWidth)
         } else {