Add outlineColor attribute, so it can be user defined

spectrum/src/main/java/com/thebluealliance/spectrum/SpectrumDialog.java

@@ -27,6 +27,7 @@ public class SpectrumDialog extends DialogFragment implements SpectrumPalette.On
     private static final String KEY_POSITIVE_BUTTON_TEXT = "positive_button_text";
     private static final String KEY_NEGATIVE_BUTTON_TEXT = "negative_button_text";
     private static final String KEY_OUTLINE_WIDTH = "border_width";
+    private static final String KEY_OUTLINE_COLOR = "border_color";
     private static final String KEY_FIXED_COLUMN_COUNT = "fixed_column_count";
     private static final String KEY_THEME_RES_ID = "theme_res_id";
 
@@ -39,6 +40,7 @@ public class SpectrumDialog extends DialogFragment implements SpectrumPalette.On
     private boolean mShouldDismissOnColorSelected = true;
     private OnColorSelectedListener mListener;
     private int mOutlineWidth = 0;
+    private @ColorInt int mOutlineColor;
     private int mFixedColumnCount = -1;
     private int mThemeResId = 0;
 
@@ -92,6 +94,18 @@ public Builder setOutlineWidth(int width) {
             mArgs.putInt(KEY_OUTLINE_WIDTH, width);
             return this;
         }
