Merge pull request #15 from SysdataSpA/feature/fix_list_style

Feature/fix list style

Author: aguitto

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

@@ -511,8 +511,8 @@ private void registerBuiltInHandlers() {
 
         registerHandler("blockquote", marginHandler);
 
-        TagNodeHandler listHandler = new StyledTextHandler(new Style()
-                        .setDisplayStyle(Style.DisplayStyle.BLOCK));
+        TagNodeHandler listHandler = new BorderAttributeHandler(wrap(new StyledTextHandler(new Style()
+                        .setDisplayStyle(Style.DisplayStyle.BLOCK))));
 
         registerHandler("ul", listHandler);
         registerHandler("ol", listHandler);
@@ -603,7 +603,7 @@ private void registerBuiltInHandlers() {
         TagNodeHandler centerHandler = new StyledTextHandler(new Style().setTextAlignment(Style.TextAlignment.CENTER));
         registerHandler("center", centerHandler);
 
-        registerHandler("li", new ListItemHandler());
+        registerHandler("li", new ListItemHandler(wrap(new StyledTextHandler(spanStyle))));
 
         registerHandler("a", new LinkHandler());
         registerHandler("img", new ImageHandler());

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

@@ -18,7 +18,9 @@
 
 import com.sysdata.htmlspanner.SpanStack;
 import com.sysdata.htmlspanner.TagNodeHandler;
+import com.sysdata.htmlspanner.handlers.attributes.WrappingStyleHandler;
 import com.sysdata.htmlspanner.spans.ListItemSpan;
+import com.sysdata.htmlspanner.style.Style;
 
 import org.htmlcleaner.TagNode;
 
@@ -30,7 +32,11 @@
  * @author Alex Kuiper
  * 
  */
-public class ListItemHandler extends TagNodeHandler {
+public class ListItemHandler extends WrappingStyleHandler {
+
+	public ListItemHandler(StyledTextHandler wrappedHandler) {
+		super(wrappedHandler);
+	}
 
 	private int getMyIndex(TagNode node) {
 		if (node.getParent() == null) {
@@ -64,9 +70,7 @@ private String getParentName(TagNode node) {
 	}
 
 	@Override
-	public void handleTagNode(TagNode node, SpannableStringBuilder builder,
-			int start, int end, SpanStack spanStack) {
-
+	public void handleTagNode(TagNode node, SpannableStringBuilder builder, int start, int end, Style useStyle, SpanStack spanStack) {
 		if (builder.length() > 0
 				&& builder.charAt(builder.length() - 1) != '\n') {
 			builder.append("\n");
@@ -80,6 +84,6 @@ public void handleTagNode(TagNode node, SpannableStringBuilder builder,
 			ListItemSpan bSpan = new ListItemSpan();
             spanStack.pushSpan(bSpan, start, end);
 		}
-
+		super.handleTagNode(node, builder, start, end, useStyle, spanStack);
 	}
 }

app/src/main/java/com/sysdata/kt/sdhtmltextview/MainActivity.kt

@@ -31,11 +31,13 @@ class MainActivity : AppCompatActivity() {
                 "<td>80</td>" +
                 "</tr>" +
                 "</table>" +
+                "<span style=\"margin-left: 50px\">"+
                 "<ul>" +
-                "  <li>Coffee</li>" +
-                "  <li>Tea</li>" +
-                "  <li>Milk</li>" +
+                "  <li><span style=\"margin-left: 50px\">Coffee</span></li>" +
+                "  <li><span style=\"margin-left: 50px\">Tea</span></li>" +
+                "  <li><span style=\"margin-left: 50px\">Milk</span></li>" +
                 "</ul>" +
+                "</span>"+
                 "<table>" +
                 "<tr>" +
                 "<th>Firstname</th>" +