msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Localize font family

Browse Source
pull/183/head
M66B 5 years ago
parent ea4e40c079
commit 723abccf28
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File

39
app/src/main/java/eu/faircode/email/StyleHelper.java
Unescape View File

@ -88,12 +88,11 @@ public class StyleHelper {
popupMenu.getMenu().add(Menu.NONE, R.string.title_style_size_medium, order++, R.string.title_style_size_medium); popupMenu.getMenu().add(Menu.NONE, R.string.title_style_size_medium, order++, R.string.title_style_size_medium);
popupMenu.getMenu().add(Menu.NONE, R.string.title_style_size_large, order++, R.string.title_style_size_large); popupMenu.getMenu().add(Menu.NONE, R.string.title_style_size_large, order++, R.string.title_style_size_large);
if (BuildConfig.DEBUG) { popupMenu.getMenu().add(1, R.string.title_style_font_cursive, order++, R.string.title_style_font_cursive);
popupMenu.getMenu().add(1, 1, order++, "Cursive"); popupMenu.getMenu().add(1, R.string.title_style_font_serif, order++, R.string.title_style_font_serif);
popupMenu.getMenu().add(1, 2, order++, "Serif"); popupMenu.getMenu().add(1, R.string.title_style_font_sans_serif, order++, R.string.title_style_font_sans_serif);
popupMenu.getMenu().add(1, 3, order++, "Sans-serif"); popupMenu.getMenu().add(1, R.string.title_style_font_monospace, order++, R.string.title_style_font_monospace);
popupMenu.getMenu().add(1, 4, order++, "Monospace"); popupMenu.getMenu().add(1, R.string.title_style_font_default, order++, R.string.title_style_font_default);
}
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
@ -103,15 +102,16 @@ public class StyleHelper {
for (RelativeSizeSpan span : spans) for (RelativeSizeSpan span : spans)
t.removeSpan(span); t.removeSpan(span);
float size; Float size;
if (item.getItemId() == R.string.title_style_size_small) if (item.getItemId() == R.string.title_style_size_small)
size = 0.8f; size = 0.8f;
else if (item.getItemId() == R.string.title_style_size_large) else if (item.getItemId() == R.string.title_style_size_large)
size = 1.25f; size = 1.25f;
else else
size = 1.0f; size = null;
t.setSpan(new RelativeSizeSpan(size), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); if (size != null)
t.setSpan(new RelativeSizeSpan(size), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t); etBody.setText(t);
etBody.setSelection(s, e); etBody.setSelection(s, e);
@ -120,7 +120,26 @@ public class StyleHelper {
for (TypefaceSpan span : spans) for (TypefaceSpan span : spans)
t.removeSpan(span); t.removeSpan(span);
t.setSpan(new TypefaceSpan(item.getTitle().toString().toLowerCase()), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); String face;
switch (item.getItemId()) {
case R.string.title_style_font_cursive:
face = "cursive";
break;
case R.string.title_style_font_serif:
face = "serif";
break;
case R.string.title_style_font_sans_serif:
face = "sans-serif";
break;
case R.string.title_style_font_monospace:
face = "monospace";
break;
default:
face = null;
}
if (face != null)
t.setSpan(new TypefaceSpan(face), s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(t); etBody.setText(t);
etBody.setSelection(s, e); etBody.setSelection(s, e);

7
app/src/main/res/values/strings.xml
Unescape View File

@ -870,6 +870,13 @@
<string name="title_style_size_small">Small</string> <string name="title_style_size_small">Small</string>
<string name="title_style_size_medium">Medium</string> <string name="title_style_size_medium">Medium</string>
<string name="title_style_size_large">Large</string> <string name="title_style_size_large">Large</string>
<string name="title_style_font_cursive">Cursive</string>
<string name="title_style_font_serif">Serif</string>
<string name="title_style_font_sans_serif">Sans-serif</string>
<string name="title_style_font_monospace">Monospace</string>
<string name="title_style_font_default">Default</string>
<string name="title_style_color">Color</string> <string name="title_style_color">Color</string>
<string name="title_style_clear">Clear formatting</string> <string name="title_style_clear">Clear formatting</string>
<string name="title_style_link">Insert link</string> <string name="title_style_link">Insert link</string>

Write Preview
Loading…
Cancel
Save