Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 11:25:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added inserting lines

Browse Source
This commit is contained in:
M66B
2022-02-04 10:24:30 +01:00
parent 609086c9b7
commit 679c15017f
7 changed files with 87 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1007,11 +1007,8 @@ public class HtmlHelper {
// Lines
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/hr
if (!view)
for (Element hr : document.select("hr")) {
hr.tagName("div");
hr.text(LINE);
}
for (Element hr : document.select("hr"))
hr.attr("x-keep-line", "true");
// Descriptions
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dl
@@ -2385,6 +2382,12 @@ public class HtmlHelper {
}
}
for (LineSpan span : ssb.getSpans(0, ssb.length(), LineSpan.class)) {
int start = ssb.getSpanStart(span);
int end = ssb.getSpanEnd(span);
ssb.replace(start, end, LINE);
}
return ssb.toString();
}
@@ -3001,32 +3004,34 @@ public class HtmlHelper {
break;
case "hr":
// Suppress successive lines
LineSpan[] lines = ssb.getSpans(0, ssb.length(), LineSpan.class);
int last = -1;
if (lines != null)
for (LineSpan line : lines) {
int e = ssb.getSpanEnd(line);
if (e > last)
last = e;
}
if (last >= 0) {
boolean blank = true;
for (int i = last; i < ssb.length(); i++) {
char kar = ssb.charAt(i);
if (kar != ' ' && kar != '\n' && kar != '\u00a0') {
blank = false;
break;
if (!"true".equals(element.attr("x-keep-line"))) {
LineSpan[] lines = ssb.getSpans(0, ssb.length(), LineSpan.class);
int last = -1;
if (lines != null)
for (LineSpan line : lines) {
int e = ssb.getSpanEnd(line);
if (e > last)
last = e;
}
if (last >= 0) {
boolean blank = true;
for (int i = last; i < ssb.length(); i++) {
char kar = ssb.charAt(i);
if (kar != ' ' && kar != '\n' && kar != '\u00a0') {
blank = false;
break;
}
}
}
if (blank)
break;
if (blank)
break;
}
}
boolean dashed = "true".equals(element.attr("x-dashed"));
float stroke = context.getResources().getDisplayMetrics().density;
float dash = (dashed ? line_dash_length : 0f);
ssb.append(LINE);
ssb.append("\uFFFC"); // Object replacement character
setSpan(ssb, new LineSpan(colorSeparator, stroke, dash), start, ssb.length());
break;
case "img":
@@ -3264,7 +3269,8 @@ public class HtmlHelper {
.removeAttr("x-tracking")
.removeAttr("x-border")
.removeAttr("x-list-style")
.removeAttr("x-plain");
.removeAttr("x-plain")
.remove("x-keep-line");
}
static Spanned fromHtml(@NonNull String html, Context context) {
@@ -3358,6 +3364,12 @@ public class HtmlHelper {
last.remove();
}
for (Element line : doc.select("hr")) {
Element next = line.nextElementSibling();
if (next != null && "br".equals(next.tagName()))
next.remove();
}
return doc.html();
}