Merge pull request #25 from ChaosLeong/develop

[Release] 1.4.0

Author: ChaosLeung

.github/issue_template.md

@@ -0,0 +1,20 @@
+What kind of issue is this?
+
+ - [ ] Question. If you want to ask how to do something, or to understand why something isn't
+       working the way you expect it to.
+
+ - [ ] Bug report. Please provide your device name, device OS version, and describe the reproduction steps.
+
+ - [ ] Feature Request. Telling us what problem you’re trying to solve.
+
+##### Info:
+
+ * PinView version:
+ * Device OS version:
+ * Device Name:
+
+##### Description:
+
+##### Reproduction Steps:
+
+##### What did I do:

README.md

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-   compile 'com.chaos.view:pinview:1.3.2'
+   compile 'com.chaos.view:pinview:1.4.0'
 }
 ```
 
@@ -56,7 +56,7 @@ Add PinView in your layout.
 #### Java
 
 ``` Java
-PinView pinView = (PinView) findViewById(R.id.secondPinView);
+final PinView pinView = findViewById(R.id.secondPinView);
 pinView.setTextColor(
         ResourcesCompat.getColor(getResources(), R.color.colorAccent, getTheme()));
 pinView.setTextColor(
@@ -77,6 +77,9 @@ pinView.setCursorColor(
         ResourcesCompat.getColor(getResources(), R.color.line_selected, getTheme()));
 pinView.setCursorWidth(getResources().getDimensionPixelSize(R.dimen.pv_pin_view_cursor_width));
 pinView.addTextChangedListener(new TextWatcher() {...});
+pinView.setItemBackgroundColor(Color.BLACK);
+pinView.setItemBackground(getResources().getDrawable(R.drawable.item_background));
+pinView.setItemBackgroundResources(R.drawable.item_background);
 ```
 
 ### Step 2:
@@ -102,7 +105,7 @@ or use the `PinWidget.PinView` style.
 
 ### Step 3 (Optional):
 
-To highlight current item,
+To highlight current item, use 'selected' state, in other words,
 
 add `android:state_selected="true"` to `app:lineColor`
 
@@ -125,9 +128,10 @@ or add `android:cursorVisible="true"`.
 * **itemSpacing**, the spacing between two items.
 * **lineWidth**, the line (border) width.
 * **lineColor**, the line (border) colors.
-* **viewType**, the view type of PinView, currently this will be one of `rectangle` or `line`.
+* **viewType**, the view type of PinView, currently this will be one of `rectangle`, `line` or `none`.
 * **cursorColor**, the cursor color.
 * **cursorWidth**, the width of cursor.
+* **itemBackground**, the item background.
 
 ## Thanks
 
@@ -136,7 +140,7 @@ or add `android:cursorVisible="true"`.
 ## License
 
 
-    Copyright 2017 Chaos Leong
+    Copyright 2017-2018 Chaos Leong
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

pinview/publish.gradle

@@ -6,7 +6,7 @@ def issueUrl = 'https://github.com/ChaosLeong/PinView/issues'
 def gitUrl = '[email protected]:ChaosLeong/PinView.git'
 
 group = "com.chaos.view"
-version = "1.3.2"
+version = "1.4.0"
 
 install {
     repositories.mavenInstaller {

pinview/src/main/java/com/chaos/view/PinView.java

@@ -28,9 +28,14 @@
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.Px;
+import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.InputFilter;
@@ -60,8 +65,12 @@ public class PinView extends AppCompatEditText {
 
     private static final InputFilter[] NO_FILTERS = new InputFilter[0];
 
+    private static final int[] HIGHLIGHT_STATES = new int[]{
+            android.R.attr.state_selected};
+
     private static final int VIEW_TYPE_RECTANGLE = 0;
     private static final int VIEW_TYPE_LINE = 1;
+    private static final int VIEW_TYPE_NONE = 2;
 
     private int mViewType;
 
@@ -73,8 +82,7 @@ public class PinView extends AppCompatEditText {
     private int mPinItemSpacing;
 
     private final Paint mPaint;
-    private final TextPaint mTextPaint;
-    private final Paint mAnimatorTextPaint;
+    private final TextPaint mAnimatorTextPaint = new TextPaint();
 
     private ColorStateList mLineColor;
     private int mCurLineColor = Color.BLACK;
@@ -96,6 +104,9 @@ public class PinView extends AppCompatEditText {
     private int mCursorWidth;
     private int mCursorColor;
 
+    private int mItemBackgroundResource;
+    private Drawable mItemBackground;
+
     public PinView(Context context) {
         this(context, null);
     }
@@ -112,12 +123,7 @@ public PinView(Context context, @Nullable AttributeSet attrs, int defStyleAttr)
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mPaint.setStyle(Paint.Style.STROKE);
 
-        mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
-        mTextPaint.density = res.getDisplayMetrics().density;
-        mTextPaint.setStyle(Paint.Style.FILL);
-        mTextPaint.setTextSize(getTextSize());
-
-        mAnimatorTextPaint = new TextPaint(mTextPaint);
+        mAnimatorTextPaint.set(getPaint());
 
         final Resources.Theme theme = context.getTheme();
 
@@ -140,6 +146,8 @@ public PinView(Context context, @Nullable AttributeSet attrs, int defStyleAttr)
         mCursorWidth = a.getDimensionPixelSize(R.styleable.PinView_cursorWidth,
                 res.getDimensionPixelSize(R.dimen.pv_pin_view_cursor_width));
 
+        mItemBackground = a.getDrawable(R.styleable.PinView_itemBackground);
+
         a.recycle();
 
         if (mLineColor != null) {
@@ -157,6 +165,19 @@ public PinView(Context context, @Nullable AttributeSet attrs, int defStyleAttr)
         setTextIsSelectable(false);
     }
 
+    @Override
+    public void setTypeface(Typeface tf, int style) {
+        super.setTypeface(tf, style);
+    }
+
+    @Override
+    public void setTypeface(Typeface tf) {
+        super.setTypeface(tf);
+        if (mAnimatorTextPaint != null) {
+            mAnimatorTextPaint.set(getPaint());
+        }
+    }
+
     private void setMaxLength(int maxLength) {
         if (maxLength >= 0) {
             setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
@@ -187,10 +208,11 @@ private void checkItemRadius() {
             if (mPinItemRadius > halfOfLineWidth) {
                 throw new IllegalArgumentException("The itemRadius can not be greater than lineWidth when viewType is line");
             }
-        }
-        float halfOfItemWidth = ((float) mPinItemWidth) / 2;
-        if (mPinItemRadius > halfOfItemWidth) {
-            throw new IllegalArgumentException("The itemRadius can not be greater than itemWidth");
+        } else if (mViewType == VIEW_TYPE_RECTANGLE) {
+            float halfOfItemWidth = ((float) mPinItemWidth) / 2;
+            if (mPinItemRadius > halfOfItemWidth) {
+                throw new IllegalArgumentException("The itemRadius can not be greater than itemWidth");
+            }
         }
     }
 
@@ -292,17 +314,25 @@ private void updatePaints() {
         mPaint.setColor(mCurLineColor);
         mPaint.setStyle(Paint.Style.STROKE);
         mPaint.setStrokeWidth(mLineWidth);
-        mTextPaint.setColor(getCurrentTextColor());
+        getPaint().setColor(getCurrentTextColor());
     }
 
     private void drawPinView(Canvas canvas) {
         for (int i = 0; i < mPinItemCount; i++) {
             updateItemRectF(i);
             updateCenterPoint();
 
+            canvas.save();
+            if (mViewType == VIEW_TYPE_RECTANGLE) {
+                updatePinBoxPath(i);
+                canvas.clipPath(mPath);
+            }
+            drawItemBackground(canvas, false);
+            canvas.restore();
+
             if (mViewType == VIEW_TYPE_RECTANGLE) {
                 drawPinBox(canvas, i);
-            } else {
+            } else if (mViewType == VIEW_TYPE_LINE) {
                 drawPinLine(canvas, i);
             }
 
@@ -327,13 +357,21 @@ private void drawPinView(Canvas canvas) {
             updateItemRectF(index);
             updateCenterPoint();
 
-            mPaint.setColor(getLineColorForState(android.R.attr.state_selected));
+            canvas.save();
+            if (mViewType == VIEW_TYPE_RECTANGLE) {
+                updatePinBoxPath(index);
+                canvas.clipPath(mPath);
+            }
+            drawItemBackground(canvas, true);
+            canvas.restore();
+
+            mPaint.setColor(getLineColorForState(HIGHLIGHT_STATES));
 
             drawCursor(canvas);
 
             if (mViewType == VIEW_TYPE_RECTANGLE) {
                 drawPinBox(canvas, index);
-            } else {
+            } else if (mViewType == VIEW_TYPE_LINE) {
                 drawPinLine(canvas, index);
             }
         }
@@ -343,7 +381,22 @@ private int getLineColorForState(int... states) {
         return mLineColor != null ? mLineColor.getColorForState(states, mCurLineColor) : mCurLineColor;
     }
 
-    private void drawPinBox(Canvas canvas, int i) {
+    private void drawItemBackground(Canvas canvas, boolean highlight) {
+        if (mItemBackground == null) {
+            return;
+        }
+        float delta = (float) mLineWidth / 2;
+        int left = Math.round(mItemBorderRect.left - delta);
+        int top = Math.round(mItemBorderRect.top - delta);
+        int right = Math.round(mItemBorderRect.right + delta);
+        int bottom = Math.round(mItemBorderRect.bottom + delta);
+
+        mItemBackground.setBounds(left, top, right, bottom);
+        mItemBackground.setState(highlight ? HIGHLIGHT_STATES : getDrawableState());
+        mItemBackground.draw(canvas);
+    }
+
+    private void updatePinBoxPath(int i) {
         boolean drawRightCorner = false;
         boolean drawLeftCorner = false;
         if (mPinItemSpacing != 0) {
@@ -357,6 +410,10 @@ private void drawPinBox(Canvas canvas, int i) {
             }
         }
         updateRoundRectPath(mItemBorderRect, mPinItemRadius, mPinItemRadius, drawLeftCorner, drawRightCorner);
+    }
+
+    private void drawPinBox(Canvas canvas, int i) {
+//        updatePinBoxPath(canvas, i);
         canvas.drawPath(mPath, mPaint);
     }
 
@@ -378,7 +435,11 @@ private void drawPinLine(Canvas canvas, int i) {
         mPaint.setStyle(Paint.Style.FILL);
         mPaint.setStrokeWidth(((float) mLineWidth) / 10);
         float halfLineWidth = ((float) mLineWidth) / 2;
-        mItemLineRect.set(mItemBorderRect.left, mItemBorderRect.bottom - halfLineWidth, mItemBorderRect.right, mItemBorderRect.bottom + halfLineWidth);
+        mItemLineRect.set(
+                mItemBorderRect.left - halfLineWidth,
+                mItemBorderRect.bottom - halfLineWidth,
+                mItemBorderRect.right + halfLineWidth,
+                mItemBorderRect.bottom + halfLineWidth);
 
         updateRoundRectPath(mItemLineRect, mPinItemRadius, mPinItemRadius, l, r);
         canvas.drawPath(mPath, mPaint);
@@ -511,10 +572,10 @@ private void drawCircle(Canvas canvas, int i) {
 
     private Paint getPaintByIndex(int i) {
         if (isAnimationEnable && i == getText().length() - 1) {
-            mAnimatorTextPaint.setColor(mTextPaint.getColor());
+            mAnimatorTextPaint.setColor(getPaint().getColor());
             return mAnimatorTextPaint;
         } else {
-            return mTextPaint;
+            return getPaint();
         }
     }
 
@@ -780,7 +841,7 @@ public void setTextSize(int unit, float size) {
         updateCursorHeight();
     }
 
-    //region Cursor
+    //region Cursorint
 
     /**
      * Sets the width (in pixels) of cursor.
@@ -829,6 +890,48 @@ public int getCursorColor() {
         return mCursorColor;
     }
 
+    /**
+     * Set the item background to a given resource. The resource should refer to
+     * a Drawable object or 0 to remove the item background.
+     *
+     * @param resId The identifier of the resource.
+     * @attr ref R.styleable#PinView_itemBackground
+     */
+    public void setItemBackgroundResources(@DrawableRes int resId) {
+        if (resId != 0 && mItemBackgroundResource != resId) {
+            return;
+        }
+        mItemBackground = ResourcesCompat.getDrawable(getResources(), resId, getContext().getTheme());
+        setItemBackground(mItemBackground);
+        mItemBackgroundResource = resId;
+    }
+
+    /**
+     * Sets the item background color for this view.
+     *
+     * @param color the color of the item background
+     */
+    public void setItemBackgroundColor(@ColorInt int color) {
+        if (mItemBackground instanceof ColorDrawable) {
+            ((ColorDrawable) mItemBackground.mutate()).setColor(color);
+            mItemBackgroundResource = 0;
+        } else {
+            setItemBackground(new ColorDrawable(color));
+        }
+    }
+
+    /**
+     * Set the item background to a given Drawable, or remove the background.
+     *
+     * @param background The Drawable to use as the item background, or null to remove the
+     *                   item background
+     */
+    public void setItemBackground(Drawable background) {
+        mItemBackgroundResource = 0;
+        mItemBackground = background;
+        invalidate();
+    }
+
     @Override
     public void setCursorVisible(boolean visible) {
         if (isCursorVisible != visible) {

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

@@ -31,9 +31,11 @@
         <attr name="viewType" format="enum">
             <enum name="rectangle" value="0" />
             <enum name="line" value="1" />
+            <enum name="none" value="2" />
         </attr>
         <attr name="android:cursorVisible" />
         <attr name="cursorWidth" format="dimension" />
         <attr name="cursorColor" format="reference|color" />
+        <attr name="itemBackground" format="reference|color" />
     </declare-styleable>
 </resources>

simple/src/main/java/com/chaos/view/example/MainActivity.java

@@ -17,6 +17,7 @@
 package com.chaos.view.example;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v7.app.AppCompatActivity;
@@ -73,6 +74,9 @@ public void afterTextChanged(Editable s) {
 
             }
         });
+        pinView.setItemBackgroundColor(Color.BLACK);
+        pinView.setItemBackground(getResources().getDrawable(R.drawable.item_background));
+        pinView.setItemBackgroundResources(R.drawable.item_background);
     }
 
     @Override