1.7.3 新增bl_shape_alpha

JavaNoober · Dec 18, 2021 · 3683cfa · 3683cfa
1 parent af5d5c2
commit 3683cfa
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 2 deletions.
diff --git a/BackgroundLibrary.xml b/BackgroundLibrary.xml
@@ -5,6 +5,12 @@
       <option name="XML" value="true" />
     </context>
   </template>
+  <template name="bl_shape_alpha" value="app:bl_shape_alpha=&quot;$value$&quot;" description="shape透明度" toReformat="false" toShortenFQNames="true">
+    <variable name="value" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="XML" value="true" />
+    </context>
+  </template>
   <template name="bl_solid_color" value="app:bl_solid_color=&quot;$value$&quot;" description="填充颜色" toReformat="true" toShortenFQNames="true">
     <variable name="value" expression="" defaultValue="" alwaysStopAt="true" />
     <context>

diff --git a/library/src/main/java/com/noober/background/BackgroundFactory.java b/library/src/main/java/com/noober/background/BackgroundFactory.java
@@ -301,6 +301,18 @@ private static void setBackground(Drawable drawable, View view, TypedArray typed
             ((LayerDrawable) drawable).setLayerInset(0, (int) leftValue, (int) topValue, (int) rightValue, (int) bottomValue);
         }
 
+        if(typedArray.hasValue(R.styleable.background_bl_shape_alpha)){
+            float alpha = typedArray.getFloat(R.styleable.background_bl_shape_alpha, 0f);
+            if(alpha >= 1){
+                alpha = 255;
+            }else if(alpha <= 0){
+                alpha = 0;
+            }else {
+                alpha = alpha * 255;
+            }
+            drawable.setAlpha((int) alpha);
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             view.setBackground(drawable);
         } else {

diff --git a/library/src/main/java/com/noober/background/drawable/DrawableCreator.java b/library/src/main/java/com/noober/background/drawable/DrawableCreator.java
@@ -139,6 +139,7 @@ public static class Builder {
         private Integer unPressedTextColor;
         private Integer unFocusedTextColor;
         private int textColorCount;
+        private float alpha = -1;
 
         private boolean hasSelectDrawable = false;
 
@@ -150,6 +151,11 @@ public Builder setShape(Shape shape) {
             return this;
         }
 
+        public Builder setShapeAlpha(float alpha) {
+            this.alpha = alpha;
+            return this;
+        }
+
         public Builder setSolidColor(int solidColor) {
             this.solidColor = solidColor;
             return this;
@@ -528,8 +534,19 @@ public Drawable build() {
                     return resultDrawable;
                 }
             }
+            Drawable result = drawable == null ? stateListDrawable : drawable;
 
-            return drawable == null ? stateListDrawable : drawable;
+            if(alpha != -1){
+                if(alpha >= 1){
+                    alpha = 255;
+                }else if(alpha <= 0){
+                    alpha = 0;
+                }else {
+                    alpha = alpha * 255;
+                }
+                result.setAlpha((int) alpha);
+            }
+            return result;
         }
 
         public ColorStateList buildTextColor() {

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -44,6 +44,8 @@
             <enum name="ring" value="3" />
         </attr>
 
+        <attr name="bl_shape_alpha" format="float" />
+
         <attr name="bl_solid_color" format="color" />
 
         <attr name="bl_corners_radius" format="dimension" />

diff --git a/libraryx/src/main/java/com/noober/background/BackgroundFactory.java b/libraryx/src/main/java/com/noober/background/BackgroundFactory.java
@@ -304,6 +304,18 @@ private static void setBackground(Drawable drawable, View view, TypedArray typed
 			((LayerDrawable) drawable).setLayerInset(0, (int) leftValue, (int) topValue, (int) rightValue, (int) bottomValue);
 		}
 
+		if(typedArray.hasValue(R.styleable.background_bl_shape_alpha)){
+			float alpha = typedArray.getFloat(R.styleable.background_bl_shape_alpha, 0f);
+			if(alpha >= 1){
+				alpha = 255;
+			}else if(alpha <= 0){
+				alpha = 0;
+			}else {
+				alpha = alpha * 255;
+			}
+			drawable.setAlpha((int) alpha);
+		}
+
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
 			view.setBackground(drawable);
 		} else {

diff --git a/libraryx/src/main/java/com/noober/background/drawable/DrawableCreator.java b/libraryx/src/main/java/com/noober/background/drawable/DrawableCreator.java
@@ -137,6 +137,7 @@ public static class Builder {
         private Integer unPressedTextColor;
         private Integer unFocusedTextColor;
         private int textColorCount;
+        private float alpha = -1;
 
         private boolean hasSelectDrawable = false;
 
@@ -148,6 +149,11 @@ public Builder setShape(Shape shape) {
             return this;
         }
 
+        public Builder setShapeAlpha(float alpha) {
+            this.alpha = alpha;
+            return this;
+        }
+
         public Builder setSolidColor(int solidColor) {
             this.solidColor = solidColor;
             return this;
@@ -527,7 +533,19 @@ public Drawable build() {
                 }
             }
 
-            return drawable == null ? stateListDrawable : drawable;
+            Drawable result = drawable == null ? stateListDrawable : drawable;
+
+            if(alpha != -1){
+                if(alpha >= 1){
+                    alpha = 255;
+                }else if(alpha <= 0){
+                    alpha = 0;
+                }else {
+                    alpha = alpha * 255;
+                }
+                result.setAlpha((int) alpha);
+            }
+            return result;
         }
 
         public ColorStateList buildTextColor() {

diff --git a/libraryx/src/main/res/values/attrs.xml b/libraryx/src/main/res/values/attrs.xml
@@ -9,6 +9,8 @@
             <enum name="ring" value="3" />
         </attr>
 
+        <attr name="bl_shape_alpha" format="float" />
+
         <attr name="bl_solid_color" format="color" />
 
         <attr name="bl_corners_radius" format="dimension" />