From 1ca3b3b06af373c398154772019faf822a1009d4 Mon Sep 17 00:00:00 2001 From: Santiago Castro Date: Mon, 17 Apr 2017 03:39:27 -0300 Subject: [PATCH 1/9] Fix broken Markdown headings --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fc2aa18..9e2e7d0 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ The javadoc for the project is hosted on [Github](http://bearded-hen.github.io/A Examples ============ -###BootstrapButton +### BootstrapButton A button that supports Glyph icons, and is themeable using Bootstrap Brands. ```xml -###AwesomeTextView +### AwesomeTextView A text widget that displays Glyph icons, and is themeable using Bootstrap Brands. ```xml -###BootstrapEditText +### BootstrapEditText Allows editing of text in a widget themed using BootstrapBrand. ```xml -###BootstrapThumbnail +### BootstrapThumbnail Displays images in a rectangular View, themed with BootstrapBrand. ```xml Date: Tue, 4 Jul 2017 18:36:37 +0530 Subject: [PATCH 2/9] Update FontAwesome to 4.7.0 --- ...-v450.ttf => fontawesome-webfont-v470.ttf} | Bin 142072 -> 165548 bytes 1 file changed, 0 insertions(+), 0 deletions(-) rename AndroidBootstrap/src/main/assets/{fontawesome-webfont-v450.ttf => fontawesome-webfont-v470.ttf} (68%) diff --git a/AndroidBootstrap/src/main/assets/fontawesome-webfont-v450.ttf b/AndroidBootstrap/src/main/assets/fontawesome-webfont-v470.ttf similarity index 68% rename from AndroidBootstrap/src/main/assets/fontawesome-webfont-v450.ttf rename to AndroidBootstrap/src/main/assets/fontawesome-webfont-v470.ttf index 26dea7951a73079223b50653c455c5adf46a4648..35acda2fa1196aad98c2adf4378a7611dd713aa3 100644 GIT binary patch delta 30646 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 F{t4uIb!h+q delta 7574 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 b=>>xXvun#12DZ<~3snq)iK91=53m0PtWqDQ From f4122c7b5c721592e1acbc5c55ad7c4c82e3759c Mon Sep 17 00:00:00 2001 From: knightkill Date: Tue, 4 Jul 2017 18:38:15 +0530 Subject: [PATCH 3/9] Update FontAwesome to 4.7.0 --- .../androidbootstrap/font/FontAwesome.java | 371 +++++++++++++++++- 1 file changed, 368 insertions(+), 3 deletions(-) diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/font/FontAwesome.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/font/FontAwesome.java index 939fa2e..9a3110e 100644 --- a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/font/FontAwesome.java +++ b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/font/FontAwesome.java @@ -16,7 +16,7 @@ */ public class FontAwesome implements IconSet { - public static final String FONT_PATH = "fontawesome-webfont-v450.ttf"; + public static final String FONT_PATH = "fontawesome-webfont-v470.ttf"; @Override public CharSequence unicodeForKey(@Icon CharSequence key) { return ICON_MAP.get(key); @@ -729,7 +729,98 @@ public class FontAwesome implements IconSet { FA_YEN, FA_YOUTUBE, FA_YOUTUBE_PLAY, - FA_YOUTUBE_SQUARE + FA_YOUTUBE_SQUARE, + //4.6 + FA_AMERICAN_SIGN_LANGUAGE_INTERPRETING, + FA_ASL_INTERPRETING, + FA_ASSISTIVE_LISTENING_SYSTEMS, + FA_AUDIO_DESCRIPTION, + FA_BLIND, + FA_BRAILLE, + FA_DEAF, + FA_DEAFNESS, + FA_ENVIRA, + FA_FA, + FA_FIRST_ORDER, + FA_FONT_AWESOME, + FA_GITLAB, + FA_GLIDE, + FA_GLIDE_G, + FA_GOOGLE_PLUS_CIRCLE, + FA_GOOGLE_PLUS_OFFICIAL, + FA_HARD_OF_HEARING, + FA_LOW_VISION, + FA_QUESTION_CIRCLE_O, + FA_SIGN_LANGUAGE, + FA_SIGNING, + FA_SNAPCHAT, + FA_SNAPCHAT_GHOST, + FA_SNAPCHAT_SQUARE, + FA_THEMEISLE, + FA_UNIVERSAL_ACCESS, + FA_VIADEO, + FA_VIADEO_SQUARE, + FA_VOLUME_CONTROL_PHONE, + FA_WHEELCHAIR_ALT, + FA_WPBEGINNER, + FA_WPFORMS, + FA_YOAST, + //4.7 + FA_ADDRESS_BOOK, + FA_ADDRESS_BOOK_O, + FA_ADDRESS_CARD, + FA_ADDRESS_CARD_O, + FA_BANDCAMP, + FA_BATH, + FA_BATHTUB, + FA_DRIVERS_LICENSE, + FA_DRIVERS_LICENSE_O, + FA_EERCAST, + FA_ENVELOPE_OPEN, + FA_ENVELOPE_OPEN_O, + FA_ETSY, + FA_FREE_CODE_CAMP, + FA_GRAV, + FA_HANDSHAKE_O, + FA_ID_BADGE, + FA_ID_CARD, + FA_ID_CARD_O, + FA_IMDB, + FA_LINODE, + FA_MEETUP, + FA_MICROCHIP, + FA_PODCAST, + FA_QUORA, + FA_RAVELRY, + FA_S15, + FA_SHOWER, + FA_SNOWFLAKE_O, + FA_SUPERPOWERS, + FA_TELEGRAM, + FA_THERMOMETER, + FA_THERMOMETER_0, + FA_THERMOMETER_1, + FA_THERMOMETER_2, + FA_THERMOMETER_3, + FA_THERMOMETER_4, + FA_THERMOMETER_EMPTY, + FA_THERMOMETER_FULL, + FA_THERMOMETER_HALF, + FA_THERMOMETER_QUARTER, + FA_THERMOMETER_THREE_QUARTERS, + FA_TIMES_RECTANGLE, + FA_TIMES_RECTANGLE_O, + FA_USER_CIRCLE, + FA_USER_CIRCLE_O, + FA_USER_O, + FA_VCARD, + FA_VCARD_O, + FA_WINDOW_CLOSE, + FA_WINDOW_CLOSE_O, + FA_WINDOW_MAXIMIZE, + FA_WINDOW_MINIMIZE, + FA_WINDOW_RESTORE, + FA_WPEXPLORER }) public @interface Icon { } @@ -1426,6 +1517,97 @@ public class FontAwesome implements IconSet { public static final String FA_YOUTUBE = "fa_youtube"; public static final String FA_YOUTUBE_PLAY = "fa_youtube_play"; public static final String FA_YOUTUBE_SQUARE = "fa_youtube_square"; + //4.6 + public static final String FA_AMERICAN_SIGN_LANGUAGE_INTERPRETING = "fa_american_sign_language_interpreting"; + public static final String FA_ASL_INTERPRETING = "fa_asl_interpreting"; + public static final String FA_ASSISTIVE_LISTENING_SYSTEMS = "fa_assistive_listening_systems"; + public static final String FA_AUDIO_DESCRIPTION = "fa_audio_description"; + public static final String FA_BLIND = "fa_blind"; + public static final String FA_BRAILLE = "fa_braille"; + public static final String FA_DEAF = "fa_deaf"; + public static final String FA_DEAFNESS = "fa_deafness"; + public static final String FA_ENVIRA = "fa_envira"; + public static final String FA_FA = "fa_fa"; + public static final String FA_FIRST_ORDER = "fa_first_order"; + public static final String FA_FONT_AWESOME = "fa_font_awesome"; + public static final String FA_GITLAB = "fa_gitlab"; + public static final String FA_GLIDE = "fa_glide"; + public static final String FA_GLIDE_G = "fa_glide_g"; + public static final String FA_GOOGLE_PLUS_CIRCLE = "fa_google_plus_circle"; + public static final String FA_GOOGLE_PLUS_OFFICIAL = "fa_google_plus_official"; + public static final String FA_HARD_OF_HEARING = "fa_hard_of_hearing"; + public static final String FA_LOW_VISION = "fa_low_vision"; + public static final String FA_QUESTION_CIRCLE_O = "fa_question_circle_o"; + public static final String FA_SIGN_LANGUAGE = "fa_sign_language"; + public static final String FA_SIGNING = "fa_signing"; + public static final String FA_SNAPCHAT = "fa_snapchat"; + public static final String FA_SNAPCHAT_GHOST = "fa_snapchat_ghost"; + public static final String FA_SNAPCHAT_SQUARE = "fa_snapchat_square"; + public static final String FA_THEMEISLE = "fa_themeisle"; + public static final String FA_UNIVERSAL_ACCESS = "fa_universal_access"; + public static final String FA_VIADEO = "fa_viadeo"; + public static final String FA_VIADEO_SQUARE = "fa_viadeo_square"; + public static final String FA_VOLUME_CONTROL_PHONE = "fa_volume_control_phone"; + public static final String FA_WHEELCHAIR_ALT = "fa_wheelchair_alt"; + public static final String FA_WPBEGINNER = "fa_wpbeginner"; + public static final String FA_WPFORMS = "fa_wpforms"; + public static final String FA_YOAST = "fa_yoast"; + //4.7 + public static final String FA_ADDRESS_BOOK = "fa_address_book"; + public static final String FA_ADDRESS_BOOK_O = "fa_address_book_o"; + public static final String FA_ADDRESS_CARD = "fa_address_card"; + public static final String FA_ADDRESS_CARD_O = "fa_address_card_o"; + public static final String FA_BANDCAMP = "fa_bandcamp"; + public static final String FA_BATH = "fa_bath"; + public static final String FA_BATHTUB = "fa_bathtub"; + public static final String FA_DRIVERS_LICENSE = "fa_drivers_license"; + public static final String FA_DRIVERS_LICENSE_O = "fa_drivers_license_o"; + public static final String FA_EERCAST = "fa_eercast"; + public static final String FA_ENVELOPE_OPEN = "fa_envelope_open"; + public static final String FA_ENVELOPE_OPEN_O = "fa_envelope_open_o"; + public static final String FA_ETSY = "fa_etsy"; + public static final String FA_FREE_CODE_CAMP = "fa_free_code_camp"; + public static final String FA_GRAV = "fa_grav"; + public static final String FA_HANDSHAKE_O = "fa_handshake_o"; + public static final String FA_ID_BADGE = "fa_id_badge"; + public static final String FA_ID_CARD = "fa_id_card"; + public static final String FA_ID_CARD_O = "fa_id_card_o"; + public static final String FA_IMDB = "fa_imdb"; + public static final String FA_LINODE = "fa_linode"; + public static final String FA_MEETUP = "fa_meetup"; + public static final String FA_MICROCHIP = "fa_microchip"; + public static final String FA_PODCAST = "fa_podcast"; + public static final String FA_QUORA = "fa_quora"; + public static final String FA_RAVELRY = "fa_ravelry"; + public static final String FA_S15 = "fa_s15"; + public static final String FA_SHOWER = "fa_shower"; + public static final String FA_SNOWFLAKE_O = "fa_snowflake_o"; + public static final String FA_SUPERPOWERS = "fa_superpowers"; + public static final String FA_TELEGRAM = "fa_telegram"; + public static final String FA_THERMOMETER = "fa_thermometer"; + public static final String FA_THERMOMETER_0 = "fa_thermometer_0"; + public static final String FA_THERMOMETER_1 = "fa_thermometer_1"; + public static final String FA_THERMOMETER_2 = "fa_thermometer_2"; + public static final String FA_THERMOMETER_3 = "fa_thermometer_3"; + public static final String FA_THERMOMETER_4 = "fa_thermometer_4"; + public static final String FA_THERMOMETER_EMPTY = "fa_thermometer_empty"; + public static final String FA_THERMOMETER_FULL = "fa_thermometer_full"; + public static final String FA_THERMOMETER_HALF = "fa_thermometer_half"; + public static final String FA_THERMOMETER_QUARTER = "fa_thermometer_quarter"; + public static final String FA_THERMOMETER_THREE_QUARTERS = "fa_thermometer_three_quarters"; + public static final String FA_TIMES_RECTANGLE = "fa_times_rectangle"; + public static final String FA_TIMES_RECTANGLE_O = "fa_times_rectangle_o"; + public static final String FA_USER_CIRCLE = "fa_user_circle"; + public static final String FA_USER_CIRCLE_O = "fa_user_circle_o"; + public static final String FA_USER_O = "fa_user_o"; + public static final String FA_VCARD = "fa_vcard"; + public static final String FA_VCARD_O = "fa_vcard_o"; + public static final String FA_WINDOW_CLOSE = "fa_window_close"; + public static final String FA_WINDOW_CLOSE_O = "fa_window_close_o"; + public static final String FA_WINDOW_MAXIMIZE = "fa_window_maximize"; + public static final String FA_WINDOW_MINIMIZE = "fa_window_minimize"; + public static final String FA_WINDOW_RESTORE = "fa_window_restore"; + public static final String FA_WPEXPLORER = "fa_wpexplorer"; static { ICON_MAP.put(FA_ADJUST, "\uf042"); @@ -1884,7 +2066,7 @@ public class FontAwesome implements IconSet { ICON_MAP.put(FA_PHOTO, "\uf03e"); ICON_MAP.put(FA_PICTURE_O, "\uf03e"); ICON_MAP.put(FA_PIE_CHART, "\uf200"); - ICON_MAP.put(FA_PIED_PIPER, "\uf1a7"); + ICON_MAP.put(FA_PIED_PIPER, "\uf2ae"); ICON_MAP.put(FA_PIED_PIPER_ALT, "\uf1a8"); ICON_MAP.put(FA_PINTEREST, "\uf0d2"); ICON_MAP.put(FA_PINTEREST_P, "\uf231"); @@ -2121,6 +2303,97 @@ public class FontAwesome implements IconSet { ICON_MAP.put(FA_YOUTUBE, "\uf167"); ICON_MAP.put(FA_YOUTUBE_PLAY, "\uf16a"); ICON_MAP.put(FA_YOUTUBE_SQUARE, "\uf166"); + //4.6 + ICON_MAP.put(FA_AMERICAN_SIGN_LANGUAGE_INTERPRETING, "\uf2a3"); + ICON_MAP.put(FA_ASL_INTERPRETING, "\uf2a3"); + ICON_MAP.put(FA_ASSISTIVE_LISTENING_SYSTEMS, "\uf2a2"); + ICON_MAP.put(FA_AUDIO_DESCRIPTION, "\uf29e"); + ICON_MAP.put(FA_BLIND, "\uf29d"); + ICON_MAP.put(FA_BRAILLE, "\uf2a1"); + ICON_MAP.put(FA_DEAF, "\uf2a4"); + ICON_MAP.put(FA_DEAFNESS, "\uf2a4"); + ICON_MAP.put(FA_ENVIRA, "\uf299"); + ICON_MAP.put(FA_FA, "\uf2b4"); + ICON_MAP.put(FA_FIRST_ORDER, "\uf2b0"); + ICON_MAP.put(FA_FONT_AWESOME, "\uf2b4"); + ICON_MAP.put(FA_GITLAB, "\uf296"); + ICON_MAP.put(FA_GLIDE, "\uf2a5"); + ICON_MAP.put(FA_GLIDE_G, "\uf2a6"); + ICON_MAP.put(FA_GOOGLE_PLUS_CIRCLE, "\uf2b3"); + ICON_MAP.put(FA_GOOGLE_PLUS_OFFICIAL, "\uf2b3"); + ICON_MAP.put(FA_HARD_OF_HEARING, "\uf2a4"); + ICON_MAP.put(FA_LOW_VISION, "\uf2a8"); + ICON_MAP.put(FA_QUESTION_CIRCLE_O, "\uf29c"); + ICON_MAP.put(FA_SIGN_LANGUAGE, "\uf2a7"); + ICON_MAP.put(FA_SIGNING, "\uf2a7"); + ICON_MAP.put(FA_SNAPCHAT, "\uf2ab"); + ICON_MAP.put(FA_SNAPCHAT_GHOST, "\uf2ac"); + ICON_MAP.put(FA_SNAPCHAT_SQUARE, "\uf2ad"); + ICON_MAP.put(FA_THEMEISLE, "\uf2b2"); + ICON_MAP.put(FA_UNIVERSAL_ACCESS, "\uf29a"); + ICON_MAP.put(FA_VIADEO, "\uf2a9"); + ICON_MAP.put(FA_VIADEO_SQUARE, "\uf2aa"); + ICON_MAP.put(FA_VOLUME_CONTROL_PHONE, "\uf2a0"); + ICON_MAP.put(FA_WHEELCHAIR_ALT, "\uf29b"); + ICON_MAP.put(FA_WPBEGINNER, "\uf297"); + ICON_MAP.put(FA_WPFORMS, "\uf298"); + ICON_MAP.put(FA_YOAST, "\uf2b1"); + //4.7 + ICON_MAP.put(FA_ADDRESS_BOOK, "\uf2b9"); + ICON_MAP.put(FA_ADDRESS_BOOK_O, "\uf2ba"); + ICON_MAP.put(FA_ADDRESS_CARD, "\uf2bb"); + ICON_MAP.put(FA_ADDRESS_CARD_O, "\uf2bc"); + ICON_MAP.put(FA_BANDCAMP, "\uf2d5"); + ICON_MAP.put(FA_BATH, "\uf2cd"); + ICON_MAP.put(FA_BATHTUB, "\uf2cd"); + ICON_MAP.put(FA_DRIVERS_LICENSE, "\uf2c2"); + ICON_MAP.put(FA_DRIVERS_LICENSE_O, "\uf2c3"); + ICON_MAP.put(FA_EERCAST, "\uf2da"); + ICON_MAP.put(FA_ENVELOPE_OPEN, "\uf2b6"); + ICON_MAP.put(FA_ENVELOPE_OPEN_O, "\uf2b7"); + ICON_MAP.put(FA_ETSY, "\uf2d7"); + ICON_MAP.put(FA_FREE_CODE_CAMP, "\uf2c5"); + ICON_MAP.put(FA_GRAV, "\uf2d6"); + ICON_MAP.put(FA_HANDSHAKE_O, "\uf2b5"); + ICON_MAP.put(FA_ID_BADGE, "\uf2c1"); + ICON_MAP.put(FA_ID_CARD, "\uf2c2"); + ICON_MAP.put(FA_ID_CARD_O, "\uf2c3"); + ICON_MAP.put(FA_IMDB, "\uf2d8"); + ICON_MAP.put(FA_LINODE, "\uf2b8"); + ICON_MAP.put(FA_MEETUP, "\uf2e0"); + ICON_MAP.put(FA_MICROCHIP, "\uf2db"); + ICON_MAP.put(FA_PODCAST, "\uf2ce"); + ICON_MAP.put(FA_QUORA, "\uf2c4"); + ICON_MAP.put(FA_RAVELRY, "\uf2d9"); + ICON_MAP.put(FA_S15, "\uf2cd"); + ICON_MAP.put(FA_SHOWER, "\uf2cc"); + ICON_MAP.put(FA_SNOWFLAKE_O, "\uf2dc"); + ICON_MAP.put(FA_SUPERPOWERS, "\uf2dd"); + ICON_MAP.put(FA_TELEGRAM, "\uf2c6"); + ICON_MAP.put(FA_THERMOMETER, "\uf2c7"); + ICON_MAP.put(FA_THERMOMETER_0, "\uf2cb"); + ICON_MAP.put(FA_THERMOMETER_1, "\uf2ca"); + ICON_MAP.put(FA_THERMOMETER_2, "\uf2c9"); + ICON_MAP.put(FA_THERMOMETER_3, "\uf2c8"); + ICON_MAP.put(FA_THERMOMETER_4, "\uf2c7"); + ICON_MAP.put(FA_THERMOMETER_EMPTY, "\uf2cb"); + ICON_MAP.put(FA_THERMOMETER_FULL, "\uf2c7"); + ICON_MAP.put(FA_THERMOMETER_HALF, "\uf2c9"); + ICON_MAP.put(FA_THERMOMETER_QUARTER, "\uf2ca"); + ICON_MAP.put(FA_THERMOMETER_THREE_QUARTERS, "\uf2c8"); + ICON_MAP.put(FA_TIMES_RECTANGLE, "\uf2d3"); + ICON_MAP.put(FA_TIMES_RECTANGLE_O, "\uf2d4"); + ICON_MAP.put(FA_USER_CIRCLE, "\uf2bd"); + ICON_MAP.put(FA_USER_CIRCLE_O, "\uf2be"); + ICON_MAP.put(FA_USER_O, "\uf2c0"); + ICON_MAP.put(FA_VCARD, "\uf2bb"); + ICON_MAP.put(FA_VCARD_O, "\uf2bc"); + ICON_MAP.put(FA_WINDOW_CLOSE, "\uf2d3"); + ICON_MAP.put(FA_WINDOW_CLOSE_O, "\uf2d4"); + ICON_MAP.put(FA_WINDOW_MAXIMIZE, "\uf2d0"); + ICON_MAP.put(FA_WINDOW_MINIMIZE, "\uf2d1"); + ICON_MAP.put(FA_WINDOW_RESTORE, "\uf2d2"); + ICON_MAP.put(FA_WPEXPLORER, "\uf2de"); ATTR_MAP.put(0, FA_ADJUST); @@ -2816,6 +3089,98 @@ public class FontAwesome implements IconSet { ATTR_MAP.put(690, FA_YOUTUBE); ATTR_MAP.put(691, FA_YOUTUBE_PLAY); ATTR_MAP.put(692, FA_YOUTUBE_SQUARE); + //4.6 + ATTR_MAP.put(693, FA_AMERICAN_SIGN_LANGUAGE_INTERPRETING); + ATTR_MAP.put(694, FA_ASL_INTERPRETING); + ATTR_MAP.put(695, FA_ASSISTIVE_LISTENING_SYSTEMS); + ATTR_MAP.put(696, FA_AUDIO_DESCRIPTION); + ATTR_MAP.put(697, FA_BLIND); + ATTR_MAP.put(698, FA_BRAILLE); + ATTR_MAP.put(699, FA_DEAF); + ATTR_MAP.put(700, FA_DEAFNESS); + ATTR_MAP.put(701, FA_ENVIRA); + ATTR_MAP.put(702, FA_FA); + ATTR_MAP.put(703, FA_FIRST_ORDER); + ATTR_MAP.put(704, FA_FONT_AWESOME); + ATTR_MAP.put(705, FA_GITLAB); + ATTR_MAP.put(706, FA_GLIDE); + ATTR_MAP.put(707, FA_GLIDE_G); + ATTR_MAP.put(708, FA_GOOGLE_PLUS_CIRCLE); + ATTR_MAP.put(709, FA_GOOGLE_PLUS_OFFICIAL); + ATTR_MAP.put(710, FA_HARD_OF_HEARING); + ATTR_MAP.put(711, FA_LOW_VISION); + ATTR_MAP.put(712, FA_QUESTION_CIRCLE_O); + ATTR_MAP.put(713, FA_SIGN_LANGUAGE); + ATTR_MAP.put(714, FA_SIGNING); + ATTR_MAP.put(715, FA_SNAPCHAT); + ATTR_MAP.put(716, FA_SNAPCHAT_GHOST); + ATTR_MAP.put(717, FA_SNAPCHAT_SQUARE); + ATTR_MAP.put(718, FA_THEMEISLE); + ATTR_MAP.put(719, FA_UNIVERSAL_ACCESS); + ATTR_MAP.put(720, FA_VIADEO); + ATTR_MAP.put(721, FA_VIADEO_SQUARE); + ATTR_MAP.put(722, FA_VOLUME_CONTROL_PHONE); + ATTR_MAP.put(723, FA_WHEELCHAIR_ALT); + ATTR_MAP.put(724, FA_WPBEGINNER); + ATTR_MAP.put(725, FA_WPFORMS); + ATTR_MAP.put(726, FA_YOAST); + //4.7 + ATTR_MAP.put(727, FA_ADDRESS_BOOK); + ATTR_MAP.put(728, FA_ADDRESS_BOOK_O); + ATTR_MAP.put(729, FA_ADDRESS_CARD); + ATTR_MAP.put(730, FA_ADDRESS_CARD_O); + ATTR_MAP.put(731, FA_BANDCAMP); + ATTR_MAP.put(732, FA_BATH); + ATTR_MAP.put(733, FA_BATHTUB); + ATTR_MAP.put(734, FA_DRIVERS_LICENSE); + ATTR_MAP.put(735, FA_DRIVERS_LICENSE_O); + ATTR_MAP.put(736, FA_EERCAST); + ATTR_MAP.put(737, FA_ENVELOPE_OPEN); + ATTR_MAP.put(738, FA_ENVELOPE_OPEN_O); + ATTR_MAP.put(739, FA_ETSY); + ATTR_MAP.put(740, FA_FREE_CODE_CAMP); + ATTR_MAP.put(741, FA_GRAV); + ATTR_MAP.put(742, FA_HANDSHAKE_O); + ATTR_MAP.put(743, FA_ID_BADGE); + ATTR_MAP.put(744, FA_ID_CARD); + ATTR_MAP.put(745, FA_ID_CARD_O); + ATTR_MAP.put(746, FA_IMDB); + ATTR_MAP.put(747, FA_LINODE); + ATTR_MAP.put(748, FA_MEETUP); + ATTR_MAP.put(749, FA_MICROCHIP); + ATTR_MAP.put(750, FA_PODCAST); + ATTR_MAP.put(751, FA_QUORA); + ATTR_MAP.put(752, FA_RAVELRY); + ATTR_MAP.put(753, FA_S15); + ATTR_MAP.put(754, FA_SHOWER); + ATTR_MAP.put(755, FA_SNOWFLAKE_O); + ATTR_MAP.put(756, FA_SUPERPOWERS); + ATTR_MAP.put(757, FA_TELEGRAM); + ATTR_MAP.put(758, FA_THERMOMETER); + ATTR_MAP.put(759, FA_THERMOMETER_0); + ATTR_MAP.put(760, FA_THERMOMETER_1); + ATTR_MAP.put(761, FA_THERMOMETER_2); + ATTR_MAP.put(762, FA_THERMOMETER_3); + ATTR_MAP.put(763, FA_THERMOMETER_4); + ATTR_MAP.put(764, FA_THERMOMETER_EMPTY); + ATTR_MAP.put(765, FA_THERMOMETER_FULL); + ATTR_MAP.put(766, FA_THERMOMETER_HALF); + ATTR_MAP.put(767, FA_THERMOMETER_QUARTER); + ATTR_MAP.put(768, FA_THERMOMETER_THREE_QUARTERS); + ATTR_MAP.put(769, FA_TIMES_RECTANGLE); + ATTR_MAP.put(770, FA_TIMES_RECTANGLE_O); + ATTR_MAP.put(771, FA_USER_CIRCLE); + ATTR_MAP.put(772, FA_USER_CIRCLE_O); + ATTR_MAP.put(773, FA_USER_O); + ATTR_MAP.put(774, FA_VCARD); + ATTR_MAP.put(775, FA_VCARD_O); + ATTR_MAP.put(776, FA_WINDOW_CLOSE); + ATTR_MAP.put(777, FA_WINDOW_CLOSE_O); + ATTR_MAP.put(778, FA_WINDOW_MAXIMIZE); + ATTR_MAP.put(779, FA_WINDOW_MINIMIZE); + ATTR_MAP.put(780, FA_WINDOW_RESTORE); + ATTR_MAP.put(781, FA_WPEXPLORER); + } } From 0edd1ae7271fc680792d5bbefab8ee9582ed6db9 Mon Sep 17 00:00:00 2001 From: knightkill Date: Tue, 4 Jul 2017 20:10:32 +0530 Subject: [PATCH 4/9] Make AwesomeTextView disappear when empty text or bootstrapText --- .../beardedhen/androidbootstrap/AwesomeTextView.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/AwesomeTextView.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/AwesomeTextView.java index 8471d4f..e736e6d 100644 --- a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/AwesomeTextView.java +++ b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/AwesomeTextView.java @@ -283,4 +283,14 @@ protected void updateBootstrapState() { bootstrapText = null; } + @Override + protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) { + super.onTextChanged(text, start, lengthBefore, lengthAfter); + if(!(text!=null && text.length()>0)){ + setVisibility(GONE); + }else{ + setVisibility(VISIBLE); + } + } + } From fb32ecaaaadd1af537a08cf7d581f1b1f739694a Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 22 Jul 2017 10:12:46 +0100 Subject: [PATCH 5/9] fix #192 --- .../java/com/beardedhen/androidbootstrap/BootstrapEditText.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java index 32435e1..1863b12 100644 --- a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java +++ b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapEditText.java @@ -61,7 +61,7 @@ private void initialise(AttributeSet attrs) { try { this.rounded = a.getBoolean(R.styleable.BootstrapEditText_roundedCorners, false); - int typeOrdinal = a.getInt(R.styleable.AwesomeTextView_bootstrapBrand, -1); + int typeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapBrand, -1); int sizeOrdinal = a.getInt(R.styleable.BootstrapEditText_bootstrapSize, -1); this.bootstrapBrand = DefaultBootstrapBrand.fromAttributeValue(typeOrdinal); From edc75f65538cc881b6c4f54852c5492949ab0a4c Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 22 Jul 2017 10:16:37 +0100 Subject: [PATCH 6/9] update gradle dependencies --- AndroidBootstrap/build.gradle | 6 +++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- sample/build.gradle | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/AndroidBootstrap/build.gradle b/AndroidBootstrap/build.gradle index 5350800..89ec114 100644 --- a/AndroidBootstrap/build.gradle +++ b/AndroidBootstrap/build.gradle @@ -3,7 +3,7 @@ apply from: 'push.gradle' android { compileSdkVersion Integer.parseInt(TARGET_SDK_INT) - buildToolsVersion "25.0.1" + buildToolsVersion "25.0.3" defaultConfig { minSdkVersion Integer.parseInt(MIN_SDK_INT) @@ -14,6 +14,6 @@ android { } dependencies { - compile 'com.android.support:support-annotations:25.0.1' - compile 'com.android.support:support-v4:25.0.1' + compile 'com.android.support:support-annotations:25.3.1' + compile 'com.android.support:support-v4:25.3.1' } diff --git a/build.gradle b/build.gradle index 530152b..ca29de0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..51495d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sat Jul 22 10:14:14 BST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index e8d5688..231b53a 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion Integer.parseInt(TARGET_SDK_INT) - buildToolsVersion "25.0.1" + buildToolsVersion "25.0.3" defaultConfig { applicationId "com.fractalwrench.androidbootstrap.sample" @@ -31,6 +31,6 @@ dependencies { compile 'com.jakewharton:butterknife:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' - compile 'com.android.support:appcompat-v7:25.0.1' - compile 'com.android.support:support-annotations:25.0.1' + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:support-annotations:25.3.1' } From 7ecc2822c395cd1cf52b3da7abad8d953963335c Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 22 Jul 2017 10:27:12 +0100 Subject: [PATCH 7/9] increment version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index fc56b86..ba21421 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -VERSION_NAME=2.3.1 -VERSION_CODE=231 +VERSION_NAME=2.3.2 +VERSION_CODE=232 GROUP=com.beardedhen MIN_SDK_INT=14 From b3d62cc1847e26d420c53c92665a4fe1e6ee7ecf Mon Sep 17 00:00:00 2001 From: jamie-beardedhen Date: Sat, 22 Jul 2017 10:39:46 +0100 Subject: [PATCH 8/9] Update README.md add method size badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e2e7d0..dd15b45 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Quick Start =========== [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.beardedhen/androidbootstrap/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.beardedhen/androidbootstrap) [![CircleCI](https://circleci.com/gh/Bearded-Hen/Android-Bootstrap/tree/develop.svg?style=shield)](https://circleci.com/gh/Bearded-Hen/Android-Bootstrap/tree/develop) + Add the following dependency to your build.gradle, ensuring you replace 'X.X.X' with the latest version on the button above: From b65777936cca7a5ceb6caf028e43c27a9f1a3e87 Mon Sep 17 00:00:00 2001 From: xMagerx <32936738+xMagerx@users.noreply.github.com> Date: Sat, 28 Oct 2017 14:49:40 +0300 Subject: [PATCH 9/9] Add files via upload