Skip to content

Commit 43684db

Browse files
author
Salvatore Ranieri
committed
added new line before ul
1 parent 1357760 commit 43684db

2 files changed

Lines changed: 49 additions & 61 deletions

File tree

‎html-textview-master/HtmlSpanner/src/main/java/net/nightwhistler/htmlspanner/HtmlSpanner.java‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,44 @@
1616

1717
package net.nightwhistler.htmlspanner;
1818

19-
import java.io.IOException;
20-
import java.io.InputStream;
21-
import java.io.Reader;
22-
import java.util.HashMap;
23-
import java.util.LinkedHashMap;
24-
import java.util.Map;
25-
26-
import android.graphics.Color;
19+
import android.text.Spannable;
20+
import android.text.SpannableStringBuilder;
2721
import android.text.TextUtils;
2822
import android.util.Log;
23+
2924
import net.nightwhistler.htmlspanner.exception.ParsingCancelledException;
30-
import net.nightwhistler.htmlspanner.handlers.*;
25+
import net.nightwhistler.htmlspanner.handlers.FontHandler;
26+
import net.nightwhistler.htmlspanner.handlers.HeaderHandler;
27+
import net.nightwhistler.htmlspanner.handlers.ImageHandler;
28+
import net.nightwhistler.htmlspanner.handlers.LinkHandler;
29+
import net.nightwhistler.htmlspanner.handlers.ListItemHandler;
30+
import net.nightwhistler.htmlspanner.handlers.MonoSpaceHandler;
31+
import net.nightwhistler.htmlspanner.handlers.NewLineHandler;
32+
import net.nightwhistler.htmlspanner.handlers.PreHandler;
33+
import net.nightwhistler.htmlspanner.handlers.StyleNodeHandler;
34+
import net.nightwhistler.htmlspanner.handlers.StyledTextHandler;
35+
import net.nightwhistler.htmlspanner.handlers.SubScriptHandler;
36+
import net.nightwhistler.htmlspanner.handlers.SuperScriptHandler;
37+
import net.nightwhistler.htmlspanner.handlers.TableHandler;
38+
import net.nightwhistler.htmlspanner.handlers.UnderlineHandler;
3139
import net.nightwhistler.htmlspanner.handlers.attributes.AlignmentAttributeHandler;
32-
3340
import net.nightwhistler.htmlspanner.handlers.attributes.BorderAttributeHandler;
3441
import net.nightwhistler.htmlspanner.handlers.attributes.HorizontalLineHandler;
3542
import net.nightwhistler.htmlspanner.handlers.attributes.StyleAttributeHandler;
3643
import net.nightwhistler.htmlspanner.style.Style;
37-
import net.nightwhistler.htmlspanner.handlers.StyledTextHandler;
3844
import net.nightwhistler.htmlspanner.style.StyleValue;
45+
3946
import org.htmlcleaner.CleanerProperties;
4047
import org.htmlcleaner.ContentNode;
4148
import org.htmlcleaner.HtmlCleaner;
4249
import org.htmlcleaner.TagNode;
4350

44-
import android.text.Spannable;
45-
import android.text.SpannableStringBuilder;
51+
import java.io.IOException;
52+
import java.io.InputStream;
53+
import java.io.Reader;
54+
import java.util.HashMap;
55+
import java.util.LinkedHashMap;
56+
import java.util.Map;
4657

