Merge pull request #11 from SysdataSpA/feature/list_fix

Feature/list fix

Author: aguitto

.idea/codeStyles/Project.xml

@@ -38,7 +38,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'net.sourceforge.htmlcleaner:htmlcleaner:2.16'
     implementation 'com.osbcp.cssparser:cssparser:1.5'
-    implementation 'io.reactivex:rxjava:1.2.10'
+    implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'io.reactivex:rxandroid:1.2.1'
 }
 

HtmlSpanner/build.gradle

@@ -53,6 +53,7 @@ public class TableHandler extends TagNodeHandler {
 	private int textColor = Color.BLACK;
 
 	private static final int PADDING = 5;
+	private boolean hasHeader;
 
 	/**
 	 * Sets how wide the table should be.
@@ -116,6 +117,7 @@ private void readNode(Object node, Table table) {
             }
 
 			if (tagNode.getName().equals("th")) {
+				hasHeader = true;
 				Spanned result = this.getSpanner().fromTagNode(tagNode, null);
 				table.addCell(result);
 				return;
@@ -192,11 +194,12 @@ public void handleTagNode(TagNode node, SpannableStringBuilder builder,
 			List<Spanned> row = table.getRows().get(i);
 			builder.append("\uFFFC");
 
-			TableRowDrawable drawable = new TableRowDrawable(row, table.isDrawBorder());
+			TableRowDrawable drawable = new TableRowDrawable(row, table.isDrawBorder(), i == 0 && hasHeader ? Alignment.ALIGN_CENTER : Alignment.ALIGN_NORMAL);
 			drawable.setBounds(0, 0, drawable.getIntrinsicWidth(),
 					drawable.getIntrinsicHeight());
 
-			builder.setSpan(new ImageSpan(drawable), start + i, builder.length(),Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			int index = i == 0 ? start : builder.length() - 1;
+			builder.setSpan(new ImageSpan(drawable), index, builder.length(),Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
 			builder.append("\n");
 		}
 
@@ -205,7 +208,7 @@ public void handleTagNode(TagNode node, SpannableStringBuilder builder,
          the last row would appear detached.
          */
         builder.append("\uFFFC");
-        Drawable drawable = new TableRowDrawable(new ArrayList<Spanned>(), table.isDrawBorder());
+        Drawable drawable = new TableRowDrawable(new ArrayList<Spanned>(), table.isDrawBorder(), Alignment.ALIGN_NORMAL);
         drawable.setBounds(0, 0, tableWidth, 1);
 
         builder.setSpan(new ImageSpan(drawable), builder.length() -1, builder.length(),
@@ -231,15 +234,17 @@ public Alignment getAlignment() {
 	 */
 	private class TableRowDrawable extends Drawable {
 
+		private final Alignment alignment;
 		private List<Spanned> tableRow;
 
         private int rowHeight;
         private boolean paintBorder;
 
-		public TableRowDrawable(List<Spanned> tableRow, boolean paintBorder) {
+		public TableRowDrawable(List<Spanned> tableRow, boolean paintBorder, Alignment alignment) {
 			this.tableRow = tableRow;
             this.rowHeight = calculateRowHeight(tableRow);
             this.paintBorder = paintBorder;
+            this.alignment = alignment;
 		}
 
 		@Override
@@ -271,7 +276,7 @@ public void draw(Canvas canvas) {
 
 				StaticLayout layout = new StaticLayout(tableRow.get(i),
 						getTextPaint(), (columnWidth - 2 * PADDING),
-						Alignment.ALIGN_NORMAL, 1f, 0f, true);
+						alignment, 1f, 0f, true);
 
 				canvas.translate(offset + PADDING, 0);
 				layout.draw(canvas);

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

@@ -86,8 +86,6 @@ public void drawBackground(Canvas c, Paint p,
         p.setStrokeWidth( strokeWidth );
         right -= strokeWidth;
 
-        p.setStyle(Paint.Style.STROKE);
-
         if ( start <= this.start ) {
             Log.d("BorderSpan", "Drawing first line");
             c.drawLine(left, top, right, top, p);

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

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.3.31'
     repositories {
         google()
         jcenter()