Merge remote-tracking branch 'upstream/master'

Author: fractalwrench

AndroidBootstrap/build.gradle

@@ -15,4 +15,5 @@ android {
 
 dependencies {
     compile 'com.android.support:support-annotations:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
 }

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

@@ -43,6 +43,7 @@ public class BootstrapButton extends AwesomeTextView implements BootstrapSizeVie
 
     private boolean roundedCorners;
     private boolean showOutline;
+    private boolean mustBeSelected;
 
     private float baselineFontSize;
     private float baselineVertPadding;
@@ -72,6 +73,7 @@ private void initialise(AttributeSet attrs) {
         try {
             this.roundedCorners = a.getBoolean(R.styleable.BootstrapButton_roundedCorners, false);
             this.showOutline = a.getBoolean(R.styleable.BootstrapButton_showOutline, false);
+            this.mustBeSelected = a.getBoolean(R.styleable.BootstrapButton_checked, false);
 
             int sizeOrdinal = a.getInt(R.styleable.BootstrapButton_bootstrapSize, -1);
             int modeOrdinal = a.getInt(R.styleable.BootstrapButtonGroup_buttonMode, -1);
@@ -239,6 +241,14 @@ void updateFromParent(BootstrapBrand bootstrapBrand,
      * Getters/Setters
      */
 
+    public boolean isMustBeSelected() {
+        return mustBeSelected;
+    }
+
+    public void setChecked(boolean checked) {
+        this.mustBeSelected = checked;
+    }
+
     @Override public boolean isShowOutline() {
         return showOutline;
     }

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapButtonGroup.java

@@ -4,6 +4,7 @@
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
@@ -52,6 +53,8 @@ public class BootstrapButtonGroup extends LinearLayout implements BootstrapSizeV
     private boolean rounded;
     private boolean outline;
 
+    private int checkedButtonId = 0;
+
     public BootstrapButtonGroup(Context context) {
         super(context);
         initialise(null);
@@ -78,6 +81,7 @@ private void initialise(AttributeSet attrs) {
             int brandOrdinal = a.getInt(R.styleable.BootstrapButtonGroup_bootstrapBrand, -1);
             int sizeOrdinal = a.getInt(R.styleable.BootstrapButtonGroup_bootstrapSize, -1);
 
+            this.checkedButtonId = a.getResourceId(R.styleable.BootstrapButtonGroup_checkedButton, 0);
             this.buttonMode = ButtonMode.fromAttributeValue(typeOrdinal);
             this.bootstrapBrand = DefaultBootstrapBrand.fromAttributeValue(brandOrdinal);
             this.bootstrapSize = DefaultBootstrapSize.fromAttributeValue(sizeOrdinal).scaleFactor();
@@ -164,6 +168,15 @@ else if (i == size - 1) { // last view
             }
             button.setViewGroupPosition(position, i);
             button.updateFromParent(bootstrapBrand, bootstrapSize, buttonMode, outline, rounded);
+            if (buttonMode == ButtonMode.RADIO && button.isMustBeSelected()) {
+                button.setSelected(true);
+                onRadioToggle(i);
+                checkedButtonId = 0; //BootstrapButton "checked" attribute is preferable
+            }
+            else if (buttonMode == ButtonMode.RADIO && button.getId() == checkedButtonId) {
+                button.setSelected(true);
+                onRadioToggle(i);
+            }
         }
     }
 
@@ -198,6 +211,10 @@ void onRadioToggle(int index) {
      * Getters / Setters
      */
 
+    public void check(@IdRes int id) {
+        this.checkedButtonId = id;
+    }
+
     @Override public float getBootstrapSize() {
         return bootstrapSize;
     }

AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/BootstrapDrawableFactory.java

@@ -2,7 +2,12 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
@@ -13,6 +18,7 @@
 import com.beardedhen.androidbootstrap.api.attributes.BootstrapBrand;
 import com.beardedhen.androidbootstrap.api.attributes.ViewGroupPosition;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
+import com.beardedhen.androidbootstrap.api.defaults.ExpandDirection;
 import com.beardedhen.androidbootstrap.utils.ColorUtils;
 import com.beardedhen.androidbootstrap.utils.DimenUtils;
 
@@ -196,6 +202,14 @@ static ColorStateList bootstrapButtonText(Context context, boolean outline, Boot
         return new ColorStateList(getStateList(), getColorList(defaultColor, activeColor, disabledColor));
     }
 
+    static Drawable bootstrapWell(@ColorInt int backgroundColor, int cornerRadius, int strokeWidth, @ColorInt int strokeColor) {
+        GradientDrawable background = new GradientDrawable();
+        background.setColor(backgroundColor);
+        background.setCornerRadius(cornerRadius);
+        background.setStroke(strokeWidth, strokeColor);
+        return background;
+    }
+
     private static StateListDrawable setupStateDrawable(ViewGroupPosition position, int strokeWidth, GradientDrawable defaultGd, GradientDrawable activeGd, GradientDrawable disabledGd) {
         StateListDrawable stateListDrawable = new StateListDrawable();
         LayerDrawable defaultLayer = new LayerDrawable(new Drawable[]{defaultGd});
@@ -306,6 +320,74 @@ private static int[] getColorList(int defaultColor, int activeColor, int disable
         }
     }
 
+    static StateListDrawable bootstrapDropDownArrow(Context context, int width, int height, ExpandDirection expandDirection, boolean outline, BootstrapBrand brand) {
+        StateListDrawable stateListDrawable = new StateListDrawable();
+
+        int defaultColor = outline ? brand.defaultFill(context) : brand.defaultTextColor(context);
+        int activeColor = outline ? ColorUtils.resolveColor(android.R.color.white, context) : brand.activeTextColor(context);
+        int disabledColor = outline ? brand.disabledFill(context) : brand.disabledTextColor(context);
+
+        if (Build.VERSION.SDK_INT >= 14) {
+            stateListDrawable.addState(new int[]{android.R.attr.state_hovered}, createArrowIcon(context, width, height, activeColor, expandDirection));
+        }
+
+        stateListDrawable.addState(new int[]{android.R.attr.state_activated}, createArrowIcon(context, width, height, activeColor, expandDirection));
+        stateListDrawable.addState(new int[]{android.R.attr.state_focused}, createArrowIcon(context, width, height, activeColor, expandDirection));
+        stateListDrawable.addState(new int[]{android.R.attr.state_pressed}, createArrowIcon(context, width, height, activeColor, expandDirection));
+        stateListDrawable.addState(new int[]{android.R.attr.state_selected}, createArrowIcon(context, width, height, activeColor, expandDirection));
+        stateListDrawable.addState(new int[]{-android.R.attr.state_enabled}, createArrowIcon(context, width, height, disabledColor, expandDirection));
+        stateListDrawable.addState(new int[]{}, createArrowIcon(context, width, height, defaultColor, expandDirection));
+        return stateListDrawable;
+    }
+
+    /**
+     * Creates arrow icon that depends on ExpandDirection
+     *
+     * @param context context
+     * @param width  width of icon in pixels
+     * @param height height of icon in pixels
+     * @param color arrow color
+     * @param expandDirection arrow direction
+     * @return icon drawable
+     */
+    private static Drawable createArrowIcon(Context context, int width, int height, int color, ExpandDirection expandDirection) {
+        Bitmap canvasBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(canvasBitmap);
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.FILL_AND_STROKE);
+        paint.setStrokeWidth(1);
+        paint.setColor(color);
+        paint.setAntiAlias(true);
+        Path path = new Path();
+        path.setFillType(Path.FillType.EVEN_ODD);
+        switch (expandDirection) {
+            case UP:
+                path.moveTo(0, (height / 3) * 2);
+                path.lineTo(width, (height / 3) * 2);
+                path.lineTo(width / 2, height / 3);
+                path.lineTo(0, (height / 3) * 2);
+                break;
+            case DOWN:
+                path.moveTo(0, height / 3);
+                path.lineTo(width, height / 3);
+                path.lineTo(width / 2, (height / 3) * 2);
+                path.lineTo(0, height / 3);
+                break;
+        }
+        path.close();
+        canvas.drawPath(path, paint);
+        return new BitmapDrawable(context.getResources(), canvasBitmap);
+    }
+
+    static ColorStateList bootstrapDropDownViewText(Context context) {
+
+        int defaultColor = context.getResources().getColor(R.color.bootstrap_gray_dark);
+        int activeColor = context.getResources().getColor(android.R.color.black);
+        int disabledColor = context.getResources().getColor(R.color.bootstrap_gray_light);
+
+        return new ColorStateList(getStateList(), getColorList(defaultColor, activeColor, disabledColor));
+    }
+
     private static void setInsetOnLayers(LayerDrawable[] ary, int l, int t, int r, int b) {
         for (LayerDrawable ld : ary) {
             ld.setLayerInset(0, l, t, r, b);