update 1.7.4

JavaNoober · Mar 24, 2022 · c64b686 · c64b686
1 parent 4bce007
commit c64b686
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/BackgroundLibrary.xml b/BackgroundLibrary.xml
@@ -797,6 +797,12 @@
       <option name="XML" value="true" />
     </context>
   </template>
+  <template name="bl_padding_bottom" value="app:bl_padding_bottom=&quot;$value$&quot;" description="paddingBottom属性" toReformat="true" toShortenFQNames="true">
+    <variable name="value" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="XML" value="true" />
+    </context>
+  </template>
   <template name="bl_padding_right" value="app:bl_padding_right=&quot;$value$&quot;" description="paddingRight属性" toReformat="true" toShortenFQNames="true">
     <variable name="value" expression="" defaultValue="" alwaysStopAt="true" />
     <context>

diff --git a/README-EN.md b/README-EN.md
@@ -14,7 +14,7 @@ Add this to your app's build.gradle：
     }
 
     implementation "androidx.appcompat:appcompat:$supportVersion"
-    implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.3'
+    implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.4'
 
 if use androidx：  
 
@@ -26,7 +26,7 @@ if use androidx：
     }
 
     implementation "androidx.appcompat:appcompat:$supportVersion"
-    implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.3'
+    implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.4'
 
 
 ## Example effect

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ issue回复不及时，可以添加qq群887686934
     }
 
     implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.3'
+    implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.4'
 
 如果项目使用了androidx：  
 
@@ -31,7 +31,7 @@ issue回复不及时，可以添加qq群887686934
     }
 
     implementation "androidx.appcompat:appcompat:$supportVersion" 
-    implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.3'
+    implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.4'
 
 
 ## 使用文档

diff --git a/library/src/main/java/com/noober/background/BackgroundFactory.java b/library/src/main/java/com/noober/background/BackgroundFactory.java
@@ -112,16 +112,16 @@ private static View setViewBackground(String name, Context context, AttributeSet
             GradientDrawable drawable = null;
             StateListDrawable stateListDrawable = null;
             if (buttonTa.getIndexCount() > 0 && view instanceof CompoundButton) {
-                view.setClickable(true);
+                //view.setClickable(true);
                 ((CompoundButton) view).setButtonDrawable(DrawableFactory.getButtonDrawable(typedArray, buttonTa));
             } else if (selectorTa.getIndexCount() > 0) {
                 stateListDrawable = DrawableFactory.getSelectorDrawable(typedArray, selectorTa);
-                view.setClickable(true);
+                //view.setClickable(true);
                 setDrawable(stateListDrawable, view, otherTa, typedArray);
             } else if (pressTa.getIndexCount() > 0) {
                 drawable = DrawableFactory.getDrawable(typedArray);
                 stateListDrawable = DrawableFactory.getPressDrawable(drawable, typedArray, pressTa);
-                view.setClickable(true);
+                //view.setClickable(true);
                 setDrawable(stateListDrawable, view, otherTa, typedArray);
             } else if (multiSelTa.getIndexCount() > 0) {
                 stateListDrawable = DrawableFactory.getMultiSelectorDrawable(context, multiSelTa, typedArray);
@@ -159,15 +159,15 @@ private static View setViewBackground(String name, Context context, AttributeSet
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     Drawable contentDrawable = (stateListDrawable == null ? drawable : stateListDrawable);
                     RippleDrawable rippleDrawable = new RippleDrawable(ColorStateList.valueOf(color), contentDrawable, contentDrawable);
-                    view.setClickable(true);
+                    //view.setClickable(true);
                     setBackground(rippleDrawable, view, typedArray);
                 } else if (stateListDrawable == null) {
                     StateListDrawable tmpDrawable = new StateListDrawable();
                     GradientDrawable unPressDrawable = DrawableFactory.getDrawable(typedArray);
                     unPressDrawable.setColor(color);
                     tmpDrawable.addState(new int[]{-android.R.attr.state_pressed}, drawable);
                     tmpDrawable.addState(new int[]{android.R.attr.state_pressed}, unPressDrawable);
-                    view.setClickable(true);
+                    //view.setClickable(true);
                     setDrawable(tmpDrawable, view, otherTa, typedArray);
                 }
             }

diff --git a/libraryx/src/main/java/com/noober/background/BackgroundFactory.java b/libraryx/src/main/java/com/noober/background/BackgroundFactory.java
@@ -114,16 +114,16 @@ private static View setViewBackground(String name, Context context, AttributeSet
 			GradientDrawable drawable = null;
 			StateListDrawable stateListDrawable = null;
 			if (buttonTa.getIndexCount() > 0 && view instanceof CompoundButton) {
-				view.setClickable(true);
+				//view.setClickable(true);
 				((CompoundButton) view).setButtonDrawable(DrawableFactory.getButtonDrawable(typedArray, buttonTa));
 			} else if (selectorTa.getIndexCount() > 0) {
 				stateListDrawable = DrawableFactory.getSelectorDrawable(typedArray, selectorTa);
-				view.setClickable(true);
+				//view.setClickable(true);
 				setDrawable(stateListDrawable, view, otherTa, typedArray);
 			} else if (pressTa.getIndexCount() > 0) {
 				drawable = DrawableFactory.getDrawable(typedArray);
 				stateListDrawable = DrawableFactory.getPressDrawable(drawable, typedArray, pressTa);
-				view.setClickable(true);
+				//view.setClickable(true);
 				setDrawable(stateListDrawable, view, otherTa, typedArray);
 			} else if (multiSelTa.getIndexCount() > 0) {
 				stateListDrawable = DrawableFactory.getMultiSelectorDrawable(context, multiSelTa, typedArray);
@@ -161,15 +161,15 @@ private static View setViewBackground(String name, Context context, AttributeSet
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 					Drawable contentDrawable = (stateListDrawable == null ? drawable : stateListDrawable);
 					RippleDrawable rippleDrawable = new RippleDrawable(ColorStateList.valueOf(color), contentDrawable, contentDrawable);
-					view.setClickable(true);
+					//view.setClickable(true);
 					setBackground(rippleDrawable, view, typedArray);
 				} else if (stateListDrawable == null) {
 					StateListDrawable tmpDrawable = new StateListDrawable();
 					GradientDrawable unPressDrawable = DrawableFactory.getDrawable(typedArray);
 					unPressDrawable.setColor(color);
 					tmpDrawable.addState(new int[]{-android.R.attr.state_pressed}, drawable);
 					tmpDrawable.addState(new int[]{android.R.attr.state_pressed}, unPressDrawable);
-					view.setClickable(true);
+					//view.setClickable(true);
 					setDrawable(tmpDrawable, view, otherTa, typedArray);
 				}
 			}