fix: add image width and height image attributes in Android parser

Author: kacperzolkiewski

android/src/main/java/com/swmansion/enriched/spans/EnrichedImageSpan.kt

@@ -8,20 +8,19 @@ import android.net.Uri
 import android.text.style.ImageSpan
 import androidx.core.graphics.withSave
 import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.styles.HtmlStyle
 
 class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
-  private var width: Float = 0F
-  private var height: Float = 0F
-  private var htmlStyle: HtmlStyle? = null
+  private var width: Int = 0
+  private var height: Int = 0
 
-  constructor(context: Context, uri: Uri, width: Float, height: Float) : super(context, uri, ALIGN_BASELINE) {
+  constructor(context: Context, uri: Uri, width: Int, height: Int) : super(context, uri, ALIGN_BASELINE) {
     this.width = width
     this.height = height
   }
 
-  constructor(drawable: Drawable, source: String, htmlStyle: HtmlStyle) : super(drawable, source, ALIGN_BASELINE) {
-    this.htmlStyle = htmlStyle
+  constructor(drawable: Drawable, source: String, width: Int, height: Int) : super(drawable, source, ALIGN_BASELINE) {
+    this.width = width
+    this.height = height
   }
 
   override fun draw(
@@ -38,7 +37,15 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
 
   override fun getDrawable(): Drawable {
     val drawable = super.getDrawable()
-    drawable.setBounds(0, 0, width.toInt(), height.toInt())
+    drawable.setBounds(0, 0, width, height)
     return drawable
   }
+
+  fun getWidth(): Int {
+    return width
+  }
+
+  fun getHeight(): Int {
+    return height
+  }
 }

android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt

@@ -191,7 +191,7 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     val imageWidth = width ?: view.htmlStyle.imgWidth
     val imageHeight = height ?: view.htmlStyle.imgHeight
 
-    val span = EnrichedImageSpan(view.context, uri, imageWidth, imageHeight)
+    val span = EnrichedImageSpan(view.context, uri, imageWidth.toInt(), imageHeight.toInt())
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
     spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }

android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java

@@ -275,7 +275,15 @@ private static void withinParagraph(StringBuilder out, Spanned text, int start,
         if (style[j] instanceof EnrichedImageSpan) {
           out.append("<img src=\"");
           out.append(((EnrichedImageSpan) style[j]).getSource());
-          out.append("\">");
+
+          out.append(" width=\"");
+          out.append(((EnrichedImageSpan) style[j]).getWidth());
+          out.append("\"");
+
+          out.append(" height=\"");
+          out.append(((EnrichedImageSpan) style[j]).getHeight());
+
+          out.append("\"/>");
           // Don't output the placeholder character underlying the image.
           i = next;
         }
@@ -454,7 +462,7 @@ private void handleStartTag(String tag, Attributes attributes) {
     } else if (tag.equalsIgnoreCase("h3")) {
       startHeading(mSpannableStringBuilder, 3);
     } else if (tag.equalsIgnoreCase("img")) {
-      startImg(mSpannableStringBuilder, attributes, mImageGetter, mStyle);
+      startImg(mSpannableStringBuilder, attributes, mImageGetter);
     } else if (tag.equalsIgnoreCase("code")) {
       start(mSpannableStringBuilder, new Code());
     } else if (tag.equalsIgnoreCase("mention")) {
@@ -679,8 +687,11 @@ private static void end(Editable text, Class kind, Object repl) {
     }
   }
 
-  private static void startImg(Editable text, Attributes attributes, EnrichedParser.ImageGetter img, HtmlStyle style) {
+  private static void startImg(Editable text, Attributes attributes, EnrichedParser.ImageGetter img) {
     String src = attributes.getValue("", "src");
+    String width = attributes.getValue("", "width");
+    String height = attributes.getValue("", "height");
+
     Drawable d = null;
     if (img != null) {
       d = img.getDrawable(src);
@@ -692,7 +703,7 @@ private static void startImg(Editable text, Attributes attributes, EnrichedParse
 
     int len = text.length();
     text.append("");
-    text.setSpan(new EnrichedImageSpan(d, src, style), len, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+    text.setSpan(new EnrichedImageSpan(d, src, Integer.parseInt(width), Integer.parseInt(height)), len, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
   }
 
   private static void startA(Editable text, Attributes attributes) {