tidy up

Author: jamie-beardedhen

AndroidBootstrap/src/com/beardedhen/androidbootstrap/BootstrapButton.java

@@ -190,8 +190,14 @@ private void initialise(AttributeSet attrs) {
 
         setBootstrapType(bootstrapStringType);
         //set the font awesome icon typeface
-        lblLeft.setTypeface(FontAwesome.getFont(getContext()));
-        lblRight.setTypeface(FontAwesome.getFont(getContext()));
+
+
+
+        if (!isInEditMode()) {
+
+            lblLeft.setTypeface(FontAwesome.getFont(getContext()));
+            lblRight.setTypeface(FontAwesome.getFont(getContext()));
+        }
 
         //set up the font size
         lblLeft.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize);

AndroidBootstrap/src/com/beardedhen/androidbootstrap/BootstrapThumbnail.java

@@ -34,6 +34,14 @@ private enum ThumbnailTypes {
         public static ThumbnailTypes getTypeFromBoolean(boolean roundedCorners) {
             return (roundedCorners) ? ROUNDED : SQUARE;
         }
+
+        public int getContainerDrawable() {
+            return containerDrawable;
+        }
+
+        public int getPlaceholderDrawable() {
+            return placeholderDrawable;
+        }
     }
 
     public BootstrapThumbnail(Context context) {
@@ -109,12 +117,12 @@ private void initialise(AttributeSet attrs) {
         type = ThumbnailTypes.getTypeFromBoolean(roundedCorners);
 
         //apply the background type
-        container.setBackgroundResource(type.containerDrawable);
+        container.setBackgroundResource(type.getContainerDrawable());
 
         //if no image is provided by user
         if (imageDrawable == 0) {
             //set default grey placeholder background
-            placeholder.setBackgroundResource(type.placeholderDrawable);
+            placeholder.setBackgroundResource(type.getPlaceholderDrawable());
 
             //set the text
             if (text.length() > 0) {

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=1.1.0
-VERSION_CODE=110
+VERSION_NAME=1.1.1
+VERSION_CODE=111
 GROUP=com.beardedhen
 
 POM_DESCRIPTION=Bootstrap style buttons with Font Awesome