修正部分 Layout 继承关系不正确的问题

getActivity · Jul 20, 2021 · 59c3420 · 59c3420
1 parent 4b05609
commit 59c3420
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 * 项目地址：[Github](https://github.com/getActivity/ShapeView)、[码云](https://gitee.com/getActivity/ShapeView)
 
+* 博客介绍：[震惊，没想到 Shape 也可以这么写](https://www.jianshu.com/p/1288d8873440)
+
 * 点击此处 [下载 Demo](ShapeView.apk) 进行演示或者测试
 
 #### 集成步骤
@@ -34,7 +36,7 @@ android {
 
 dependencies {
     // Shape 框架：https://github.com/getActivity/ShapeView
-    implementation 'com.github.getActivity:ShapeView:2.0'
+    implementation 'com.github.getActivity:ShapeView:2.2'
 }
 ```
 

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 20
-        versionName "2.0"
+        versionCode 22
+        versionName "2.2"
 
         // 支持 Java JDK 8
         compileOptions {

diff --git a/library/build.gradle b/library/build.gradle
@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        versionCode 20
-        versionName "2.0"
+        versionCode 22
+        versionName "2.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
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.support.constraint.ConstraintLayout;
 import android.util.AttributeSet;
-import android.view.View;
 
 import com.hjq.shape.IShapeDrawable;
 import com.hjq.shape.R;
@@ -14,7 +14,7 @@
  *    time   : 2021/07/17
  *    desc   : 支持直接定义 Shape 背景的 ConstraintLayout
  */
-public class ShapeConstraintLayout extends View implements IShapeDrawable<ShapeConstraintLayout> {
+public class ShapeConstraintLayout extends ConstraintLayout implements IShapeDrawable<ShapeConstraintLayout> {
 
     private int mShape;
     private int mShapeWidth;

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeFrameLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeFrameLayout.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.view.View;
+import android.widget.FrameLayout;
 
 import com.hjq.shape.IShapeDrawable;
 import com.hjq.shape.R;
@@ -14,7 +14,7 @@
  *    time   : 2021/07/17
  *    desc   : 支持直接定义 Shape 背景的 FrameLayout
  */
-public class ShapeFrameLayout extends View implements IShapeDrawable<ShapeFrameLayout> {
+public class ShapeFrameLayout extends FrameLayout implements IShapeDrawable<ShapeFrameLayout> {
 
     private int mShape;
     private int mShapeWidth;

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeLinearLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeLinearLayout.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.view.View;
+import android.widget.LinearLayout;
 
 import com.hjq.shape.IShapeDrawable;
 import com.hjq.shape.R;
@@ -14,7 +14,7 @@
  *    time   : 2021/07/17
  *    desc   : 支持直接定义 Shape 背景的 LinearLayout
  */
-public class ShapeLinearLayout extends View implements IShapeDrawable<ShapeLinearLayout> {
+public class ShapeLinearLayout extends LinearLayout implements IShapeDrawable<ShapeLinearLayout> {
 
     private int mShape;
     private int mShapeWidth;

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeRecyclerView.java b/library/src/main/java/com/hjq/shape/layout/ShapeRecyclerView.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
-import android.view.View;
 
 import com.hjq.shape.IShapeDrawable;
 import com.hjq.shape.R;
@@ -14,7 +14,7 @@
  *    time   : 2021/07/17
  *    desc   : 支持直接定义 Shape 背景的 RecyclerView
  */
-public class ShapeRecyclerView extends View implements IShapeDrawable<ShapeRecyclerView> {
+public class ShapeRecyclerView extends RecyclerView implements IShapeDrawable<ShapeRecyclerView> {
 
     private int mShape;
     private int mShapeWidth;

diff --git a/library/src/main/java/com/hjq/shape/layout/ShapeRelativeLayout.java b/library/src/main/java/com/hjq/shape/layout/ShapeRelativeLayout.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.view.View;
+import android.widget.RelativeLayout;
 
 import com.hjq.shape.IShapeDrawable;
 import com.hjq.shape.R;
@@ -14,7 +14,7 @@
  *    time   : 2021/07/17
  *    desc   : 支持直接定义 Shape 背景的 RelativeLayout
  */
-public class ShapeRelativeLayout extends View implements IShapeDrawable<ShapeRelativeLayout> {
+public class ShapeRelativeLayout extends RelativeLayout implements IShapeDrawable<ShapeRelativeLayout> {
 
     private int mShape;
     private int mShapeWidth;