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

Final fantasy

This commit is contained in:
M66B 2020-06-29 09:42:11 +02:00
parent e4457d5b9c
commit 3b7a60fdef
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.ColorUtils;
import androidx.core.util.PatternsCompat;
import androidx.preference.PreferenceManager;
@ -1993,7 +1994,11 @@ public class HtmlHelper {
break;
case "font-family":
String face = value.toLowerCase(Locale.ROOT);
ssb.setSpan(new TypefaceSpan(face), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (BuildConfig.DEBUG && "fantasy".equals(face)) {
Typeface typeface = ResourcesCompat.getFont(context, R.font.fantasy);
ssb.setSpan(new CustomTypefaceSpan(face, typeface), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} else
ssb.setSpan(new TypefaceSpan(face), start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
break;
case "text-decoration":
if ("line-through".equals(value))
@ -2334,4 +2339,34 @@ public class HtmlHelper {
paint.setStrokeWidth(s);
}
}
public static class CustomTypefaceSpan extends TypefaceSpan {
private final Typeface newType;
public CustomTypefaceSpan(String family, Typeface type) {
super(family);
newType = type;
}
@Override
public void updateDrawState(TextPaint ds) {
applyCustomTypeFace(ds, newType);
}
@Override
public void updateMeasureState(TextPaint paint) {
applyCustomTypeFace(paint, newType);
}
private static void applyCustomTypeFace(Paint paint, Typeface tf) {
Typeface old = paint.getTypeface();
int oldStyle = (old == null ? 0 : old.getStyle());
int fake = oldStyle & ~tf.getStyle();
if ((fake & Typeface.BOLD) != 0)
paint.setFakeBoldText(true);
if ((fake & Typeface.ITALIC) != 0)
paint.setTextSkewX(-0.25f);
paint.setTypeface(tf);
}
}
}

BIN
app/src/main/res/font/endor.ttf Normal file
View File

Binary file not shown.

10
app/src/main/res/font/fantasy.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- https://developer.android.com/guide/topics/ui/look-and-feel/fonts-in-xml -->
<font
app:font="@font/endor"
app:fontStyle="normal"
app:fontWeight="400">
<!-- https://www.1001freefonts.com/endor.font -->
</font>
</font-family>