From d87110eaf22d14144885c7df16a36c45053251fa Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Tue, 3 Mar 2015 13:39:07 -0500 Subject: Added support for Open Sans light bold & light bold italic. --- .../src/main/assets/fonts/OpenSans-LightBold.ttf | Bin 0 -> 221328 bytes .../main/assets/fonts/OpenSans-LightBoldItalic.ttf | Bin 0 -> 212820 bytes .../wordpress/android/widgets/TypefaceCache.java | 55 ++++++++++++++------- 3 files changed, 36 insertions(+), 19 deletions(-) create mode 100755 WordPress/src/main/assets/fonts/OpenSans-LightBold.ttf create mode 100755 WordPress/src/main/assets/fonts/OpenSans-LightBoldItalic.ttf diff --git a/WordPress/src/main/assets/fonts/OpenSans-LightBold.ttf b/WordPress/src/main/assets/fonts/OpenSans-LightBold.ttf new file mode 100755 index 000000000..1a7679e39 Binary files /dev/null and b/WordPress/src/main/assets/fonts/OpenSans-LightBold.ttf differ diff --git a/WordPress/src/main/assets/fonts/OpenSans-LightBoldItalic.ttf b/WordPress/src/main/assets/fonts/OpenSans-LightBoldItalic.ttf new file mode 100755 index 000000000..59b6d16b0 Binary files /dev/null and b/WordPress/src/main/assets/fonts/OpenSans-LightBoldItalic.ttf differ diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/TypefaceCache.java b/WordPress/src/main/java/org/wordpress/android/widgets/TypefaceCache.java index 6db0fe359..98c32c23d 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/TypefaceCache.java +++ b/WordPress/src/main/java/org/wordpress/android/widgets/TypefaceCache.java @@ -11,33 +11,50 @@ import org.wordpress.android.R; import java.util.Hashtable; public class TypefaceCache { - protected static final int VARIATION_NORMAL = 0; - protected static final int VARIATION_LIGHT = 1; + private static final int VARIATION_NORMAL = 0; + private static final int VARIATION_LIGHT = 1; - private static final Hashtable mTypefaceCache = new Hashtable(); + private static final Hashtable mTypefaceCache = new Hashtable<>(); public static Typeface getTypeface(Context context) { return getTypeface(context, Typeface.NORMAL, VARIATION_NORMAL); } - public static Typeface getTypeface(Context context, int fontStyle, int variation) { - if (context == null) + private static Typeface getTypeface(Context context, int fontStyle, int variation) { + if (context == null) { return null; + } - // note that the "light" variation doesn't support bold or bold-italic final String typefaceName; - switch (fontStyle) { - case Typeface.BOLD: - typefaceName = "OpenSans-Bold.ttf"; - break; - case Typeface.ITALIC: - typefaceName = (variation == VARIATION_LIGHT ? "OpenSans-LightItalic.ttf" : "OpenSans-Italic.ttf"); - break; - case Typeface.BOLD_ITALIC: - typefaceName = "OpenSans-BoldItalic.ttf"; - break; - default: - typefaceName = (variation == VARIATION_LIGHT ? "OpenSans-Light.ttf" : "OpenSans-Regular.ttf"); - break; + if (variation == VARIATION_LIGHT) { + switch (fontStyle) { + case Typeface.BOLD: + typefaceName = "OpenSans-LightBold.ttf"; + break; + case Typeface.ITALIC: + typefaceName = "OpenSans-LightItalic.ttf"; + break; + case Typeface.BOLD_ITALIC: + typefaceName = "OpenSans-LightBoldItalic.ttf"; + break; + default: + typefaceName = "OpenSans-Light.ttf"; + break; + } + } else { + switch (fontStyle) { + case Typeface.BOLD: + typefaceName = "OpenSans-Bold.ttf"; + break; + case Typeface.ITALIC: + typefaceName = "OpenSans-Italic.ttf"; + break; + case Typeface.BOLD_ITALIC: + typefaceName = "OpenSans-BoldItalic.ttf"; + break; + default: + typefaceName = "OpenSans-Regular.ttf"; + break; + } } return getTypefaceForTypefaceName(context, typefaceName); -- cgit v1.2.3