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

Merge styles for elements only

This commit is contained in:
M66B 2023-08-26 17:43:25 +02:00
parent 61a5db408d
commit 389fa78fa9
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1795,7 +1795,7 @@ public class HtmlHelper {
if (tag == null
? eselector.getLocalName() == null
: tag.equalsIgnoreCase(eselector.getLocalName()))
style = mergeStyles(style, srule.getStyle().getCssText(), false);
style = mergeStyles(style, srule.getStyle().getCssText());
break;
case Selector.SAC_CONDITIONAL_SELECTOR:
if (!TextUtils.isEmpty(clazz)) {
@ -1805,7 +1805,7 @@ public class HtmlHelper {
String value = ccondition.getValue();
for (String cls : clazz.split("\\s+"))
if (cls.equalsIgnoreCase(value)) {
style = mergeStyles(style, srule.getStyle().getCssText(), false);
style = mergeStyles(style, srule.getStyle().getCssText());
break;
}
@ -1842,10 +1842,6 @@ public class HtmlHelper {
}
static String mergeStyles(String base, String style) {
return mergeStyles(base, style, true);
}
private static String mergeStyles(String base, String style, boolean element) {
Map<String, String> result = new HashMap<>();
// Base style
@ -1877,19 +1873,18 @@ public class HtmlHelper {
//https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Cascade_and_inheritance#controlling_inheritance
boolean initial = false; // no value
boolean inherit = false; // parent value
if (element)
switch (value) {
case "inherit":
inherit = true;
break;
case "initial":
initial = true;
break;
case "unset":
case "revert":
inherit = !STYLE_NO_INHERIT.contains(key);
break;
}
switch (value) {
case "inherit":
inherit = true;
break;
case "initial":
initial = true;
break;
case "unset":
case "revert":
inherit = !STYLE_NO_INHERIT.contains(key);
break;
}
if (initial || inherit)
Log.i("CSS " + value + "=" + key);
@ -1905,8 +1900,7 @@ public class HtmlHelper {
}
for (String key : baseParams.keySet())
if (!STYLE_NO_INHERIT.contains(key) || element)
result.put(key, baseParams.get(key));
result.put(key, baseParams.get(key));
return TextUtils.join(";", result.values());
}