Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 13:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplified quote/html

Browse Source
This commit is contained in:
M66B
2021-07-08 07:50:49 +02:00
parent 7a3ee41f41
commit eb110a581c
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/faircode/email/HtmlEx.java
View File

@@ -29,6 +29,7 @@ import android.text.style.BulletSpan;
import android.text.style.CharacterStyle;
import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan;
import android.text.style.LeadingMarginSpan;
import android.text.style.ParagraphStyle;
import android.text.style.QuoteSpan;
import android.text.style.RelativeSizeSpan;
@@ -136,23 +137,25 @@ public class HtmlEx {
int option) {
int next;
for (int i = start; i < end; i = next) {
int n1 = text.nextSpanTransition(i, end, QuoteSpan.class);
int n2 = text.nextSpanTransition(i, end, eu.faircode.email.IndentSpan.class);
Class type = (n1 < n2 ? QuoteSpan.class : eu.faircode.email.IndentSpan.class);
next = Math.min(n1, n2);
Object[] quotes = text.getSpans(i, next, type);
next = text.nextSpanTransition(i, end, LeadingMarginSpan.class);
List<Object> spans = new ArrayList<>();
for (Object span : text.getSpans(i, next, LeadingMarginSpan.class))
if (span instanceof QuoteSpan ||
span instanceof eu.faircode.email.IndentSpan)
spans.add(span);
for (Object quote : quotes) {
if (quote instanceof QuoteSpan)
out.append("<blockquote style=\"" +
eu.faircode.email.HtmlHelper.getQuoteStyle(text, next, end) + "\">");
else
for (Object span : spans) {
if (span instanceof QuoteSpan)
out.append("<blockquote style=\"")
.append(eu.faircode.email.HtmlHelper.getQuoteStyle(text, next, end))
.append("\">");
else if (span instanceof eu.faircode.email.IndentSpan)
out.append("<blockquote>");
}
withinBlockquote(out, text, i, next, option);
for (Object quote : quotes) {
for (Object span : spans) {
out.append("</blockquote>\n");
}
}