From ede25a99381403281283744dbe423d23e6a08e02 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 13 Oct 2023 20:00:33 +0200 Subject: [PATCH] Revert "Enabled Montserrat font" This reverts commit ad8be07e3a061cea26149b0ed44ae61a88d83d4a. --- ATTRIBUTION.md | 1 - app/src/main/assets/ATTRIBUTION.md | 1 - app/src/main/java/eu/faircode/email/StyleHelper.java | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index b012c00f8e..f334ad3cc7 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -48,4 +48,3 @@ FairEmail uses: * [Send](https://github.com/timvisee/send). [Mozilla Public License 2.0](https://github.com/timvisee/send/blob/master/LICENSE). * [DetectHtml](https://github.com/dbennett455/DetectHtml). [The MIT License](https://github.com/dbennett455/DetectHtml/blob/master/LICENSE). * [Liberation Sans Narrow font](https://github.com/liberationfonts/liberation-sans-narrow). Copyright (C) 1989, 1991 Free Software Foundation, Inc. [GNU General Public License version 2 with exceptions](https://fedoraproject.org/wiki/Licensing/LiberationFontLicense). -* [Montserrat font](https://fonts.google.com/specimen/Montserrat). By Julieta Ulanovsky, Sol Matas, Juan Pablo del Peral, Jacques Le Bailly. [Open Font License](https://fonts.google.com/specimen/Montserrat/about). diff --git a/app/src/main/assets/ATTRIBUTION.md b/app/src/main/assets/ATTRIBUTION.md index b012c00f8e..f334ad3cc7 100644 --- a/app/src/main/assets/ATTRIBUTION.md +++ b/app/src/main/assets/ATTRIBUTION.md @@ -48,4 +48,3 @@ FairEmail uses: * [Send](https://github.com/timvisee/send). [Mozilla Public License 2.0](https://github.com/timvisee/send/blob/master/LICENSE). * [DetectHtml](https://github.com/dbennett455/DetectHtml). [The MIT License](https://github.com/dbennett455/DetectHtml/blob/master/LICENSE). * [Liberation Sans Narrow font](https://github.com/liberationfonts/liberation-sans-narrow). Copyright (C) 1989, 1991 Free Software Foundation, Inc. [GNU General Public License version 2 with exceptions](https://fedoraproject.org/wiki/Licensing/LiberationFontLicense). -* [Montserrat font](https://fonts.google.com/specimen/Montserrat). By Julieta Ulanovsky, Sol Matas, Juan Pablo del Peral, Jacques Le Bailly. [Open Font License](https://fonts.google.com/specimen/Montserrat/about). diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java index 8e7685eb32..ee8a52b999 100644 --- a/app/src/main/java/eu/faircode/email/StyleHelper.java +++ b/app/src/main/java/eu/faircode/email/StyleHelper.java @@ -1930,7 +1930,9 @@ public class StyleHelper { if (all || narrow_fonts) result.add(new FontDescriptor("sans narrow", "Liberation Sans Narrow (Arial Narrow)", true)); - result.add(new FontDescriptor("montserrat", "Montserrat (Gotham, Proxima Nova)", true)); + if (BuildConfig.DEBUG) { + result.add(new FontDescriptor("montserrat", "Montserrat", true)); + } result.add(new FontDescriptor("comic sans", "OpenDyslexic", true)); }