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

Debug: removed Open Sans

This commit is contained in:
M66B 2022-03-03 20:49:31 +01:00
parent f2f17e0394
commit 508c778fd6
7 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/debug/res/font/opensans.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
<font
app:font="@font/opensans_regular"
app:fontStyle="normal"
app:fontWeight="400" />
<font
app:font="@font/opensans_italic"
app:fontStyle="italic"
app:fontWeight="400" />
<font
app:font="@font/opensans_bold"
app:fontStyle="normal"
app:fontWeight="700" />
<font
app:font="@font/opensans_bold_italic"
app:fontStyle="italic"
app:fontWeight="700" />
</font-family>

BIN
app/src/debug/res/font/opensans_bold.ttf
View File

Binary file not shown.

BIN
app/src/debug/res/font/opensans_bold_italic.ttf
View File

Binary file not shown.

BIN
app/src/debug/res/font/opensans_italic.ttf
View File

Binary file not shown.

BIN
app/src/debug/res/font/opensans_regular.ttf
View File

Binary file not shown.

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

@ -931,8 +931,6 @@ public class StyleHelper {
// https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
// TODO: Microsoft: Georgia (Serif), Tahoma (Sans-serif), Trebuchet MS (Sans-serif)
String faces = family.toLowerCase(Locale.ROOT);
if (faces.contains("open sans"))
return "Open Sans, Arial, Verdana, Helvetica, Helvetica Neue, sans-serif";
if (faces.contains("montserrat"))
return "Montserrat, sans-serif";
if (faces.contains("arimo"))
@ -974,9 +972,6 @@ public class StyleHelper {
return ResourcesCompat.getFont(context, R.font.fantasy);
if (bundled_fonts) {
if (faces.contains("open sans"))
return ResourcesCompat.getFont(context, R.font.opensans);
if (faces.contains("montserrat"))
return ResourcesCompat.getFont(context, R.font.montserrat);
@ -1045,7 +1040,6 @@ public class StyleHelper {
result.add(new FontDescriptor("caladea", "Caladea (Cambria)", true));
if (BuildConfig.DEBUG) {
result.add(new FontDescriptor("open sans", "Open Sans", true));
result.add(new FontDescriptor("montserrat", "Montserrat", true));
}

19
app/src/main/res/font/opensans.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
<font
app:font="@font/arimo_regular"
app:fontStyle="normal"
app:fontWeight="400" />
<font
app:font="@font/arimo_italic"
app:fontStyle="italic"
app:fontWeight="400" />
<font
app:font="@font/arimo_bold"
app:fontStyle="normal"
app:fontWeight="700" />
<font
app:font="@font/arimo_bolditalic"
app:fontStyle="italic"
app:fontWeight="700" />
</font-family>