+
+
+        /**
+         * Change the color of the outlining
+         *
+         * @param color
+         * @return This {@link Builder} for method chaining
+         */
+        public Builder setOutlineColor(@ColorInt int color) {
+            mArgs.putInt(KEY_OUTLINE_COLOR, color);
+            return this;
+        }
 
         /**
          * Tells the underlying palette to use a fixed number of columns during layout.
@@ -310,6 +324,10 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if (args != null && args.containsKey(KEY_OUTLINE_WIDTH)) {
             mOutlineWidth = args.getInt(KEY_OUTLINE_WIDTH);
         }
+
+        if (args != null && args.containsKey(KEY_OUTLINE_COLOR)) {
+            mOutlineColor = args.getInt(KEY_OUTLINE_COLOR);
+        }
 
         if (args != null && args.containsKey(KEY_FIXED_COLUMN_COUNT)) {
             mFixedColumnCount = args.getInt(KEY_FIXED_COLUMN_COUNT);
@@ -375,6 +393,9 @@ public void onClick(DialogInterface dialog, int which) {
         if (mOutlineWidth != 0) {
             palette.setOutlineWidth(mOutlineWidth);
         }
+        if (mOutlineColor != -1) {
+            palette.setOutlineColor(mOutlineColor);
+        }
         if (mFixedColumnCount > 0) {
             palette.setFixedColumnCount(mFixedColumnCount);
         }

spectrum/src/main/java/com/thebluealliance/spectrum/SpectrumPalette.java

@@ -37,6 +37,7 @@ public class SpectrumPalette extends LinearLayout {
     private boolean mHasFixedColumnCount = false;
     private int mFixedColumnCount = -1;
     private int mOutlineWidth = 0;
+    private @ColorInt int mOutlineColor = -1;
     private int mComputedVerticalPadding = 0;
     private int mOriginalPaddingTop = 0;
     private int mOriginalPaddingBottom = 0;
@@ -67,6 +68,7 @@ public SpectrumPalette(Context context, AttributeSet attrs) {
 
         mAutoPadding = a.getBoolean(R.styleable.SpectrumPalette_spectrum_autoPadding, false);
         mOutlineWidth = a.getDimensionPixelSize(R.styleable.SpectrumPalette_spectrum_outlineWidth, 0);
+        mOutlineColor = a.getColor(R.styleable.SpectrumPalette_spectrum_outlineColor, -1);
         mFixedColumnCount = a.getInt(R.styleable.SpectrumPalette_spectrum_columnCount, -1);
         if (mFixedColumnCount != -1) {
             mHasFixedColumnCount = true;
@@ -279,6 +281,9 @@ private ColorItem createColorItem(int color, int selectedColor) {
         if (mOutlineWidth != 0) {
             view.setOutlineWidth(mOutlineWidth);
         }
+        if (mOutlineColor != -1) {
+            view.setOutlineColor(mOutlineColor);
+        }
         mItems.add(view);
         return view;
     }
@@ -324,6 +329,19 @@ public void setOutlineWidth(int width) {
         }
     }
 
+     /**
+     * Change the color of the outlining
+     *
+     * @param color
+     */
+    public void setOutlineColor(@ColorInt int color) {
+        mOutlineColor = color;
+        for (ColorItem item : mItems) {
+            item.setOutlineColor(color);
+        }
+    }
+
+
     /**
      * Tells the palette to use a fixed number of columns during layout.
      *

spectrum/src/main/java/com/thebluealliance/spectrum/SpectrumPreference.java

@@ -29,6 +29,7 @@ public class SpectrumPreference extends DialogPreference {
     private boolean mValueSet = false;
     private View mColorView;
     private int mOutlineWidth = 0;
+    private @ColorInt int mOutlineColor = -1;
     private int mFixedColumnCount = -1;
 
     private SharedPreferences.OnSharedPreferenceChangeListener mListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@@ -52,6 +53,7 @@ public SpectrumPreference(Context context, AttributeSet attrs) {
             }
             mCloseOnSelected = a.getBoolean(R.styleable.SpectrumPreference_spectrum_closeOnSelected, true);
             mOutlineWidth = a.getDimensionPixelSize(R.styleable.SpectrumPalette_spectrum_outlineWidth, 0);
+            mOutlineColor = a.getColor(R.styleable.SpectrumPalette_spectrum_outlineColor, -1);
             mFixedColumnCount = a.getInt(R.styleable.SpectrumPalette_spectrum_columnCount, -1);
         } finally {
             a.recycle();
@@ -163,6 +165,7 @@ private void updateColorView() {
         }
         ColorCircleDrawable drawable = new ColorCircleDrawable(mCurrentValue);
         drawable.setOutlineWidth(mOutlineWidth);
+        drawable.setOutlineColor(mOutlineColor);
         if (!isEnabled()) {
             // Show just a gray circle outline
             drawable.setColor(Color.BLACK);
@@ -191,6 +194,7 @@ protected void onBindDialogView(View view) {
         mColorPalette.setColors(mColors);
         mColorPalette.setSelectedColor(mCurrentValue);
         mColorPalette.setOutlineWidth(mOutlineWidth);
+        mColorPalette.setOutlineColor(mOutlineColor);
         mColorPalette.setFixedColumnCount(mFixedColumnCount);
         mColorPalette.setOnColorSelectedListener(new SpectrumPalette.OnColorSelectedListener() {
             @Override

spectrum/src/main/java/com/thebluealliance/spectrum/SpectrumPreferenceCompat.java

@@ -53,6 +53,7 @@ public class SpectrumPreferenceCompat extends DialogPreference {
     private boolean mValueSet = false;
     private View mColorView;
     private int mOutlineWidth = 0;
+    private @ColorInt int mOutlineColor;
     private int mFixedColumnCount = -1;
 
     private SharedPreferences.OnSharedPreferenceChangeListener mListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@@ -75,6 +76,7 @@ public SpectrumPreferenceCompat(Context context, AttributeSet attrs) {
             }
             mCloseOnSelected = a.getBoolean(R.styleable.SpectrumPreference_spectrum_closeOnSelected, true);
             mOutlineWidth = a.getDimensionPixelSize(R.styleable.SpectrumPalette_spectrum_outlineWidth, 0);
+            mOutlineWidth = a.getColor(R.styleable.SpectrumPalette_spectrum_outlineColor, -1);
             mFixedColumnCount = a.getInt(R.styleable.SpectrumPalette_spectrum_columnCount, -1);
         } finally {
             a.recycle();
@@ -157,6 +159,7 @@ private void updateColorView() {
         }
         ColorCircleDrawable drawable = new ColorCircleDrawable(mCurrentValue);
         drawable.setOutlineWidth(mOutlineWidth);
+        drawable.setOutlineColor(mOutlineColor);
         if (!isEnabled()) {
             // Show just a gray circle outline
             drawable.setColor(Color.WHITE);
@@ -207,6 +210,10 @@ public void setColor(@ColorInt int value) {
     public int getOutlineWidth() {
         return mOutlineWidth;
     }
+
+    public int getOutlineColor() {
+        return mOutlineColor;
+    }
 
     public int getFixedColumnCount() {
         return mFixedColumnCount;

spectrum/src/main/java/com/thebluealliance/spectrum/internal/ColorCircleDrawable.java

@@ -13,6 +13,7 @@ public class ColorCircleDrawable extends Drawable {
     private final Paint mPaint;
     private int mRadius = 0;
     private int mOutlineWidth = 0;
+    private @ColorInt int mOutlineColor = -1;
     private final Paint mOutlinePaint;
 
     public ColorCircleDrawable(final @ColorInt int color) {

spectrum/src/main/java/com/thebluealliance/spectrum/internal/ColorItem.java

@@ -34,6 +34,7 @@ public class ColorItem extends FrameLayout implements View.OnClickListener {
     private @ColorInt int mColor;
     private boolean mIsSelected = false;
     private int mOutlineWidth = 0;
+    private @ColorInt int mOutlineColor = -1;
 
     public ColorItem(Context context, @ColorInt int color, boolean isSelected, EventBus eventBus) {
         super(context);
@@ -85,6 +86,16 @@ public void setOutlineWidth(int width) {
         mOutlineWidth = width;
         updateDrawables();
     }
+
+     /**
+     * Force an outline color instead of setting
+     * to black or white (default behavior)
+     * @param color
+     */
+    public void setOutlineColor(@ColorInt int color) {
+        mOutlineColor = color;
+        updateDrawables();
+    }
 
     public void setChecked(boolean checked) {
         boolean oldChecked = mIsSelected;
@@ -163,7 +174,12 @@ private Drawable createBackgroundDrawable() {
         GradientDrawable mask = new GradientDrawable();
         mask.setShape(GradientDrawable.OVAL);
         if (mOutlineWidth != 0) {
-            mask.setStroke(mOutlineWidth, ColorUtil.isColorDark(mColor) ? Color.WHITE : Color.BLACK);
+            if (mOutlineColor != -1) {
+                mask.setStroke(mOutlineWidth, mOutlineColor);
+            }
+            else {
+                mask.setStroke(mOutlineWidth, ColorUtil.isColorDark(mColor) ? Color.WHITE : Color.BLACK);
+            }
         }
         mask.setColor(mColor);
         return mask;

spectrum/src/main/java/com/thebluealliance/spectrum/internal/SpectrumPreferenceDialogFragmentCompat.java

@@ -54,6 +54,7 @@ protected void onBindDialogView(View view) {
         mColorPalette.setColors(getSpectrumPreference().getColors());
         mColorPalette.setSelectedColor(mCurrentValue);
         mColorPalette.setOutlineWidth(getSpectrumPreference().getOutlineWidth());
+        mColorPalette.setOutlineColor(getSpectrumPreference().getOutlineColor());
         mColorPalette.setFixedColumnCount(getSpectrumPreference().getFixedColumnCount());
         mColorPalette.setOnColorSelectedListener(new SpectrumPalette.OnColorSelectedListener() {
             @Override

spectrum/src/main/res/values/attrs.xml

@@ -2,19 +2,22 @@
 <resources>
     <attr name="spectrum_colors" format="reference" />
     <attr name="spectrum_outlineWidth" format="dimension" />
+    <attr name="spectrum_outlineColor" format="color" />
     <attr name="spectrum_columnCount" format="integer" />
 
     <declare-styleable name="SpectrumPalette">
         <attr name="spectrum_colors" />
         <attr name="spectrum_outlineWidth" />
+        <attr name="spectrum_outlineColor" />
         <attr name="spectrum_columnCount" />
         <attr name="spectrum_autoPadding" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="SpectrumPreference">
         <attr name="spectrum_colors" />
         <attr name="spectrum_outlineWidth" />
+        <attr name="spectrum_outlineColor" />
         <attr name="spectrum_columnCount" />
         <attr name="spectrum_closeOnSelected" format="boolean" />
     </declare-styleable>
-</resources>
+</resources>