修复 Button、CheckBox、EditText、RadioButton 在布局中设置 Shape 没有生效的问题

getActivity · Aug 2, 2021 · c365baa · c365baa
1 parent 0866dc3
commit c365baa
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ android {
 
 dependencies {
     // Shape 框架：https://github.com/getActivity/ShapeView
-    implementation 'com.github.getActivity:ShapeView:3.0'
+    implementation 'com.github.getActivity:ShapeView:3.2'
 }
 ```
 

diff --git a/ShapeView.apk b/ShapeView.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.shape.demo"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 30
-        versionName "3.0"
+        versionCode 32
+        versionName "3.2"
 
         // 支持 Java JDK 8
         compileOptions {

diff --git a/library/build.gradle b/library/build.gradle
@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        versionCode 30
-        versionName "3.0"
+        versionCode 32
+        versionName "3.2"
     }
 
     // 支持 Java JDK 8

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeConstraintLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeConstraintLayout.java
@@ -101,9 +101,7 @@ public ShapeConstraintLayout(Context context, AttributeSet attrs, int defStyleAt
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeFrameLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeFrameLayout.java
@@ -101,9 +101,7 @@ public ShapeFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeLinearLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeLinearLayout.java
@@ -101,9 +101,7 @@ public ShapeLinearLayout(Context context, AttributeSet attrs, int defStyleAttr)
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeRecyclerView.java b/library/src/main/java/com/hjq/shape/layout/ShapeRecyclerView.java
@@ -101,9 +101,7 @@ public ShapeRecyclerView(Context context, AttributeSet attrs, int defStyleAttr)
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeRelativeLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeRelativeLayout.java
@@ -101,9 +101,7 @@ public ShapeRelativeLayout(Context context, AttributeSet attrs, int defStyleAttr
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeButton.java b/library/src/main/java/com/hjq/shape/view/ShapeButton.java
@@ -65,7 +65,7 @@ public ShapeButton(Context context) {
     }
 
     public ShapeButton(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.buttonStyle);
+        this(context, attrs, 0);
     }
 
     public ShapeButton(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -116,10 +116,7 @@ public ShapeButton(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
-
+        intoBackground();
         intoTextColor();
     }
 

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeCheckBox.java b/library/src/main/java/com/hjq/shape/view/ShapeCheckBox.java
@@ -121,10 +121,7 @@ public ShapeCheckBox(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
-
+        intoBackground();
         intoTextColor();
     }
 

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeEditText.java b/library/src/main/java/com/hjq/shape/view/ShapeEditText.java
@@ -115,10 +115,7 @@ public ShapeEditText(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
-
+        intoBackground();
         intoTextColor();
     }
 

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeImageView.java b/library/src/main/java/com/hjq/shape/view/ShapeImageView.java
@@ -101,9 +101,7 @@ public ShapeImageView(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeRadioButton.java b/library/src/main/java/com/hjq/shape/view/ShapeRadioButton.java
@@ -121,10 +121,7 @@ public ShapeRadioButton(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
-
+        intoBackground();
         intoTextColor();
     }
 

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeTextView.java b/library/src/main/java/com/hjq/shape/view/ShapeTextView.java
@@ -115,10 +115,7 @@ public ShapeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
-
+        intoBackground();
         intoTextColor();
     }
 

diff --git a/library/src/main/java/com/hjq/shape/view/ShapeView.java b/library/src/main/java/com/hjq/shape/view/ShapeView.java
@@ -101,9 +101,7 @@ public ShapeView(Context context, AttributeSet attrs, int defStyleAttr) {
 
         typedArray.recycle();
 
-        if (getBackground() == null) {
-            intoBackground();
-        }
+        intoBackground();
     }
 
     /**