keep enum attribute

zedoref · zedoref · commit 0b35c6d189a1 · 2015-11-06T16:59:19.000+02:00
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapText.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapText.java
@@ -57,7 +57,7 @@ public Builder addText(CharSequence text) {
          */
         public Builder addFontAwesomeIcon(@FontAwesome.Icon CharSequence iconCode) {
             IconSet iconSet = TypefaceProvider.retrieveRegisteredIconSet(FontAwesome.FONT_PATH);
-            sb.append(iconSet.unicodeForKey(iconCode));
+            sb.append(iconSet.unicodeForKey(iconCode.toString().replaceAll("\\-", "_")));
             fontIndicesMap.put(sb.length(), iconSet);
             return this;
         }
@@ -68,7 +68,7 @@ public Builder addFontAwesomeIcon(@FontAwesome.Icon CharSequence iconCode) {
          */
         public Builder addTypicon(@Typicon.Icon CharSequence iconCode) {
             IconSet iconSet = TypefaceProvider.retrieveRegisteredIconSet(Typicon.FONT_PATH);
-            sb.append(iconSet.unicodeForKey(iconCode));
+            sb.append(iconSet.unicodeForKey(iconCode.toString().replaceAll("\\-", "_")));
             fontIndicesMap.put(sb.length(), iconSet);
             return this;
         }
@@ -79,7 +79,7 @@ public Builder addTypicon(@Typicon.Icon CharSequence iconCode) {
          * @return the updated builder instance
          */
         public Builder addIcon(CharSequence iconCode, IconSet iconSet) {
-            sb.append(iconSet.unicodeForKey(iconCode));
+            sb.append(iconSet.unicodeForKey(iconCode.toString().replaceAll("\\-", "_")));
             fontIndicesMap.put(sb.length(), iconSet);
             return this;
         }
diff --git a/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/IconResolver.java b/AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/IconResolver.java
@@ -11,8 +11,8 @@
  */
 class IconResolver {
 
-    private static final String REGEX_FONT_AWESOME = "fa_[a-z_0-9]+";
-    private static final String REGEX_TYPICONS = "ty_[a-z_0-9]+";
+    private static final String REGEX_FONT_AWESOME = "(fa_|fa-)[a-z_0-9]+";
+    private static final String REGEX_TYPICONS = "(ty_|ty-)[a-z_0-9]+";
 
     /**
      * Resolves markdown to produce a BootstrapText instance. e.g. "{fa_android}" would be replaced
@@ -51,7 +51,7 @@ else if (c == '}') {
                 if (startIndex != -1 && endIndex != -1) { // recognised markdown string
 
                     if (startIndex >= 0 && endIndex < markdown.length()) {
-                        String iconCode = markdown.substring(startIndex + 1, endIndex);
+                        String iconCode = markdown.substring(startIndex + 1, endIndex).replaceAll("\\-", "_");
                         builder.addText(markdown.substring(lastAddedIndex, startIndex));
 
                         if (iconCode.matches(REGEX_FONT_AWESOME)) { // text is FontAwesome code
