updated lineheight to support em and percentage values

Author: Salvatore Ranieri

HtmlSpanner/src/main/java/com/sysdata/htmlspanner/handlers/StyledTextHandler.java

@@ -109,11 +109,8 @@ public void handleTagNode(TagNode node, SpannableStringBuilder builder, int star
 
         //If we have a line height attribute, we apply it to the element
         if (useStyle.getLineHeight() != null && useStyle.getBackgroundColor()==null){
-            StyleValue styleValue = useStyle.getLineHeight();
-            if ( styleValue.getIntValue() > 0 ) {
-                stack.pushSpan(new StyleCallback(getSpanner().getFontResolver()
-                        .getDefaultFont(),useStyle,start,builder.length()));
-            }
+            stack.pushSpan(new StyleCallback(getSpanner().getFontResolver()
+                    .getDefaultFont(),useStyle,start,builder.length()));
         }
 
         if ( builder.length() > start ) {

HtmlSpanner/src/main/java/com/sysdata/htmlspanner/spans/LineHeightSpanImpl.java

@@ -4,24 +4,34 @@
 import android.text.style.LineHeightSpan;
 import android.util.Log;
 
+import com.sysdata.htmlspanner.style.StyleValue;
+
 /**
  * Created by Salvatore on 06/12/2017.
  */
 
 public class LineHeightSpanImpl implements LineHeightSpan {
 
-    //private final int value;
     private int mSize;
-    private static float sProportion = 0;
-    private int ascent=0;
-    private int descent=0;
 
 
     public LineHeightSpanImpl(int value) {
-        //this.value = value;
         mSize=value;
     }
 
+    public LineHeightSpanImpl(float value, StyleValue.Unit unit, Float textSize){
+        switch (unit){
+            case PX:
+                mSize = (int) value;
+                break;
+            case PERCENTAGE:
+            case EM:
+                if(textSize != null && textSize > 0){
+                    mSize = (int) (textSize * value);
+                }
+        }
+    }
+
     @Override
     public void chooseHeight(CharSequence text, int start, int end, int spanstartv, int v,
                              Paint.FontMetricsInt fm) {

HtmlSpanner/src/main/java/com/sysdata/htmlspanner/style/StyleCallback.java

@@ -85,9 +85,16 @@ public void applySpan(HtmlSpanner spanner, SpannableStringBuilder builder) {
         }
 
         //If there's a line height, we use an implementation of LineHeightSpan to draw space behind the text
-        if ( useStyle.getLineHeight() != null) {
+        if (useStyle.getLineHeight() != null) {
             //Log.d("StyleCallback", "Applying LineHeightSpan with value " + useStyle.getLineHeight().getIntValue() + " from " + start + " to " + end + " on text " + builder.subSequence(start, end));
-            builder.setSpan(new LineHeightSpanImpl((int)Math.ceil(useStyle.getLineHeight().getIntValue() * SCREEN_DENSITY)),start,end,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            StyleValue lineHeight = useStyle.getLineHeight();
+            LineHeightSpanImpl span;
+            if(lineHeight.getUnit() == StyleValue.Unit.PX){
+                span = new LineHeightSpanImpl((int) Math.ceil(lineHeight.getIntValue() * SCREEN_DENSITY));
+            } else {
+                span = new LineHeightSpanImpl(lineHeight.getFloatValue(), lineHeight.getUnit(), spanner.getTextSize());
+            }
+            builder.setSpan(span,start,end,Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
         //If there is a border, the BorderSpan will also draw the background colour if needed.

HtmlSpanner/src/main/java/com/sysdata/htmlspanner/style/StyleValue.java

@@ -24,10 +24,13 @@ public static StyleValue parse( String value ) {
             return new StyleValue(0f, Unit.EM);
         }
 
+        // removing extra spaces
+        value = value.replaceAll("\\s+","");
+
         if ( value.endsWith("px") ) {
 
             try {
-                final Integer intValue = Integer.parseInt( value.substring(0, value.length() -2) );
+                final int intValue = Integer.parseInt( value.substring(0, value.length() -2) );
                 return new StyleValue(intValue);
             } catch (NumberFormatException nfe ) {
                 Log.e("StyleValue", "Can't parse value: " + value );

htmltextview/src/main/java/com/sysdata/kt/htmltextview/SDHtmlTextView.kt

@@ -14,7 +14,7 @@ class SDHtmlTextView: TextView {
 
     constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int): super(context, attrs, defStyleAttr)
 
-    private var htmlSpanner: HtmlSpanner = HtmlSpanner(textColors.defaultColor, textSize)
+    private var htmlSpanner: HtmlSpanner
 
     var htmlText:String? = null
     set(value) {
@@ -23,7 +23,11 @@ class SDHtmlTextView: TextView {
 
     init {
         this.movementMethod = LinkMovementMethod.getInstance()
-        htmlSpanner.setBackgroundColor(solidColor)
+        htmlSpanner = HtmlSpanner.Builder()
+                .textColor(textColors.defaultColor)
+                .textSize(textSize)
+                .backgroundColor(solidColor)
+                .build()
     }
 
 }