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

Montserrat

This commit is contained in:
M66B 2022-02-24 20:55:07 +01:00
parent 1c1a0d4e2f
commit 611c464b27
7 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/debug/res/font/montserrat.xml Normal file
View File

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

BIN
app/src/debug/res/font/montserrat_bold.ttf Normal file
View File

Binary file not shown.

BIN
app/src/debug/res/font/montserrat_bold_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/debug/res/font/montserrat_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/debug/res/font/montserrat_regular.ttf Normal file
View File

Binary file not shown.

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

@ -933,6 +933,8 @@ public class StyleHelper {
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"))
return "Arimo, Arial, Verdana, Helvetica, Helvetica Neue, sans-serif";
if (faces.contains("tinos"))
@ -975,6 +977,9 @@ public class StyleHelper {
if (faces.contains("open sans"))
return ResourcesCompat.getFont(context, R.font.opensans);
if (faces.contains("montserrat"))
return ResourcesCompat.getFont(context, R.font.montserrat);
if (faces.contains("arimo") ||
faces.contains("arial") ||
faces.contains("verdana") ||
@ -1038,8 +1043,11 @@ public class StyleHelper {
result.add(new FontDescriptor("cousine", "Cousine (Courier New)", true));
result.add(new FontDescriptor("lato", "Lato (Calibri)", true));
result.add(new FontDescriptor("caladea", "Caladea (Cambria)", true));
if (BuildConfig.DEBUG)
if (BuildConfig.DEBUG) {
result.add(new FontDescriptor("open sans", "Open Sans", true));
result.add(new FontDescriptor("montserrat", "Montserrat", true));
}
result.add(new FontDescriptor("comic sans", "OpenDyslexic", true));
}

19
app/src/main/res/font/montserrat.xml Normal file
View File

@ -0,0 +1,19 @@
<?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>