font file now included in library project, removes need for copy and paste to project

Author: jamie-beardedhen

AndroidBootstrap/assets/fontawesome-webfont.ttf

@@ -18,7 +18,6 @@ public class BootstrapButton extends FrameLayout {
     private TextView lblLeft;
     private ViewGroup layout;
     private boolean roundedCorners = false;
-    private boolean fillparent = false;
 
     private enum BootstrapType {
         DEFAULT("default", R.drawable.bbuton_default, R.drawable.bbuton_default_rounded, R.color.black),
@@ -29,10 +28,10 @@ private enum BootstrapType {
         DANGER("danger", R.drawable.bbuton_danger, R.drawable.bbuton_danger_rounded, R.color.white),
         INVERSE("inverse", R.drawable.bbuton_inverse, R.drawable.bbuton_inverse_rounded, R.color.white);
 
-        private String type;
-        private int normalBg;
-        private int roundedBg;
-        private int textColour;
+        private final String type;
+        private final int normalBg;
+        private final int roundedBg;
+        private final int textColour;
 
         BootstrapType(String type, int normalBg, int roundedBg, int textColour) {
             this.type = type;
@@ -70,10 +69,10 @@ private enum BootstrapSize {
         SMALL("small", 12.0f, 5, 10),
         XSMALL("xsmall", 10.0f, 2, 5);
 
-        private float fontSize;
-        private String type;
-        private int paddingA;
-        private int paddingB;
+        private final float fontSize;
+        private final String type;
+        private final int paddingA;
+        private final int paddingB;
 
         private BootstrapSize(String type, float fontSize, int paddingA, int paddingB) {
             this.type = type;
@@ -153,7 +152,7 @@ private void initialise(AttributeSet attrs) {
                 size = (size == null) ? "default" : size;
 
                 int layoutWidth = a.getLayoutDimension(R.styleable.BootstrapButton_android_layout_width, 0);
-                fillparent = (layoutWidth == LayoutParams.MATCH_PARENT);
+                boolean fillparent = (layoutWidth == LayoutParams.MATCH_PARENT);
 
                 Float layoutWeight = a.getFloat(R.styleable.BootstrapButton_android_layout_weight, -1);
                 fillparent = (layoutWeight != -1) || fillparent;
@@ -335,14 +334,16 @@ public void setBootstrapButtonEnabled(boolean enabled) {
     public void setTextGravity(String gravity) {
         int gravityId = -1;
 
-        if (gravity.equals("left")) {
-            gravityId = Gravity.LEFT;
-        }
-        else if (gravity.equals("center")) {
-            gravityId = Gravity.CENTER_HORIZONTAL;
-        }
-        else if (gravity.equals("right")) {
-            gravityId = Gravity.RIGHT;
+        switch (gravity) {
+            case "left":
+                gravityId = Gravity.LEFT;
+                break;
+            case "center":
+                gravityId = Gravity.CENTER_HORIZONTAL;
+                break;
+            case "right":
+                gravityId = Gravity.RIGHT;
+                break;
         }
 
         if (gravityId != -1) {

AndroidBootstrap/res/layout/row_title.xml

@@ -22,9 +22,9 @@ private enum BootstrapCircleType {
         LARGE("large", 6, 112),
         XLARGE("xlarge", 8, 176);
 
-        private String type;
-        private int padding;
-        private int diameter;
+        private final String type;
+        private final int padding;
+        private final int diameter;
 
         private BootstrapCircleType(String type, int padding, int diameter) {
             this.type = type;
@@ -128,8 +128,8 @@ private void initialise(AttributeSet attrs) {
         //make inner image smaller to compensate for the padding so that entire circle including padding equals the size
         //ex. small image = 48dp, small padding = 4dp, inner image = 48 - (4 * 2) = 40
         if (!this.minimal) {
-            imageSizeWidthPX = imageSizeWidthPX - (paddingPX * 2);
-            imageSizeHeightPX = imageSizeHeightPX - (paddingPX * 2);
+            imageSizeWidthPX -= (paddingPX * 2);
+            imageSizeHeightPX -= (paddingPX * 2);
 
             container.setPadding(paddingPX, paddingPX, paddingPX, paddingPX);
             container.setBackgroundResource(R.drawable.thumbnail_circle_container);
@@ -180,8 +180,8 @@ public void setImage(Bitmap bitmap) {
         int paddingPX = (int) ((this.padding * scale) + 0.5);
 
         if (!this.minimal) {
-            widthPX = widthPX - (paddingPX * 2);
-            heightPX = heightPX - (paddingPX * 2);
+            widthPX -= (paddingPX * 2);
+            heightPX -= (paddingPX * 2);
         }
 
         Bitmap roundBitmap = ImageUtils.getCircleBitmap(bitmap, widthPX, heightPX);

AndroidBootstrap/res/layout/row_title_and_subtitle.xml

@@ -15,9 +15,9 @@ private enum TextState {
         WARNING("warning", R.drawable.edittext_background_rounded_warning, R.drawable.edittext_background_warning),
         DANGER("danger", R.drawable.edittext_background_rounded_danger, R.drawable.edittext_background_danger);
 
-        private String state;
-        private int roundedBg;
-        private int normalBg;
+        private final String state;
+        private final int roundedBg;
+        private final int normalBg;
 
         private TextState(String state, int roundedBg, int normalBg) {
             this.state = state;
@@ -166,11 +166,14 @@ public void setDefault() {
     }
 
     /**
+     * THIS METHOD IS DEPRECATED AND WILL BE REMOVED IN A FUTURE RELEASE.
+     * Use setEnabled() instead.
+     *
      * Specifies whether the BootstrapEditText is enabled or disabled
      *
      * @param enabled - boolean state for either enabled or disabled
      */
-    public void setBootstrapEditTextEnabled(boolean enabled) {
+    @Deprecated public void setBootstrapEditTextEnabled(boolean enabled) {
         this.setEnabled(enabled);
     }
 

AndroidBootstrap/res/layout/row_two_columns.xml

@@ -23,8 +23,8 @@ private enum ThumbnailTypes {
         ROUNDED(R.drawable.bthumbnail_container_rounded, R.drawable.bthumbnail_placeholder_default),
         SQUARE(R.drawable.bthumbnail_container_square, R.drawable.bthumbnail_placeholder_default);
 
-        private int containerDrawable;
-        private int placeholderDrawable;
+        private final int containerDrawable;
+        private final int placeholderDrawable;
 
         ThumbnailTypes(int containerDrawable, int placeholderDrawable) {
             this.containerDrawable = containerDrawable;

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

@@ -9,7 +9,7 @@
 
 public class FontAwesome {
 
-    private static Map<String, String> faMap = new HashMap<String, String>();
+    private static final Map<String, String> faMap = new HashMap<>();
 
     private static Typeface font;
 

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

@@ -22,8 +22,8 @@ public enum AnimationSpeed {
         MEDIUM(1000, 500),
         SLOW(2000, 1000);
 
-        private long rotateDuration;
-        private long flashDuration;
+        private final long rotateDuration;
+        private final long flashDuration;
 
         private AnimationSpeed(long rotateDuration, long flashDuration) {
             this.rotateDuration = rotateDuration;

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

@@ -30,7 +30,7 @@ private interface SizeTester {
         public int onTestSize(int suggestedSize, RectF availableSpace);
     }
 
-    private RectF mTextRect = new RectF();
+    private final RectF mTextRect = new RectF();
 
     private RectF mAvailableSpaceRect;
 

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

@@ -27,9 +27,7 @@ Alternatively you can use Android Bootstrap as a library project by downloading
 
 ### Usage
 
-1. Copy [__fontawesome-webfont.ttf__](https://github.com/Bearded-Hen/Android-Bootstrap/raw/master/fontawesome-webfont.ttf) into the __assets folder__ of your project, as otherwise  __FontAwesome won't work__. In a default Android Studio project this should be located at __app/src/main/assets__
-
-2. Paste the following XML into a layout file to create a BootstrapButton:
+1. Paste the following XML into a layout file to create a BootstrapButton:
 
    ```xml
 <!-- basic button -->
@@ -43,13 +41,13 @@ Alternatively you can use Android Bootstrap as a library project by downloading
 />
 ```
 
-3. Add the bootstrap namespace to the root view of your layout:
+2. Add the bootstrap namespace to the root view of your layout:
 
    ```xml
 xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
 ```
 
-4. Build and run the app. 
+3. Build and run the app.
 
 ## More Information
 

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

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }