From cae8fc1d32d59ceaa4ae5297fef03edbcf5343dd Mon Sep 17 00:00:00 2001 From: Stephen Niedzielski Date: Sun, 1 Dec 2013 13:03:40 -0700 Subject: [PATCH 1/2] Update Font Awesome to v4.0.3. --- library/res/raw/font_awesome.ttf | Bin 55096 -> 80652 bytes .../iconicdroid/icon/FontAwesomeIcon.java | 335 ++++++++++++------ 2 files changed, 229 insertions(+), 106 deletions(-) diff --git a/library/res/raw/font_awesome.ttf b/library/res/raw/font_awesome.ttf index d46172476a3c7caf4f44946e3c40218559f3edfa..e89738de5eaf8fca33a2f2cdc5cb4929caa62b71 100755 GIT binary patch delta 33284 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 delta 8238 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 diff --git a/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java b/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java index 235d07a..8bc4623 100644 --- a/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java +++ b/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java @@ -18,39 +18,42 @@ import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicTypeface; /** - * A wrapper for Font Awesome icon font (http://fortawesome.github.com/Font-Awesome/). + * A wrapper for Font Awesome icon font + * (http://fortawesome.github.com/Font-Awesome/). This list was generated + * programattically from + * https://raw.github.com/FortAwesome/Font-Awesome/master/src/icons.yml. */ public enum FontAwesomeIcon implements Icon { - + GLASS(0xF000), MUSIC(0xF001), SEARCH(0xF002), - ENVELOPE(0xF003), + ENVELOPE_O(0xF003), HEART(0xF004), STAR(0xF005), - STAR_EMPTY(0xF006), + STAR_O(0xF006), USER(0xF007), FILM(0xF008), TH_LARGE(0xF009), TH(0xF00A), TH_LIST(0xF00B), - OK(0xF00C), - REMOVE(0xF00D), - ZOOM_IN(0xF00E), - ZOOM_OUT(0xF010), - OFF(0xF011), + CHECK(0xF00C), + TIMES(0xF00D), + SEARCH_PLUS(0xF00E), + SEARCH_MINUS(0xF010), + POWER_OFF(0xF011), SIGNAL(0xF012), COG(0xF013), - TRASH(0xF014), + TRASH_O(0xF014), HOME(0xF015), - FILE(0xF016), - TIME(0xF017), + FILE_O(0xF016), + CLOCK_O(0xF017), ROAD(0xF018), - DOWNLOAD_ALT(0xF019), - DOWNLOAD(0xF01A), - UPLOAD(0xF01B), + DOWNLOAD(0xF019), + ARROW_CIRCLE_O_DOWN(0xF01A), + ARROW_CIRCLE_O_UP(0xF01B), INBOX(0xF01C), - PLAY_CIRCLE(0xF01D), + PLAY_CIRCLE_O(0xF01D), REPEAT(0xF01E), REFRESH(0xF021), LIST_ALT(0xF022), @@ -78,18 +81,18 @@ public enum FontAwesomeIcon implements Icon { ALIGN_RIGHT(0xF038), ALIGN_JUSTIFY(0xF039), LIST(0xF03A), - INDENT_LEFT(0xF03B), - INDENT_RIGHT(0xF03C), - FACETIME_VIDEO(0xF03D), - PICTURE(0xF03E), + OUTDENT(0xF03B), + INDENT(0xF03C), + VIDEO_CAMERA(0xF03D), + PICTURE_O(0xF03E), PENCIL(0xF040), MAP_MARKER(0xF041), ADJUST(0xF042), TINT(0xF043), - EDIT(0xF044), - SHARE(0xF045), - CHECK(0xF046), - MOVE(0xF047), + PENCIL_SQUARE_O(0xF044), + SHARE_SQUARE_O(0xF045), + CHECK_SQUARE_O(0xF046), + ARROWS(0xF047), STEP_BACKWARD(0xF048), FAST_BACKWARD(0xF049), BACKWARD(0xF04A), @@ -102,33 +105,33 @@ public enum FontAwesomeIcon implements Icon { EJECT(0xF052), CHEVRON_LEFT(0xF053), CHEVRON_RIGHT(0xF054), - PLUS_SIGN(0xF055), - MINUS_SIGN(0xF056), - REMOVE_SIGN(0xF057), - OK_SIGN(0xF058), - QUESTION_SIGN(0xF059), - INFO_SIGN(0xF05A), - SCREENSHOT(0xF05B), - REMOVE_CIRCLE(0xF05C), - OK_CIRCLE(0xF05D), - BAN_CIRCLE(0xF05E), + PLUS_CIRCLE(0xF055), + MINUS_CIRCLE(0xF056), + TIMES_CIRCLE(0xF057), + CHECK_CIRCLE(0xF058), + QUESTION_CIRCLE(0xF059), + INFO_CIRCLE(0xF05A), + CROSSHAIRS(0xF05B), + TIMES_CIRCLE_O(0xF05C), + CHECK_CIRCLE_O(0xF05D), + BAN(0xF05E), ARROW_LEFT(0xF060), ARROW_RIGHT(0xF061), ARROW_UP(0xF062), ARROW_DOWN(0xF063), - SHARE_ALT(0xF064), - RESIZE_FULL(0xF065), - RESIZE_SMALL(0xF066), + SHARE(0xF064), + EXPAND(0xF065), + COMPRESS(0xF066), PLUS(0xF067), MINUS(0xF068), ASTERISK(0xF069), - EXCLAMATION_SIGN(0xF06A), + EXCLAMATION_CIRCLE(0xF06A), GIFT(0xF06B), LEAF(0xF06C), FIRE(0xF06D), - EYE_OPEN(0xF06E), - EYE_CLOSE(0xF070), - WARNING_SIGN(0xF071), + EYE(0xF06E), + EYE_SLASH(0xF070), + EXCLAMATION_TRIANGLE(0xF071), PLANE(0xF072), CALENDAR(0xF073), RANDOM(0xF074), @@ -138,68 +141,68 @@ public enum FontAwesomeIcon implements Icon { CHEVRON_DOWN(0xF078), RETWEET(0xF079), SHOPPING_CART(0xF07A), - FOLDER_CLOSE(0xF07B), + FOLDER(0xF07B), FOLDER_OPEN(0xF07C), - RESIZE_VERTICAL(0xF07D), - RESIZE_HORIZONTAL(0xF07E), - BAR_CHART(0xF080), - TWITTER_SIGN(0xF081), - FACEBOOK_SIGN(0xF082), + ARROWS_V(0xF07D), + ARROWS_H(0xF07E), + BAR_CHART_O(0xF080), + TWITTER_SQUARE(0xF081), + FACEBOOK_SQUARE(0xF082), CAMERA_RETRO(0xF083), KEY(0xF084), COGS(0xF085), COMMENTS(0xF086), - THUMBS_UP(0xF087), - THUMBS_DOWN(0xF088), + THUMBS_O_UP(0xF087), + THUMBS_O_DOWN(0xF088), STAR_HALF(0xF089), - HEART_EMPTY(0xF08A), - SIGNOUT(0xF08B), - LINKEDIN_SIGN(0xF08C), - PUSHPIN(0xF08D), + HEART_O(0xF08A), + SIGN_OUT(0xF08B), + LINKEDIN_SQUARE(0xF08C), + THUMB_TACK(0xF08D), EXTERNAL_LINK(0xF08E), - SIGNIN(0xF090), + SIGN_IN(0xF090), TROPHY(0xF091), - GITHUB_SIGN(0xF092), - UPLOAD_ALT(0xF093), - LEMON(0xF094), + GITHUB_SQUARE(0xF092), + UPLOAD(0xF093), + LEMON_O(0xF094), PHONE(0xF095), - CHECK_EMPTY(0xF096), - BOOKMARK_EMPTY(0xF097), - PHONE_SIGN(0xF098), + SQUARE_O(0xF096), + BOOKMARK_O(0xF097), + PHONE_SQUARE(0xF098), TWITTER(0xF099), FACEBOOK(0xF09A), GITHUB(0xF09B), UNLOCK(0xF09C), CREDIT_CARD(0xF09D), RSS(0xF09E), - HDD(0xF0A0), + HDD_O(0xF0A0), BULLHORN(0xF0A1), - BELL(0xF0A2), + BELL(0xF0F3), CERTIFICATE(0xF0A3), - HAND_RIGHT(0xF0A4), - HAND_LEFT(0xF0A5), - HAND_UP(0xF0A6), - HAND_DOWN(0xF0A7), - CIRCLE_ARROW_LEFT(0xF0A8), - CIRCLE_ARROW_RIGHT(0xF0A9), - CIRCLE_ARROW_UP(0xF0AA), - CIRCLE_ARROW_DOWN(0xF0AB), + HAND_O_RIGHT(0xF0A4), + HAND_O_LEFT(0xF0A5), + HAND_O_UP(0xF0A6), + HAND_O_DOWN(0xF0A7), + ARROW_CIRCLE_LEFT(0xF0A8), + ARROW_CIRCLE_RIGHT(0xF0A9), + ARROW_CIRCLE_UP(0xF0AA), + ARROW_CIRCLE_DOWN(0xF0AB), GLOBE(0xF0AC), WRENCH(0xF0AD), TASKS(0xF0AE), FILTER(0xF0B0), BRIEFCASE(0xF0B1), - FULLSCREEN(0xF0B2), - GROUP(0xF0C0), + ARROWS_ALT(0xF0B2), + USERS(0xF0C0), LINK(0xF0C1), CLOUD(0xF0C2), - BEAKER(0xF0C3), - CUT(0xF0C4), - COPY(0xF0C5), - PAPER_CLIP(0xF0C6), - SAVE(0xF0C7), - SIGN_BLANK(0xF0C8), - REORDER(0xF0C9), + FLASK(0xF0C3), + SCISSORS(0xF0C4), + FILES_O(0xF0C5), + PAPERCLIP(0xF0C6), + FLOPPY_O(0xF0C7), + SQUARE(0xF0C8), + BARS(0xF0C9), LIST_UL(0xF0CA), LIST_OL(0xF0CB), STRIKETHROUGH(0xF0CC), @@ -208,8 +211,8 @@ public enum FontAwesomeIcon implements Icon { MAGIC(0xF0D0), TRUCK(0xF0D1), PINTEREST(0xF0D2), - PINTEREST_SIGN(0xF0D3), - GOOGLE_PLUS_SIGN(0xF0D4), + PINTEREST_SQUARE(0xF0D3), + GOOGLE_PLUS_SQUARE(0xF0D4), GOOGLE_PLUS(0xF0D5), MONEY(0xF0D6), CARET_DOWN(0xF0D7), @@ -218,42 +221,42 @@ public enum FontAwesomeIcon implements Icon { CARET_RIGHT(0xF0DA), COLUMNS(0xF0DB), SORT(0xF0DC), - SORT_DOWN(0xF0DD), - SORT_UP(0xF0DE), - ENVELOPE_ALT(0xF0E0), + SORT_ASC(0xF0DD), + SORT_DESC(0xF0DE), + ENVELOPE(0xF0E0), LINKEDIN(0xF0E1), UNDO(0xF0E2), - LEGAL(0xF0E3), - DASHBOARD(0xF0E4), - COMMENT_ALT(0xF0E5), - COMMENTS_ALT(0xF0E6), + GAVEL(0xF0E3), + TACHOMETER(0xF0E4), + COMMENT_O(0xF0E5), + COMMENTS_O(0xF0E6), BOLT(0xF0E7), SITEMAP(0xF0E8), UMBRELLA(0xF0E9), - PASTE(0xF0EA), - LIGHTBULB(0xF0EB), + CLIPBOARD(0xF0EA), + LIGHTBULB_O(0xF0EB), EXCHANGE(0xF0EC), CLOUD_DOWNLOAD(0xF0ED), CLOUD_UPLOAD(0xF0EE), USER_MD(0xF0F0), STETHOSCOPE(0xF0F1), SUITCASE(0xF0F2), - BELL_ALT(0xF0F3), + BELL_O(0xF0A2), COFFEE(0xF0F4), - FOOD(0xF0F5), - FILE_ALT(0xF0F6), - BUILDING(0xF0F7), - HOSPITAL(0xF0F8), + CUTLERY(0xF0F5), + FILE_TEXT_O(0xF0F6), + BUILDING_O(0xF0F7), + HOSPITAL_O(0xF0F8), AMBULANCE(0xF0F9), MEDKIT(0xF0FA), FIGHTER_JET(0xF0FB), BEER(0xF0FC), - H_SIGN(0xF0FD), - PLUS_SIGN_ALT(0xF0FE), - DOUBLE_ANGLE_LEFT(0xF100), - DOUBLE_ANGLE_RIGHT(0xF101), - DOUBLE_ANGLE_UP(0xF102), - DOUBLE_ANGLE_DOWN(0xF103), + H_SQUARE(0xF0FD), + PLUS_SQUARE(0xF0FE), + ANGLE_DOUBLE_LEFT(0xF100), + ANGLE_DOUBLE_RIGHT(0xF101), + ANGLE_DOUBLE_UP(0xF102), + ANGLE_DOUBLE_DOWN(0xF103), ANGLE_LEFT(0xF104), ANGLE_RIGHT(0xF105), ANGLE_UP(0xF106), @@ -261,17 +264,137 @@ public enum FontAwesomeIcon implements Icon { DESKTOP(0xF108), LAPTOP(0xF109), TABLET(0xF10A), - MOBILE_PHONE(0xF10B), - CIRCLE_BLANK(0xF10C), + MOBILE(0xF10B), + CIRCLE_O(0xF10C), QUOTE_LEFT(0xF10D), QUOTE_RIGHT(0xF10E), SPINNER(0xF110), CIRCLE(0xF111), REPLY(0xF112), GITHUB_ALT(0xF113), - FOLDER_CLOSE_ALT(0xF114), - FOLDER_OPEN_ALT(0xF115); - + FOLDER_O(0xF114), + FOLDER_OPEN_O(0xF115), + SMILE_O(0xF118), + FROWN_O(0xF119), + MEH_O(0xF11A), + GAMEPAD(0xF11B), + KEYBOARD_O(0xF11C), + FLAG_O(0xF11D), + FLAG_CHECKERED(0xF11E), + TERMINAL(0xF120), + CODE(0xF121), + REPLY_ALL(0xF122), + MAIL_REPLY_ALL(0xF122), + STAR_HALF_O(0xF123), + LOCATION_ARROW(0xF124), + CROP(0xF125), + CODE_FORK(0xF126), + CHAIN_BROKEN(0xF127), + QUESTION(0xF128), + INFO(0xF129), + EXCLAMATION(0xF12A), + SUPERSCRIPT(0xF12B), + SUBSCRIPT(0xF12C), + ERASER(0xF12D), + PUZZLE_PIECE(0xF12E), + MICROPHONE(0xF130), + MICROPHONE_SLASH(0xF131), + SHIELD(0xF132), + CALENDAR_O(0xF133), + FIRE_EXTINGUISHER(0xF134), + ROCKET(0xF135), + MAXCDN(0xF136), + CHEVRON_CIRCLE_LEFT(0xF137), + CHEVRON_CIRCLE_RIGHT(0xF138), + CHEVRON_CIRCLE_UP(0xF139), + CHEVRON_CIRCLE_DOWN(0xF13A), + HTML5(0xF13B), + CSS3(0xF13C), + ANCHOR(0xF13D), + UNLOCK_ALT(0xF13E), + BULLSEYE(0xF140), + ELLIPSIS_H(0xF141), + ELLIPSIS_V(0xF142), + RSS_SQUARE(0xF143), + PLAY_CIRCLE(0xF144), + TICKET(0xF145), + MINUS_SQUARE(0xF146), + MINUS_SQUARE_O(0xF147), + LEVEL_UP(0xF148), + LEVEL_DOWN(0xF149), + CHECK_SQUARE(0xF14A), + PENCIL_SQUARE(0xF14B), + EXTERNAL_LINK_SQUARE(0xF14C), + SHARE_SQUARE(0xF14D), + COMPASS(0xF14E), + CARET_SQUARE_O_DOWN(0xF150), + CARET_SQUARE_O_UP(0xF151), + CARET_SQUARE_O_RIGHT(0xF152), + EUR(0xF153), + GBP(0xF154), + USD(0xF155), + INR(0xF156), + JPY(0xF157), + RUB(0xF158), + KRW(0xF159), + BTC(0xF15A), + FILE(0xF15B), + FILE_TEXT(0xF15C), + SORT_ALPHA_ASC(0xF15D), + SORT_ALPHA_DESC(0xF15E), + SORT_AMOUNT_ASC(0xF160), + SORT_AMOUNT_DESC(0xF161), + SORT_NUMERIC_ASC(0xF162), + SORT_NUMERIC_DESC(0xF163), + THUMBS_UP(0xF164), + THUMBS_DOWN(0xF165), + YOUTUBE_SQUARE(0xF166), + YOUTUBE(0xF167), + XING(0xF168), + XING_SQUARE(0xF169), + YOUTUBE_PLAY(0xF16A), + DROPBOX(0xF16B), + STACK_OVERFLOW(0xF16C), + INSTAGRAM(0xF16D), + FLICKR(0xF16E), + ADN(0xF170), + BITBUCKET(0xF171), + BITBUCKET_SQUARE(0xF172), + TUMBLR(0xF173), + TUMBLR_SQUARE(0xF174), + LONG_ARROW_DOWN(0xF175), + LONG_ARROW_UP(0xF176), + LONG_ARROW_LEFT(0xF177), + LONG_ARROW_RIGHT(0xF178), + APPLE(0xF179), + WINDOWS(0xF17A), + ANDROID(0xF17B), + LINUX(0xF17C), + DRIBBBLE(0xF17D), + SKYPE(0xF17E), + FOURSQUARE(0xF180), + TRELLO(0xF181), + FEMALE(0xF182), + MALE(0xF183), + GITTIP(0xF184), + SUN_O(0xF185), + MOON_O(0xF186), + ARCHIVE(0xF187), + BUG(0xF188), + VK(0xF189), + WEIBO(0xF18A), + RENREN(0xF18B), + PAGELINES(0xF18C), + STACK_EXCHANGE(0xF18D), + ARROW_CIRCLE_O_RIGHT(0xF18E), + ARROW_CIRCLE_O_LEFT(0xF190), + CARET_SQUARE_O_LEFT(0xF191), + DOT_CIRCLE_O(0xF192), + WHEELCHAIR(0xF193), + VIMEO_SQUARE(0xF194), + TRY(0xF195), + PLUS_SQUARE_O(0xF196); + private final int mIconUtfValue; private FontAwesomeIcon(int iconUtfValue) { From fc02c40d80ccf8770a1310718b791fbfbe2fae51 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Tue, 4 Feb 2014 22:07:18 +0800 Subject: [PATCH 2/2] allow user to use their own fonts --- .../android/iconicdroid/icon/EntypoIcon.java | 3 ++- .../iconicdroid/icon/EntypoSocialIcon.java | 3 ++- .../iconicdroid/icon/FontAwesomeIcon.java | 3 ++- .../android/iconicdroid/icon/IconicIcon.java | 3 ++- .../iconicdroid/util/TypefaceManager.java | 25 +++++++++++-------- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/library/src/com/atermenji/android/iconicdroid/icon/EntypoIcon.java b/library/src/com/atermenji/android/iconicdroid/icon/EntypoIcon.java index 3bf52dd..499090b 100644 --- a/library/src/com/atermenji/android/iconicdroid/icon/EntypoIcon.java +++ b/library/src/com/atermenji/android/iconicdroid/icon/EntypoIcon.java @@ -15,6 +15,7 @@ */ package com.atermenji.android.iconicdroid.icon; +import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicDroidTypefaces; import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicTypeface; /** @@ -269,7 +270,7 @@ private EntypoIcon(int iconUtfValue) { @Override public IconicTypeface getIconicTypeface() { - return IconicTypeface.ENTYPO; + return IconicDroidTypefaces.ENTYPO; } @Override diff --git a/library/src/com/atermenji/android/iconicdroid/icon/EntypoSocialIcon.java b/library/src/com/atermenji/android/iconicdroid/icon/EntypoSocialIcon.java index bf63e9a..e415d85 100644 --- a/library/src/com/atermenji/android/iconicdroid/icon/EntypoSocialIcon.java +++ b/library/src/com/atermenji/android/iconicdroid/icon/EntypoSocialIcon.java @@ -15,6 +15,7 @@ */ package com.atermenji.android.iconicdroid.icon; +import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicDroidTypefaces; import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicTypeface; /** @@ -77,7 +78,7 @@ private EntypoSocialIcon(int iconUtfValue) { @Override public IconicTypeface getIconicTypeface() { - return IconicTypeface.ENTYPO_SOCIAL; + return IconicDroidTypefaces.ENTYPO_SOCIAL; } @Override diff --git a/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java b/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java index 235d07a..b20d6d3 100644 --- a/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java +++ b/library/src/com/atermenji/android/iconicdroid/icon/FontAwesomeIcon.java @@ -15,6 +15,7 @@ */ package com.atermenji.android.iconicdroid.icon; +import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicDroidTypefaces; import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicTypeface; /** @@ -280,7 +281,7 @@ private FontAwesomeIcon(int iconUtfValue) { @Override public IconicTypeface getIconicTypeface() { - return IconicTypeface.FONT_AWESOME; + return IconicDroidTypefaces.FONT_AWESOME; } @Override diff --git a/library/src/com/atermenji/android/iconicdroid/icon/IconicIcon.java b/library/src/com/atermenji/android/iconicdroid/icon/IconicIcon.java index d337410..04051b6 100644 --- a/library/src/com/atermenji/android/iconicdroid/icon/IconicIcon.java +++ b/library/src/com/atermenji/android/iconicdroid/icon/IconicIcon.java @@ -15,6 +15,7 @@ */ package com.atermenji.android.iconicdroid.icon; +import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicDroidTypefaces; import com.atermenji.android.iconicdroid.util.TypefaceManager.IconicTypeface; /** @@ -182,7 +183,7 @@ private IconicIcon(int iconUtfValue) { @Override public IconicTypeface getIconicTypeface() { - return IconicTypeface.ICONIC; + return IconicDroidTypefaces.ICONIC; } @Override diff --git a/library/src/com/atermenji/android/iconicdroid/util/TypefaceManager.java b/library/src/com/atermenji/android/iconicdroid/util/TypefaceManager.java index c1a756c..6f32a40 100644 --- a/library/src/com/atermenji/android/iconicdroid/util/TypefaceManager.java +++ b/library/src/com/atermenji/android/iconicdroid/util/TypefaceManager.java @@ -38,8 +38,20 @@ public class TypefaceManager { private TypefaceManager() { } + + public static interface IconicTypeface { - public enum IconicTypeface { + /** + * Loads a {@link Typeface} for the given icon font. + * {@link Typeface} is loaded only once to avoid memory consumption. + * + * @param context + * @return {@link Typeface} + */ + public Typeface getTypeface(final Context context); + } + + public static enum IconicDroidTypefaces implements IconicTypeface { ENTYPO(R.raw.entypo), ENTYPO_SOCIAL(R.raw.entypo_social), @@ -49,17 +61,10 @@ public enum IconicTypeface { private final int mTypefaceResourceId; private Typeface mTypeface; - private IconicTypeface(int typefaceResourceId) { + private IconicDroidTypefaces(int typefaceResourceId) { mTypefaceResourceId = typefaceResourceId; } - /** - * Loads a {@link Typeface} for the given icon font. - * {@link Typeface} is loaded only once to avoid memory consumption. - * - * @param context - * @return {@link Typeface} - */ public Typeface getTypeface(final Context context) { if (mTypeface == null) { mTypeface = createTypefaceFromResource(context, mTypefaceResourceId); @@ -69,7 +74,7 @@ public Typeface getTypeface(final Context context) { } } - private static Typeface createTypefaceFromResource(final Context context, final int resource) { + public static Typeface createTypefaceFromResource(final Context context, final int resource) { Typeface typeface = null; InputStream inputStream = null; OutputStream outputStream = null;