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

Allow selecting no send font

Browse Source
This commit is contained in:
M66B
2021-10-06 07:48:03 +02:00
parent 5364c539eb
commit 02d0e1b28c
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View File

@@ -158,6 +158,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
String[] fontNameValues = getResources().getStringArray(R.array.fontNameValues);
List<CharSequence> fn = new ArrayList<>();
fn.add("-");
for (int i = 0; i < fontNameNames.length; i++) {
SpannableStringBuilder ssb = new SpannableStringBuilderEx(fontNameNames[i]);
ssb.setSpan(new TypefaceSpan(fontNameValues[i]), 0, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -291,7 +292,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
spComposeFont.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
String value = fontNameValues[position];
String value = (position == 0 ? "" : fontNameValues[position - 1]);
boolean monospaced = prefs.getBoolean("monospaced", false);
if (value.equals(monospaced ? "monospace" : "sans-serif"))
prefs.edit().remove("compose_font").apply();
@@ -555,7 +556,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
String[] fontNameValues = getResources().getStringArray(R.array.fontNameValues);
for (int pos = 0; pos < fontNameValues.length; pos++)
if (fontNameValues[pos].equals(compose_font)) {
spComposeFont.setSelection(pos);
spComposeFont.setSelection(pos + 1);
break;
}

19
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -704,15 +704,16 @@ public class MessageHelper {
if (auto_link)
HtmlHelper.autoLink(document);
for (Element child : document.body().children())
if (!TextUtils.isEmpty(child.text()) &&
TextUtils.isEmpty(child.attr("fairemail"))) {
String old = child.attr("style");
String style = HtmlHelper.mergeStyles(
"font-family:" + compose_font, old);
if (!old.equals(style))
child.attr("style", style);
}
if (!TextUtils.isEmpty(compose_font))
for (Element child : document.body().children())
if (!TextUtils.isEmpty(child.text()) &&
TextUtils.isEmpty(child.attr("fairemail"))) {
String old = child.attr("style");
String style = HtmlHelper.mergeStyles(
"font-family:" + compose_font, old);
if (!old.equals(style))
child.attr("style", style);
}
document.select("div[fairemail=signature]").removeAttr("fairemail");
document.select("div[fairemail=reference]").removeAttr("fairemail");