Merge pull request #13 from SysdataSpA/feature/list_fix

Feature/list fix

Author: aguitto

.gitignore

@@ -1,13 +1,3 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
 # Generated files
 bin/
 gen/
@@ -34,22 +24,4 @@ captures/
 
 # Intellij
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/dictionaries
-.idea/libraries
-
-# Keystore files
-*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
+.idea/

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

@@ -92,7 +92,10 @@ public class HtmlSpanner {
 
     private float textSize;
 
-    private boolean textAlignCenter;
+    /**
+     * This parameter is used to modify table header text centering, by default is true
+     */
+    private Boolean tableHeaderCenter = null;
 
     /**
      * Switch to determine if CSS is used
@@ -177,18 +180,35 @@ public HtmlSpanner(int textColor,float textSize) {
      * @param cleaner
      */
     public HtmlSpanner(HtmlCleaner cleaner, FontResolver fontResolver,int textColor, float textSize) {
+        initBaseComponents(cleaner, fontResolver);
+        setTextColor(textColor);
+        setTextSize(textSize);
+        calculateBaseDimensions(textSize);
+        registerBuiltInHandlers();
+    }
+
+    private HtmlSpanner(Builder builder) {
+        initBaseComponents(createHtmlCleaner(), new SystemFontResolver());
+        setTextColor(builder.textColor);
+        setTextSize(builder.textSize);
+        setBackgroundColor(builder.backgroundColor);
+        this.tableHeaderCenter = builder.tableHeaderCenter;
+        calculateBaseDimensions(textSize);
+        registerBuiltInHandlers();
+    }
+
+    private void initBaseComponents(HtmlCleaner cleaner, FontResolver fontResolver) {
+        this.handlers = new HashMap<>();
         this.htmlCleaner = cleaner;
         this.fontResolver = fontResolver;
-        this.handlers = new HashMap<>();
-        this.textColor=textColor;
-        this.textSize=textSize;
+    }
+
+    private void calculateBaseDimensions(float textSize) {
         Paint paint = new Paint();
         paint.setTextSize(textSize);
         NUMBER_WIDTH = Math.round(paint.measureText("4."));
-        if(NUMBER_WIDTH <= 0)
         BULLET_WIDTH = Math.round(paint.measureText("\u2022"));
         BLANK_WIDTH = Math.round(paint.measureText(" "));
-        registerBuiltInHandlers();
     }
 
     public FontResolver getFontResolver() {
@@ -219,6 +239,10 @@ public float getTextSize() {
         return textSize;
     }
 
+    public void setTableHeaderCentered(boolean tableHeaderCenter) {
+        this.tableHeaderCenter = tableHeaderCenter;
+    }
+
     /**
      * Switch to specify whether excess whitespace should be stripped from the
      * input.
@@ -543,6 +567,9 @@ private void registerBuiltInHandlers() {
         TableHandler tableHandler=new TableHandler();
         tableHandler.setTextSize(textSize * 0.83f);
         tableHandler.setTextColor(textColor);
+        if(tableHeaderCenter != null){
+            tableHandler.setHeaderCentered(tableHeaderCenter);
+        }
         registerHandler("table",tableHandler);
 
         registerHandler("h1", wrap(new HeaderHandler(2f, 0.5f)));
@@ -602,4 +629,60 @@ public static interface CancellationCallback {
         boolean isCancelled();
     }
 
+    /**
+     * Builder class for {@link HtmlSpanner}
+     */
+    public static final class Builder {
+        private int backgroundColor;
+        private int textColor;
+        private float textSize;
+        private Boolean tableHeaderCenter = null;
+
+        public Builder() {
+        }
+
+        /**
+         * Set the background color, used for paragraphs and div
+         * @param value the backgournd color as int
+         * @return
+         */
+        public Builder backgroundColor(int value) {
+            backgroundColor = value;
+            return this;
+        }
+
+        /**
+         * Set the text color
+         * @param value the text color as int
+         * @return
+         */
+        public Builder textColor(int value) {
+            textColor = value;
+            return this;
+        }
+
+        /**
+         * Set the text size
+         * @param value the text size
+         * @return
+         */
+        public Builder textSize(float value) {
+            textSize = value;
+            return this;
+        }
+
+        /**
+         * use this method if you want to manage the table header text centering, by default is set to true
+         * @param value
+         * @return
+         */
+        public Builder tableHeaderCenter(boolean value) {
+            tableHeaderCenter = value;
+            return this;
+        }
+
+        public HtmlSpanner build() {
+            return new HtmlSpanner(this);
+        }
+    }
 }

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/handlers/TableHandler.java

@@ -54,6 +54,16 @@ public class TableHandler extends TagNodeHandler {
 
 	private static final int PADDING = 5;
 	private boolean hasHeader;
+	private boolean isHeaderCentered = true;
+
+	/**
+	 * Set if the header text has to be centered, by default is true
+	 *
+	 * @param headerCentered
+	 */
+	public void setHeaderCentered(boolean headerCentered) {
+		isHeaderCentered = headerCentered;
+	}
 
 	/**
 	 * Sets how wide the table should be.
@@ -117,7 +127,7 @@ private void readNode(Object node, Table table) {
             }
 
 			if (tagNode.getName().equals("th")) {
-				hasHeader = true;
+				hasHeader = isHeaderCentered;
 				Spanned result = this.getSpanner().fromTagNode(tagNode, null);
 				table.addCell(result);
 				return;
@@ -199,8 +209,8 @@ public void handleTagNode(TagNode node, SpannableStringBuilder builder,
 					drawable.getIntrinsicHeight());
 
 			int index = i == 0 ? start : builder.length() - 1;
-			builder.setSpan(new ImageSpan(drawable), index, builder.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
 			builder.append("\n");
+			builder.setSpan(new ImageSpan(drawable), index, builder.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		}
 
         /*
@@ -222,8 +232,6 @@ public Alignment getAlignment() {
                 return Alignment.ALIGN_CENTER;
             }
         }, start, builder.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        builder.append("\n");
 	}
 
 	/**

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 );