msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Inherit list style type

Browse Source
pull/199/head
M66B 4 years ago
parent 34e693d4b8
commit a388b35970
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File

18
app/src/main/java/eu/faircode/email/HtmlHelper.java
Unescape View File

@ -826,6 +826,7 @@ public class HtmlHelper {
break; break;
case "list-style-type": case "list-style-type":
// https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
element.attr("x-list-style", value); element.attr("x-list-style", value);
break; break;
} }
@ -2731,22 +2732,25 @@ public class HtmlHelper {
ssb.append("\n"); ssb.append("\n");
int level = 0; int level = 0;
Element type = null; Element list = null;
String ltype = element.attr("x-list-style");
Element parent = element.parent(); Element parent = element.parent();
while (parent != null) { while (parent != null) {
if ("ol".equals(parent.tagName()) || "ul".equals(parent.tagName())) { if ("ol".equals(parent.tagName()) || "ul".equals(parent.tagName())) {
level++; level++;
if (type == null) if (list == null)
type = parent; list = parent;
if (TextUtils.isEmpty(ltype))
ltype = parent.attr("x-list-style");
} }
parent = parent.parent(); parent = parent.parent();
} }
if (level > 0) if (level > 0)
level--; level--;
if (type == null || "ul".equals(type.tagName())) { if (list == null || "ul".equals(list.tagName())) {
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ul
Object ul; Object ul;
String ltype = element.attr("x-list-style");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
ul = new BulletSpanEx(bulletIndent, bulletGap, colorAccent, level, ltype); ul = new BulletSpanEx(bulletIndent, bulletGap, colorAccent, level, ltype);
else else
@ -2755,10 +2759,10 @@ public class HtmlHelper {
} else { } else {
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol
int index = 0; int index = 0;
String s = type.attr("start"); String s = list.attr("start");
if (!TextUtils.isEmpty(s) && TextUtils.isDigitsOnly(s)) if (!TextUtils.isEmpty(s) && TextUtils.isDigitsOnly(s))
index = Integer.parseInt(s) - 1; index = Integer.parseInt(s) - 1;
for (Node child : type.childNodes()) { for (Node child : list.childNodes()) {
if (child instanceof Element && if (child instanceof Element &&
child.nodeName().equals(element.tagName())) { child.nodeName().equals(element.tagName())) {
index++; index++;

Write Preview
Loading…
Cancel
Save