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

Process more padding/margin styles

Browse Source
pull/178/head
M66B 5 years ago
parent 020fcb7031
commit a4636b2d4d
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File

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

@ -591,19 +591,40 @@ public class HtmlHelper {
} }
break; break;
case "margin":
case "padding":
case "margin-top":
case "margin-bottom":
case "padding-top": case "padding-top":
case "padding-bottom":
// https://developer.mozilla.org/en-US/docs/Web/CSS/margin
// https://developer.mozilla.org/en-US/docs/Web/CSS/padding
if (element.isBlock() && hasVisibleContent(element.childNodes())) { if (element.isBlock() && hasVisibleContent(element.childNodes())) {
Float pt = getFontSize(value, null); Float[] p = new Float[4];
if (pt != null && pt >= 0.5)
element.attr("line", "before"); String[] v = value.split(" ");
for (int i = 0; i < v.length; i++)
p[i] = getFontSize(v[i], null);
if (v.length == 1) {
p[1] = p[0];
p[2] = p[0];
p[3] = p[0];
} else if (v.length == 2) {
p[2] = p[0];
p[3] = p[1];
} }
break;
case "padding-bottom": if (key.endsWith("top"))
if (element.isBlock() && hasVisibleContent(element.childNodes())) { p[2] = null;
Float pb = getFontSize(value, null); else if (key.endsWith("bottom"))
if (pb != null && pb >= 0.5) p[0] = null;
element.attr("line", "after");
if (p[0] != null && p[0] > 0.5)
element.attr("line-before", "true");
if (p[2] != null && p[2] > 0.5)
element.attr("line-after", "true");
} }
break; break;
} }
@ -887,11 +908,12 @@ public class HtmlHelper {
for (Element div : document.select("div")) for (Element div : document.select("div"))
div.tagName("span"); div.tagName("span");
for (Element e : document.select("*[line]")) for (Element e : document.select("*[line-before],*[line-after]")) {
if ("before".equals(e.attr("line"))) if (!"".equals(e.attr("line-before")))
e.prependElement("br"); e.prependElement("br");
else if (!"".equals(e.attr("line-after")))
e.appendElement("br"); e.appendElement("br");
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
for (Element span : document.select("span")) for (Element span : document.select("span"))

Write Preview
Loading…
Cancel
Save