代码优化[issues/164](#164)

lygttpod · May 13, 2021 · e17a761 · e17a761
1 parent e363a3f
commit e17a761
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/SuperButton_Readme.md b/SuperButton_Readme.md
@@ -100,8 +100,8 @@ sSizeWidth | dimension  | shape的SizeWidth | 默认0dp
 sSizeHeight | dimension  | shape的SizeHeight | 默认0dp
 sGradientOrientation | enum  | 设置渐变类型<br>TOP_BOTTOM<br>TR_BL<br>RIGHT_LEFT<br>BR_TL<br>BOTTOM_TOP<br>BL_TR<br>LEFT_RIGHT<br>TL_BR | 默认rectangle
 sGradientType | enum  | 设置渐变类型<br>linear<br>radial<br>sweep | 默认rectangle
-sGradientCenterX | dimension  | shape的CenterX | 默认0dp
-sGradientCenterY | dimension  | shape的CenterY | 默认0dp
+sGradientCenterX | float  | shape的CenterX | 默认0f
+sGradientCenterY | float  | shape的CenterY | 默认0f
 sGradientGradientRadius | dimension  | shape的GradientRadius | 默认0dp
 sGradientStartColor | color  | shape的StartColor |
 sGradientCenterColor | color  | shape的CenterColor |

diff --git a/library/src/main/java/com/allen/library/SuperButton.java b/library/src/main/java/com/allen/library/SuperButton.java
@@ -50,8 +50,8 @@ public class SuperButton extends AppCompatButton {
     private int sizeHeight;
 
     private int gradientAngle;
-    private int gradientCenterX;
-    private int gradientCenterY;
+    private float gradientCenterX;
+    private float gradientCenterY;
     private int gradientGradientRadius;
 
     private int gradientStartColor;
@@ -149,8 +149,8 @@ private void getAttr(AttributeSet attrs) {
         sizeHeight = typedArray.getDimensionPixelSize(R.styleable.SuperButton_sSizeHeight, dip2px(mContext, 48));
 
         gradientAngle = (int) typedArray.getFloat(R.styleable.SuperButton_sGradientAngle, -1);
-        gradientCenterX = typedArray.getDimensionPixelSize(R.styleable.SuperButton_sGradientCenterX, 0);
-        gradientCenterY = typedArray.getDimensionPixelSize(R.styleable.SuperButton_sGradientCenterY, 0);
+        gradientCenterX = typedArray.getFloat(R.styleable.SuperButton_sGradientCenterX, 0f);
+        gradientCenterY = typedArray.getFloat(R.styleable.SuperButton_sGradientCenterY, 0f);
         gradientGradientRadius = typedArray.getDimensionPixelSize(R.styleable.SuperButton_sGradientGradientRadius, 0);
 
         gradientStartColor = typedArray.getColor(R.styleable.SuperButton_sGradientStartColor, -1);
@@ -429,7 +429,7 @@ public SuperButton setShapeGradientAngle(int gradientAngle) {
      * @param gradientCenterX 中心x
      * @return 对象
      */
-    public SuperButton setShapeGradientCenterX(int gradientCenterX) {
+    public SuperButton setShapeGradientCenterX(float gradientCenterX) {
         this.shapeBuilder.setShapeGradientCenterX(gradientCenterX);
         return this;
     }
@@ -440,7 +440,7 @@ public SuperButton setShapeGradientCenterX(int gradientCenterX) {
      * @param gradientCenterY 中心y
      * @return 对象
      */
-    public SuperButton setShapeGradientCenterY(int gradientCenterY) {
+    public SuperButton setShapeGradientCenterY(float gradientCenterY) {
         this.shapeBuilder.setShapeGradientCenterY(gradientCenterY);
         return this;
     }

diff --git a/library/src/main/java/com/allen/library/data/AttributeSetData.kt b/library/src/main/java/com/allen/library/data/AttributeSetData.kt
@@ -26,8 +26,8 @@ class AttributeSetData {
     var cornersBottomRightRadius = 0.0f
 
     var gradientAngle = -1
-    var gradientCenterX: Int = 0
-    var gradientCenterY: Int = 0
+    var gradientCenterX: Float = 0f
+    var gradientCenterY: Float = 0f
     var gradientGradientRadius: Int = 0
     var gradientStartColor = -1
     var gradientCenterColor = -1

diff --git a/library/src/main/java/com/allen/library/helper/AttributeSetHelper.kt b/library/src/main/java/com/allen/library/helper/AttributeSetHelper.kt
@@ -51,8 +51,8 @@ class AttributeSetHelper {
         attributeSetData.sizeHeight = typedArray.getDimensionPixelSize(R.styleable.ShapeView_shapeSizeHeight, dip2px(context, 48f))
 
         attributeSetData.gradientAngle = typedArray.getFloat(R.styleable.ShapeView_shapeGradientAngle, -1f).toInt()
-        attributeSetData.gradientCenterX = typedArray.getDimensionPixelSize(R.styleable.ShapeView_shapeGradientCenterX, 0)
-        attributeSetData.gradientCenterY = typedArray.getDimensionPixelSize(R.styleable.ShapeView_shapeGradientCenterY, 0)
+        attributeSetData.gradientCenterX = typedArray.getFloat(R.styleable.ShapeView_shapeGradientCenterX, 0f)
+        attributeSetData.gradientCenterY = typedArray.getFloat(R.styleable.ShapeView_shapeGradientCenterY, 0f)
         attributeSetData.gradientGradientRadius = typedArray.getDimensionPixelSize(R.styleable.ShapeView_shapeGradientGradientRadius, 0)
 
         attributeSetData.gradientStartColor = typedArray.getColor(R.styleable.ShapeView_shapeGradientStartColor, -1)

diff --git a/library/src/main/java/com/allen/library/helper/ShapeBuilder.kt b/library/src/main/java/com/allen/library/helper/ShapeBuilder.kt
@@ -95,8 +95,8 @@ class ShapeBuilder {
      * <gradient android:angle="45"/>
      */
     private var shapeGradientAngle: ShapeGradientAngle = ShapeGradientAngle.LEFT_RIGHT
-    private var gradientCenterX: Int = 0
-    private var gradientCenterY: Int = 0
+    private var gradientCenterX: Float = 0f
+    private var gradientCenterY: Float = 0f
     private var gradientGradientRadius: Int = 0
 
     private var gradientStartColor = -1
@@ -230,12 +230,12 @@ class ShapeBuilder {
         return this
     }
 
-    fun setShapeGradientCenterX(gradientCenterX: Int): ShapeBuilder {
+    fun setShapeGradientCenterX(gradientCenterX: Float): ShapeBuilder {
         this.gradientCenterX = gradientCenterX
         return this
     }
 
-    fun setShapeGradientCenterY(gradientCenterY: Int): ShapeBuilder {
+    fun setShapeGradientCenterY(gradientCenterY: Float): ShapeBuilder {
         this.gradientCenterY = gradientCenterY
         return this
     }
@@ -389,8 +389,8 @@ class ShapeBuilder {
                     }
                     ShapeGradientType.SWEEP -> gradientDrawable.gradientType = GradientDrawable.SWEEP_GRADIENT
                 }
-                if (gradientCenterX != 0 || gradientCenterY != 0) {
-                    gradientDrawable.setGradientCenter(gradientCenterX.toFloat(), gradientCenterY.toFloat())
+                if (gradientCenterX != 0f || gradientCenterY != 0f) {
+                    gradientDrawable.setGradientCenter(gradientCenterX, gradientCenterY)
                 }
                 gradientDrawable.useLevel = gradientUseLevel
             }

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -280,8 +280,8 @@
         <attr name="sSizeHeight" format="dimension" />
 
         <attr name="sGradientAngle" format="float" />
-        <attr name="sGradientCenterX" format="dimension" />
-        <attr name="sGradientCenterY" format="dimension" />
+        <attr name="sGradientCenterX" format="float" />
+        <attr name="sGradientCenterY" format="float" />
         <attr name="sGradientGradientRadius" format="dimension" />
         <attr name="sGradientStartColor" format="color" />
         <attr name="sGradientCenterColor" format="color" />
@@ -480,8 +480,8 @@
             <enum name="tl_br" value="315" />
         </attr>
 
-        <attr name="shapeGradientCenterX" format="dimension" />
-        <attr name="shapeGradientCenterY" format="dimension" />
+        <attr name="shapeGradientCenterX" format="float" />
+        <attr name="shapeGradientCenterY" format="float" />
         <attr name="shapeGradientGradientRadius" format="dimension" />
         <attr name="shapeGradientStartColor" format="color" />
         <attr name="shapeGradientCenterColor" format="color" />