4758
/**
4859
* HtmlSpanner provides an alternative to Html.fromHtml() from the Android
@@ -142,6 +153,7 @@ public class HtmlSpanner {
142153
htmlTagsDictionary.put("Ú", "Ú");
143154
htmlTagsDictionary.put("<h1>","<h1 style=\"font-weight:bold\">");
144155
htmlTagsDictionary.put("<h2>","<h2 style=\"font-weight:bold\">");
156+
htmlTagsDictionary.put("<ul>","<br><ul>");
145157
}
146158

147159

‎html-textview-master/example/src/main/assets/example.html‎

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,24 @@
1-
<p><strong>Ciao</strong></p>
2-
3-
<p><u>erte rtertg </u></p>
4-
5-
<hr />
6-
<hr />
7-
8-
<h3 style="margin-left: 40px;text-decoration: underline;">h dfg</h3>
9-
10-
<p style="margin-left: 40px;text-decoration: line-through;"><span style="font-family:courier new,courier,monospace;">h df</span></p>
11-
12-
<p><span style="font-family:georgia,serif;"><span style="font-size:16px;">gh f</span></span></p>
13-
14-
<p> </p>
15-
16-
<p>Sdjfhaksdhfkhskdjhfkjsdfgsdfg</p>
17-
18-
<p>Sdfgsdfgjskldfjgkljskldfjgkjsdfgs</p>
19-
20-
<p>Dfg</p>
21-
22-
<p>Sdf</p>
23-
24-
<p>Gs</p>
25-
26-
<p>Sdjfhaksdhfkhskdjhfkjsdfgsdfg</p>
27-
28-
<p>Sdfgsdfgjskldfjgkljskldfjgkjsdfgs</p>
29-
30-
<p><strong>Dfg</strong></p>
31-
32-
<p><strong>Sdf</strong></p>
33-
34-
<p>Gs</p>
35-
36-
<p>Dfg</p>
37-
38-
<p>sdfgsdfgsdjfglkjslkdfjgkjsdfkljgsdfg</p>
39-
40-
<p>Dfg</p>
41-
42-
<p>sdfgsdfgsdjfglkjslkdfjgkjsdfkljgsdfg</p>
43-
44-
<p style="text-align: right;"><span style="font-family:georgia,serif;"><span style="font-size:16px;">rkgjdlfjgljlfgdfg</span></span></p>
45-
46-
<p style="text-align: right;"><span style="font-family:georgia,serif;"><span style="font-size:16px;">sdfgjsdfgsjdfgj</span></span></p>
47-
48-
<p><span style="font-size:1.5em;"><span style="font-family:georgia,serif;"><span style="background-color:#FF0000;">dfghdfghfdgh</span></span></span></p>
1+
<h1>That's a header 1</h1><h2>That's a header 2</h2><h3>That's a header 3</h3><h4>That's a header 4</h4><h5>That's a header 5</h5><h6>That's a header 6</h6>NomeCognome<br/>MarioRossi
2+
<div style="text-align:center">Some text displayed in center position into a paragraph <span style="background-color:blue; color:white">other text</span> (<code>span</code> markup used);<br/><big>big
3+
thing</big> (<code>big</code> markup used)<br/>
4+
<small>this is not that important</small>
5+
(<code>small</code> markup used)<br/>this is <em>very</em> simple (<code>em</code> markup used for emphasizing a word)<br/><cite>Origin of Species</cite> (a book title;<code>cite</code> markup
6+
used)<br/><em>Homo sapiens</em> (should appear in italics; <code>i</code> markup used)<br/><br/><strong>bolded</strong> (<code>b</code> markup used - just bolding with unspecified semantics)
7+
<div style="line-height:24px"><br/>&nbsp;</div>
8+
<tt>text in monospace font</tt> (<code>tt</code> markup used)<br/><u>underlined</u> text (<code>u</code> markup used)<br/><strong>bolded</strong> (<code>strong</code> markup used)
9+
<ul>
10+
<li>Test: <span>large size</span> (<code>font size=30px</code> markup used)</li>
11+
<li>Test: <span style="color:red">red text</span> (<code>font color=red</code> markup used)</li>
12+
</ul>
13+
a<sub>B</sub> (<code>sub</code> markup used)<br/>a<sup>C</sup> (<code>sup</code> markup used)
14+
</div>
15+
<ol>
16+
<li>list element 1</li>
17+
<li>list element 2</li>
18+
</ol>
19+
<div style="line-height:50px">that's a div body and a line-height<br/>with a <code>br</code> inside and a font styling<br/><span style="font-size:30px">large size</span> (<code>style=&quot;font-size:30px&quot;</code>
20+
markup used)<br/><span style="font-family:Courier">Courier font</span> (<code>style=&quot;font-family:Courier&quot;</code> markup used)<br/><span style="color:red">red text</span> (<code>style=&quot;color:red&quot;</code>
21+
markup used)<br/><em>italic text</em> (<code>style=&quot;font-style:italic&quot;</code> markup used)<p style="text-align:left">left text</p>
22+
<p style="text-align:center">centered text</p>
23+
<p style="text-align:right">right text</p>deleted text
24+
</div>

0 commit comments

Comments
 (0)