diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java index 0233b535bf..2a80f0e02e 100644 --- a/app/src/main/java/eu/faircode/email/StyleHelper.java +++ b/app/src/main/java/eu/faircode/email/StyleHelper.java @@ -937,9 +937,9 @@ public class StyleHelper { if (faces.contains("cousine")) return "Cousine, Courier New, monospace"; if (faces.contains("lato")) - return "Lato, Calibri, sans-serif"; - if (faces.contains("cambo")) - return "Cambo, Cambria, serif"; + return "Lato, Carlito, Calibri, sans-serif"; + if (faces.contains("caladea")) + return "Caladea, Cambo, Cambria, serif"; if (faces.contains("comic sans")) return "Comic Sans, Comic Sans MS, sans-serif"; return family; @@ -976,8 +976,8 @@ public class StyleHelper { if (faces.contains("lato") || faces.contains("calibri")) return ResourcesCompat.getFont(context, R.font.lato); - if (faces.contains("cambo") || faces.contains("cambria")) - return ResourcesCompat.getFont(context, R.font.cambo); + if (faces.contains("caladea") || faces.contains("cambria")) + return ResourcesCompat.getFont(context, R.font.caladea); if (faces.contains("comic sans") || faces.contains("comic sans ms")) return ResourcesCompat.getFont(context, R.font.opendyslexic); @@ -1003,7 +1003,7 @@ public class StyleHelper { result.add(new FontDescriptor("tinos", "Tinos (Times New Roman)", true)); result.add(new FontDescriptor("cousine", "Cousine (Courier New)", true)); result.add(new FontDescriptor("lato", "Lato (Calibri)", true)); - result.add(new FontDescriptor("cambo", "Cambo (Cambria)", true)); + result.add(new FontDescriptor("caladea", "Caladea (Cambria)", true)); result.add(new FontDescriptor("comic sans", "OpenDyslexic", true)); diff --git a/app/src/main/res/font/caladea.xml b/app/src/main/res/font/caladea.xml new file mode 100644 index 0000000000..b45226b3ee --- /dev/null +++ b/app/src/main/res/font/caladea.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/src/main/res/font/caladea_bold.ttf b/app/src/main/res/font/caladea_bold.ttf new file mode 100644 index 0000000000..cc2022334a Binary files /dev/null and b/app/src/main/res/font/caladea_bold.ttf differ diff --git a/app/src/main/res/font/caladea_bolditalic.ttf b/app/src/main/res/font/caladea_bolditalic.ttf new file mode 100644 index 0000000000..6d1e8b5c0d Binary files /dev/null and b/app/src/main/res/font/caladea_bolditalic.ttf differ diff --git a/app/src/main/res/font/caladea_italic.ttf b/app/src/main/res/font/caladea_italic.ttf new file mode 100644 index 0000000000..83c526c670 Binary files /dev/null and b/app/src/main/res/font/caladea_italic.ttf differ diff --git a/app/src/main/res/font/caladea_regular.ttf b/app/src/main/res/font/caladea_regular.ttf new file mode 100644 index 0000000000..64d38c6705 Binary files /dev/null and b/app/src/main/res/font/caladea_regular.ttf differ diff --git a/app/src/main/res/font/cambo.xml b/app/src/main/res/font/cambo.xml deleted file mode 100644 index 82cde97f58..0000000000 --- a/app/src/main/res/font/cambo.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/font/cambo_regular.ttf b/app/src/main/res/font/cambo_regular.ttf deleted file mode 100644 index d70a3674c1..0000000000 Binary files a/app/src/main/res/font/cambo_regular.ttf and /dev/null differ