Merge pull request #19 from ChaosLeong/develop

[Release] 1.3.2

Author: ChaosLeung

README.md

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-   compile 'com.chaos.view:pinview:1.3.1'
+   compile 'com.chaos.view:pinview:1.3.2'
 }
 ```
 

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.1"
+version = "1.3.2"
 
 install {
     repositories.mavenInstaller {

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

@@ -46,7 +46,7 @@
  * Provides a widget for enter PIN/OTP/password etc.
  *
  * @author Chaos Leong
- *         01/04/2017
+ * 01/04/2017
  */
 public class PinView extends AppCompatEditText {
 
@@ -67,8 +67,8 @@ public class PinView extends AppCompatEditText {
 
     private int mPinItemCount;
 
-    private float mPinItemWidth;
-    private float mPinItemHeight;
+    private int mPinItemWidth;
+    private int mPinItemHeight;
     private int mPinItemRadius;
     private int mPinItemSpacing;
 
@@ -125,14 +125,14 @@ public PinView(Context context, @Nullable AttributeSet attrs, int defStyleAttr)
 
         mViewType = a.getInt(R.styleable.PinView_viewType, VIEW_TYPE_RECTANGLE);
         mPinItemCount = a.getInt(R.styleable.PinView_itemCount, DEFAULT_COUNT);
-        mPinItemHeight = a.getDimensionPixelSize(R.styleable.PinView_itemHeight,
+        mPinItemHeight = (int) a.getDimension(R.styleable.PinView_itemHeight,
                 res.getDimensionPixelSize(R.dimen.pv_pin_view_item_size));
-        mPinItemWidth = a.getDimensionPixelSize(R.styleable.PinView_itemWidth,
+        mPinItemWidth = (int) a.getDimension(R.styleable.PinView_itemWidth,
                 res.getDimensionPixelSize(R.dimen.pv_pin_view_item_size));
         mPinItemSpacing = a.getDimensionPixelSize(R.styleable.PinView_itemSpacing,
                 res.getDimensionPixelSize(R.dimen.pv_pin_view_item_spacing));
-        mPinItemRadius = a.getDimensionPixelSize(R.styleable.PinView_itemRadius, 0);
-        mLineWidth = a.getDimensionPixelSize(R.styleable.PinView_lineWidth,
+        mPinItemRadius = (int) a.getDimension(R.styleable.PinView_itemRadius, 0);
+        mLineWidth = (int) a.getDimension(R.styleable.PinView_lineWidth,
                 res.getDimensionPixelSize(R.dimen.pv_pin_view_item_line_width));
         mLineColor = a.getColorStateList(R.styleable.PinView_lineColor);
         isCursorVisible = a.getBoolean(R.styleable.PinView_android_cursorVisible, true);
@@ -183,14 +183,14 @@ public void onAnimationUpdate(ValueAnimator animation) {
 
     private void checkItemRadius() {
         if (mViewType == VIEW_TYPE_LINE) {
-            int halfOfLineWidth = mLineWidth / 2;
+            float halfOfLineWidth = ((float) mLineWidth) / 2;
             if (mPinItemRadius > halfOfLineWidth) {
-                throw new RuntimeException("The itemRadius can not be greater than lineWidth when viewType is line");
+                throw new IllegalArgumentException("The itemRadius can not be greater than lineWidth when viewType is line");
             }
         }
-        int halfOfItemWidth = (int) (mPinItemWidth / 2);
+        float halfOfItemWidth = ((float) mPinItemWidth) / 2;
         if (mPinItemRadius > halfOfItemWidth) {
-            throw new RuntimeException("The itemRadius can not be greater than itemWidth");
+            throw new IllegalArgumentException("The itemRadius can not be greater than itemWidth");
         }
     }
 
@@ -204,14 +204,14 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int width;
         int height;
 
-        float boxHeight = mPinItemHeight;
+        int boxHeight = mPinItemHeight;
 
         if (widthMode == MeasureSpec.EXACTLY) {
             // Parent has told us how big to be. So be it.
             width = widthSize;
         } else {
-            float boxesWidth = (mPinItemCount - 1) * mPinItemSpacing + mPinItemCount * mPinItemWidth;
-            width = Math.round(boxesWidth + ViewCompat.getPaddingEnd(this) + ViewCompat.getPaddingStart(this));
+            int boxesWidth = (mPinItemCount - 1) * mPinItemSpacing + mPinItemCount * mPinItemWidth;
+            width = boxesWidth + ViewCompat.getPaddingEnd(this) + ViewCompat.getPaddingStart(this);
             if (mPinItemSpacing == 0) {
                 width -= (mPinItemCount - 1) * mLineWidth;
             }
@@ -221,7 +221,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             // Parent has told us how big to be. So be it.
             height = heightSize;
         } else {
-            height = Math.round(boxHeight + getPaddingTop() + getPaddingBottom());
+            height = boxHeight + getPaddingTop() + getPaddingBottom();
         }
 
         setMeasuredDimension(width, height);
@@ -377,7 +377,7 @@ private void drawPinLine(Canvas canvas, int i) {
         }
         mPaint.setStyle(Paint.Style.FILL);
         mPaint.setStrokeWidth(((float) mLineWidth) / 10);
-        float halfLineWidth = (float) mLineWidth / 2;
+        float halfLineWidth = ((float) mLineWidth) / 2;
         mItemLineRect.set(mItemBorderRect.left, mItemBorderRect.bottom - halfLineWidth, mItemBorderRect.right, mItemBorderRect.bottom + halfLineWidth);
 
         updateRoundRectPath(mItemLineRect, mPinItemRadius, mPinItemRadius, l, r);
@@ -464,7 +464,7 @@ private void updateRoundRectPath(RectF rectF, float rx, float ry,
     }
 
     private void updateItemRectF(int i) {
-        float halfLineWidth = (float) mLineWidth / 2;
+        float halfLineWidth = ((float) mLineWidth) / 2;
         float left = getScrollX() + ViewCompat.getPaddingStart(this) + i * (mPinItemSpacing + mPinItemWidth) + halfLineWidth;
         if (mPinItemSpacing == 0 && i > 0) {
             left = left - (mLineWidth) * i;
@@ -497,8 +497,8 @@ private void drawTextAtBox(Canvas canvas, Paint paint, CharSequence text, int ch
         paint.getTextBounds(text.toString(), charAt, charAt + 1, mTextRect);
         float cx = mItemCenterPoint.x;
         float cy = mItemCenterPoint.y;
-        float x = cx - Math.abs(mTextRect.width()) / 2 - mTextRect.left;
-        float y = cy + Math.abs(mTextRect.height()) / 2 - mTextRect.bottom;// always center vertical
+        float x = cx - Math.abs((float) mTextRect.width()) / 2 - mTextRect.left;
+        float y = cy + Math.abs((float) mTextRect.height()) / 2 - mTextRect.bottom;// always center vertical
         canvas.drawText(text, charAt, charAt + 1, x, y, paint);
     }
 
@@ -654,7 +654,6 @@ public void setLineWidth(@Px int borderWidth) {
      * @return Returns the width of the item's line.
      * @see #setLineWidth(int)
      */
-    @Px
     public int getLineWidth() {
         return mLineWidth;
     }
@@ -695,7 +694,6 @@ public void setItemRadius(@Px int itemRadius) {
      * @return Returns the radius of square.
      * @see #setItemRadius(int)
      */
-    @Px
     public int getItemRadius() {
         return mPinItemRadius;
     }
@@ -726,17 +724,17 @@ public int getItemSpacing() {
      * @attr ref R.styleable#PinView_itemHeight
      * @see #getItemHeight()
      */
-    public void setItemHeight(float itemHeight) {
+    public void setItemHeight(@Px int itemHeight) {
         mPinItemHeight = itemHeight;
         updateCursorHeight();
         requestLayout();
     }
 
     /**
      * @return Returns the height of item.
-     * @see #setItemHeight(float)
+     * @see #setItemHeight(int)
      */
-    public float getItemHeight() {
+    public int getItemHeight() {
         return mPinItemHeight;
     }
 
@@ -746,17 +744,17 @@ public float getItemHeight() {
      * @attr ref R.styleable#PinView_itemWidth
      * @see #getItemWidth()
      */
-    public void setItemWidth(float itemWidth) {
+    public void setItemWidth(@Px int itemWidth) {
         mPinItemWidth = itemWidth;
         checkItemRadius();
         requestLayout();
     }
 
     /**
      * @return Returns the width of item.
-     * @see #setItemWidth(float)
+     * @see #setItemWidth(int)
      */
-    public float getItemWidth() {
+    public int getItemWidth() {
         return mPinItemWidth;
     }