mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Custom rendering: variable font size

This commit is contained in:
M66B 2020-04-28 09:02:07 +02:00
parent 302f2918ab
commit 71a14bfea7
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.BulletSpan;
import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan;
@ -539,43 +540,20 @@ public class HtmlHelper {
if (!text_size)
continue;
Float current = null;
Element parent = element.parent();
if (parent != null) {
boolean set = false;
boolean small = false;
boolean big = false;
Integer current = null;
while (parent != null) {
if (!set) {
if ("small".equals(parent.tagName())) {
set = true;
small = true;
}
if ("big".equals(parent.tagName())) {
set = true;
big = true;
}
}
String xFontSize = parent.attr("x-font-size");
if (!TextUtils.isEmpty(xFontSize)) {
current = Integer.parseInt(xFontSize);
current = Float.parseFloat(xFontSize);
break;
}
parent = parent.parent();
}
Float fsize = getFontSize(value, current);
if (fsize != null && fsize != 0 &&
((!small && fsize <= FONT_SMALL) || (!big && fsize >= FONT_LARGE))) {
Element e = new Element(fsize < 1 ? "small" : "big");
int px = Math.round(DEFAULT_FONT_SIZE * fsize);
e.attr("x-font-size", Integer.toString(px));
element.replaceWith(e);
e.appendChild(element);
}
}
if (fsize != null && fsize != 0)
element.attr("x-font-size", Float.toString(fsize));
break;
case "font-weight":
@ -1090,19 +1068,20 @@ public class HtmlHelper {
return null;
}
private static Float getFontSize(String value, Integer current) {
private static Float getFontSize(String value, Float current) {
// https://developer.mozilla.org/en-US/docs/Web/CSS/font-size
if (TextUtils.isEmpty(value))
return null;
if (current == null)
current = 1.0f;
if (value.contains("calc") ||
"auto".equals(value) ||
"initial".equals(value) ||
"inherit".equals(value))
return null;
float _current = (current == null ? 1.0f : current / (float) DEFAULT_FONT_SIZE);
// Absolute
switch (value) {
case "xx-small":
@ -1121,16 +1100,16 @@ public class HtmlHelper {
// Relative
switch (value) {
case "smaller":
return FONT_SMALL * _current;
return FONT_SMALL * current;
case "larger":
return FONT_LARGE * _current;
return FONT_LARGE * current;
}
try {
if (value.endsWith("%"))
return Float.parseFloat(value.substring(0, value.length() - 1).trim()) / 100 * _current;
return Float.parseFloat(value.substring(0, value.length() - 1).trim()) / 100 * current;
if (value.endsWith("em"))
return Float.parseFloat(value.substring(0, value.length() - 2).trim()) * _current;
return Float.parseFloat(value.substring(0, value.length() - 2).trim()) * current;
if (value.endsWith("rem"))
return Float.parseFloat(value.substring(0, value.length() - 3).trim());
if (value.endsWith("px") || value.endsWith("pt"))
@ -2046,6 +2025,12 @@ public class HtmlHelper {
}
}
}
String xFontSize = element.attr("x-font-size");
if (!TextUtils.isEmpty(xFontSize)) {
int size = Helper.dp2pixels(context, Math.round(Float.parseFloat(xFontSize) * DEFAULT_FONT_SIZE));
ssb.setSpan(new AbsoluteSizeSpan(size), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
}
}