Skip to content

Feature/fix list style #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2020
Merged

Feature/fix list style #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f7f23c
added possibility to use "style" attribute in "li" tag
Dec 15, 2020
fbf5163
made also ul/ol stylable
Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions HtmlSpanner/src/main/java/com/sysdata/htmlspanner/HtmlSpanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand Down
14 changes: 9 additions & 5 deletions HtmlSpanner/src/main/java/com/sysdata/htmlspanner/handlers/ListItemHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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) {
Expand Down Expand Up @@ -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");
Expand All @@ -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);
}
}
8 changes: 5 additions & 3 deletions app/src/main/java/com/sysdata/kt/sdhtmltextview/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>" +
Expand Down