Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 07:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added default font size

Browse Source
This commit is contained in:
M66B
2020-02-20 11:37:40 +01:00
parent dad15fe4f6
commit 08e850ee35
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,7 @@ import static androidx.core.text.HtmlCompat.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE;
public class HtmlHelper {
private static final int PREVIEW_SIZE = 500; // characters
private static final int DEFAULT_FONT_SIZE = 16; // pixels
private static final float MIN_LUMINANCE = 0.5f;
private static final int TAB_SIZE = 2;
private static final int MAX_AUTO_LINK = 250;
@@ -433,7 +434,8 @@ public class HtmlHelper {
if (fsize != null && fsize != 0 &&
((!small && fsize <= 0.8f) || (!big && fsize >= 1.25))) {
Element e = new Element(fsize < 1 ? "small" : "big");
e.attr("x-font-size", Integer.toString(Math.round(16 * fsize)));
int px = Math.round(DEFAULT_FONT_SIZE * fsize);
e.attr("x-font-size", Integer.toString(px));
element.replaceWith(e);
e.appendChild(element);
}
@@ -804,16 +806,16 @@ public class HtmlHelper {
return null;
if (current == null)
current = 16;
current = DEFAULT_FONT_SIZE;
try {
if (value.endsWith("em"))
return Float.parseFloat(value.substring(0, value.length() - 2).trim()) * current / 16f;
return Float.parseFloat(value.substring(0, value.length() - 2).trim()) * current / (float) DEFAULT_FONT_SIZE;
if (value.endsWith("rem"))
return Float.parseFloat(value.substring(0, value.length() - 3).trim());
if (value.endsWith("px"))
return Integer.parseInt(value.substring(0, value.length() - 2).trim()) / 16f;
return Integer.parseInt(value.trim()) / 16f;
return Integer.parseInt(value.substring(0, value.length() - 2).trim()) / (float) DEFAULT_FONT_SIZE;
return Integer.parseInt(value.trim()) / (float) DEFAULT_FONT_SIZE;
} catch (NumberFormatException ignored) {
}