#1340 - remove all references to Whitney font

inaturalist · Apr 19, 2024 · 13eb35f · 13eb35f
1 parent 983a5b3
commit 13eb35f
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 110 deletions.
diff --git a/iNaturalist/src/main/assets/fonts/whitney_light_pro.otf b/iNaturalist/src/main/assets/fonts/whitney_light_pro.otf
diff --git a/iNaturalist/src/main/java/org/inaturalist/android/NewsArticle.java b/iNaturalist/src/main/java/org/inaturalist/android/NewsArticle.java
@@ -106,15 +106,11 @@ protected void onCreate(Bundle savedInstanceState) {
                 "<html>" +
                     "<head>" +
                         "<style type=\"text/css\"> " +
-                        "@font-face { " +
-                            "font-family: Whitney;" +
-                            "src: url(\"file:///android_asset/fonts/whitney_light_pro.otf\")" +
-                        "}" +
                         "body {" +
                                 "line-height: 22pt;" +
                                 "margin: 0;" +
                                 "padding: 0;" +
-                                "font-family: \"HelveticaNeue-UltraLight\", \"Segoe UI\", \"Roboto Light\", sans-serif;" +
+                                "font-family: \"Roboto Light\", \"HelveticaNeue-UltraLight\", \"Segoe UI\", sans-serif;" +
                                 "font-size: medium;" +
                             "} " +
                             "div {max-width: 100%;} " +

diff --git a/iNaturalist/src/main/java/org/inaturalist/android/ObservationListActivity.java b/iNaturalist/src/main/java/org/inaturalist/android/ObservationListActivity.java
@@ -1990,15 +1990,11 @@ private void refreshAnnouncements() {
                 "<html>" +
                 "<head>" +
                 "<style type=\"text/css\"> " +
-                "@font-face { " +
-                "font-family: Whitney;" +
-                "src: url(\"file:///android_asset/fonts/whitney_light_pro.otf\")" +
-                "}" +
                 "body {" +
                 "line-height: 22pt;" +
                 "margin: 0;" +
                 "padding: 0;" +
-                "font-family: \"HelveticaNeue-UltraLight\", \"Segoe UI\", \"Roboto Light\", sans-serif;" +
+                "font-family: \"Roboto Light\", \"HelveticaNeue-UltraLight\", \"Segoe UI\", sans-serif;" +
                 "font-size: medium;" +
                 "} " +
                 "div {max-width: 100%;} " +

diff --git a/iNaturalist/src/main/res/font/whitney.xml b/iNaturalist/src/main/res/font/whitney.xml
diff --git a/iNaturalist/src/main/res/font/whitney_black_pro.otf b/iNaturalist/src/main/res/font/whitney_black_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_blackitalic_pro.otf b/iNaturalist/src/main/res/font/whitney_blackitalic_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_bold_pro.otf b/iNaturalist/src/main/res/font/whitney_bold_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_bolditalic_pro.otf b/iNaturalist/src/main/res/font/whitney_bolditalic_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_book_pro.otf b/iNaturalist/src/main/res/font/whitney_book_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_bookitalic_pro.otf b/iNaturalist/src/main/res/font/whitney_bookitalic_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_light_pro.otf b/iNaturalist/src/main/res/font/whitney_light_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_lightitalic_pro.otf b/iNaturalist/src/main/res/font/whitney_lightitalic_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_medium_pro.otf b/iNaturalist/src/main/res/font/whitney_medium_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_mediumitalic_pro.otf b/iNaturalist/src/main/res/font/whitney_mediumitalic_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_semibold_pro.otf b/iNaturalist/src/main/res/font/whitney_semibold_pro.otf
diff --git a/iNaturalist/src/main/res/font/whitney_semibolditalic_pro.otf b/iNaturalist/src/main/res/font/whitney_semibolditalic_pro.otf