mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-26 17:57:16 +00:00
Code Issues Releases Wiki Activity

Fixed rgb colors

Browse source
This commit is contained in:
M66B 2020-02-08 18:45:28 +01:00
parent 3ce83b313f
commit 5600a73c66
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/HtmlHelper.java
View file

@ -367,7 +367,8 @@ public class HtmlHelper {
case "color":
Integer color = parseColor(value, dark);
if (color != null) {
String c = String.format("#%06x", color);
// fromHtml does not support transparency
String c = String.format("#%08x", color | 0xFF000000);
sb.append("color:").append(c).append(";");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
element.attr("color", c);
@ -691,9 +692,9 @@ public class HtmlHelper {
if (c.length() > 1) {
String code = c.substring(1);
if (x11ColorMap.containsKey(code)) // workaround
color = x11ColorMap.get(code) | 0xFF000000;
color = x11ColorMap.get(code);
else
color = Integer.decode(c) | 0xFF000000;
color = Integer.decode(c);
}
} else if (c.startsWith("rgb") || c.startsWith("hsl")) {
int s = c.indexOf("(");
@ -721,13 +722,13 @@ public class HtmlHelper {
Integer.parseInt(component[2]) / 100f});
}
} else if (x11ColorMap.containsKey(c))
color = x11ColorMap.get(c) | 0xFF000000;
color = x11ColorMap.get(c);
else
try {
color = Color.parseColor(c);
} catch (IllegalArgumentException ex) {
// Workaround
color = Integer.decode("#" + c) | 0xFF000000;
color = Integer.decode("#" + c);
}
if (BuildConfig.DEBUG)