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

Added Liberation Sans Narrow

Browse Source
This commit is contained in:
M66B
2023-10-07 09:50:04 +02:00
parent 777de5b30c
commit 713e695b3f
12 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1806,6 +1806,8 @@ public class StyleHelper {
return "Caladea, Cambo, Cambria, serif";
if (faces.contains("comic sans"))
return "OpenDyslexic, \"Comic Sans\", \"Comic Sans MS\", sans-serif";
if (faces.contains("sans narrow"))
return "\"Liberation Sans Narrow\", \"Arial Narrow\"";
return family;
}
@@ -1820,6 +1822,7 @@ public class StyleHelper {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean bundled_fonts = prefs.getBoolean("bundled_fonts", true);
boolean narrow_fonts = prefs.getBoolean("narrow_fonts", false);
List<String> faces = new ArrayList<>();
for (String face : family.split(","))
@@ -1871,6 +1874,11 @@ public class StyleHelper {
faces.contains("comic sans") ||
faces.contains("comic sans ms"))
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.opendyslexic);
if (narrow_fonts &&
(faces.contains("sans narrow") ||
faces.contains("arial narrow"))) // condensed, compressed
return ResourcesCompat.getFont(context.getApplicationContext(), R.font.liberation_sans_narrow_regular);
}
for (String face : faces) {
@@ -1903,6 +1911,7 @@ public class StyleHelper {
public static List<FontDescriptor> getFonts(Context context, boolean all) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean bundled_fonts = prefs.getBoolean("bundled_fonts", true);
boolean narrow_fonts = prefs.getBoolean("narrow_fonts", false);
List<FontDescriptor> result = new ArrayList<>();
String[] fontNameNames = context.getResources().getStringArray(R.array.fontNameNames);
@@ -1918,6 +1927,9 @@ public class StyleHelper {
result.add(new FontDescriptor("lato", "Lato (Calibri)", true));
result.add(new FontDescriptor("caladea", "Caladea (Cambria)", true));
if (all || narrow_fonts)
result.add(new FontDescriptor("sans narrow", "Liberation Sans Narrow (Arial Narrow)", true));
if (BuildConfig.DEBUG) {
result.add(new FontDescriptor("montserrat", "Montserrat", true));
}