From 88466f714134c79567487294db6e931d4ca8874f Mon Sep 17 00:00:00 2001
From: pichs <sywubo789@163.com>
Date: Thu, 4 Mar 2021 22:55:43 +0800
Subject: [PATCH] XCheckBox

---
 app/build.gradle                              |   1 +
 .../com/pichs/app/xwidget/MainActivity.java   |  28 ++
 app/src/main/res/layout/activity_main.xml     |  55 +++-
 .../common/widget/checkbox/XCheckBox.java     | 115 ++++++++
 .../common/widget/input/InputLayout.java      |  53 ++--
 .../common/widget/utils/XGradientHelper.java  | 245 ++----------------
 widget/src/main/res/values/attrs.xml          |   7 +
 7 files changed, 233 insertions(+), 271 deletions(-)
 create mode 100644 widget/src/main/java/com/pichs/common/widget/checkbox/XCheckBox.java

diff --git a/app/build.gradle b/app/build.gradle
index 333860f..07c23d9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,4 +38,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation project(':widget')
+    implementation 'com.github.xujiaji:ripple-checkbox:0.0.5'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/pichs/app/xwidget/MainActivity.java b/app/src/main/java/com/pichs/app/xwidget/MainActivity.java
index 04054e9..9e23336 100644
--- a/app/src/main/java/com/pichs/app/xwidget/MainActivity.java
+++ b/app/src/main/java/com/pichs/app/xwidget/MainActivity.java
@@ -5,14 +5,18 @@
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.pichs.common.widget.cardview.XCardButton;
+import com.pichs.common.widget.checkbox.XCheckBox;
 import com.pichs.common.widget.switcher.XSwitchButton;
 import com.pichs.common.widget.utils.XStatusBarHelper;
 import com.pichs.common.widget.utils.XTypefaceHelper;
@@ -28,8 +32,32 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         XCardButton btn = findViewById(R.id.btn1);
+        XCheckBox checkbox = findViewById(R.id.checkbox);
+        checkbox.setOnCheckedChangeListener(new XCheckBox.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(boolean isChecked) {
+                Toast.makeText(getApplicationContext(), "ischecked:" + isChecked, Toast.LENGTH_LONG).show();
+            }
+        });
+
+
         XSwitchButton swb = findViewById(R.id.swb);
+        swb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
+                if (isChecked) {
+                    checkbox.setImageDrawable(new ColorDrawable(Color.BLACK));
+                    checkbox.setCheckedDrawable(new ColorDrawable(Color.RED));
+
+                } else {
+                    checkbox.setImageDrawable(new ColorDrawable(Color.GREEN));
+                    checkbox.setCheckedDrawable(new ColorDrawable(Color.BLUE));
+
+                }
+
+            }
+        });
         swb.setThumbColor(Color.BLACK, Color.BLACK, Color.BLACK, Color.BLACK);
         swb.setBackgroundColor(Color.GREEN, Color.CYAN);
         btn.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8de5168..a7f05d4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,8 +22,8 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:background="#0ff"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="#0ff">
 
             <com.pichs.common.widget.space.XStatusBarSpace
                 android:layout_width="match_parent"
@@ -103,25 +103,58 @@
 
 
         <com.pichs.common.widget.input.InputLayout
-            android:text="十大发牢骚"
-            android:textColor="#f00"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:hint="卫生间"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
-            android:hint="卫生间"
+            android:text="十大发牢骚"
+            android:textColor="#f00"
             android:textColorHint="#999"
             android:textSize="18sp"
-            app:xp_clearIconVisible="true"
-            app:xp_eyeOpenDrawable="#99f"
+            android:textStyle="bold"
+            app:xp_clearDrawable="#BD0CE8"
+            app:xp_clearIconVisible="false"
             app:xp_eyeCloseDrawable="#0f8"
             app:xp_eyeIconVisible="true"
-            app:xp_clearDrawable="#BD0CE8"
+            app:xp_eyeOpenDrawable="#99f" />
+
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="48dp"/>
+            android:layout_height="80dp"
+            android:background="#D1EFE3"
+            android:orientation="vertical">
+
+            <com.pichs.common.widget.checkbox.XSmoothCheckBox
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                app:xp_cbox_color_unchecked_stroke="#0ff" />
+
+            <com.pichs.common.widget.checkbox.XCheckBox
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:id="@+id/checkbox"
+                android:layout_gravity="center"
+                android:src="#DDD7E0"
+                app:xp_checked="true"
+                app:xp_radius="15dp"
+                app:xp_src_checked="#EF0ADC" />
+
+        </LinearLayout>
+
+
+        <androidx.appcompat.widget.AppCompatCheckBox
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp" />
 
         <EditText
             android:layout_width="match_parent"
-            android:hint="师范生克拉夫"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:hint="师范生克拉夫" />
 
         <Space
             android:layout_width="match_parent"
diff --git a/widget/src/main/java/com/pichs/common/widget/checkbox/XCheckBox.java b/widget/src/main/java/com/pichs/common/widget/checkbox/XCheckBox.java
new file mode 100644
index 0000000..f8f32ee
--- /dev/null
+++ b/widget/src/main/java/com/pichs/common/widget/checkbox/XCheckBox.java
@@ -0,0 +1,115 @@
+package com.pichs.common.widget.checkbox;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Checkable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.pichs.common.widget.R;
+import com.pichs.common.widget.cardview.XCardImageView;
+
+public class XCheckBox extends XCardImageView implements Checkable, View.OnClickListener {
+
+    private Drawable checkedDrawable;
+    private Drawable normalDrawable;
+    private boolean isChecked = false;
+
+    public XCheckBox(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public XCheckBox(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public XCheckBox(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initThis(context, attrs, defStyleAttr);
+    }
+
+    private void initThis(Context context, AttributeSet attrs, int defStyleAttr) {
+        if (attrs != null) {
+            TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.XCheckBox);
+            checkedDrawable = ta.getDrawable(R.styleable.XCheckBox_xp_src_checked);
+            normalDrawable = ta.getDrawable(R.styleable.XCheckBox_android_src);
+            isChecked = ta.getBoolean(R.styleable.XCheckBox_xp_checked, false);
+            ta.recycle();
+            setChecked(isChecked);
+        }
+        super.setOnClickListener(this);
+    }
+
+    public void setCheckedDrawable(Drawable checkedDrawable) {
+        this.checkedDrawable = checkedDrawable;
+        if (isChecked) {
+            super.setImageDrawable(this.checkedDrawable);
+        }
+    }
+
+    @Override
+    public void setImageDrawable(@Nullable Drawable drawable) {
+        this.normalDrawable = drawable;
+        if (!isChecked) {
+            super.setImageDrawable(drawable);
+        }
+    }
+
+    public void setNormalImageDrawable(@Nullable Drawable drawable) {
+        setImageDrawable(drawable);
+    }
+
+    /**
+     * @hide 隐藏方法
+     */
+    @Deprecated
+    @Override
+    public void setOnClickListener(@Nullable OnClickListener l) {
+        // 禁止设置点击事件
+        // super.setOnClickListener(l);
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        isChecked = checked;
+        if (isChecked) {
+            super.setImageDrawable(checkedDrawable);
+        } else {
+            super.setImageDrawable(normalDrawable);
+        }
+        if (mChangeListener != null) {
+            mChangeListener.onCheckedChanged(isChecked);
+        }
+    }
+
+    @Override
+    public boolean isChecked() {
+        return isChecked;
+    }
+
+    @Override
+    public void toggle() {
+        setChecked(!isChecked);
+    }
+
+    @Override
+    public void onClick(View v) {
+        toggle();
+    }
+
+
+    private OnCheckedChangeListener mChangeListener;
+
+    public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {
+        this.mChangeListener = listener;
+    }
+
+
+    public interface OnCheckedChangeListener {
+        void onCheckedChanged(boolean isChecked);
+    }
+}
diff --git a/widget/src/main/java/com/pichs/common/widget/input/InputLayout.java b/widget/src/main/java/com/pichs/common/widget/input/InputLayout.java
index b3d9787..f11406c 100644
--- a/widget/src/main/java/com/pichs/common/widget/input/InputLayout.java
+++ b/widget/src/main/java/com/pichs/common/widget/input/InputLayout.java
@@ -63,6 +63,7 @@ public class InputLayout extends XCardLinearLayout {
     // 图标大小
     private int clearIconWidth, clearIconHeight;
     private int eyeIconWidth, eyeIconHeight;
+
     private CharSequence text = "";
     private CharSequence hintText = "";
     private int eyeIconColorFilter, clearIconColorFilter;
@@ -85,6 +86,10 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         mEditText = findViewById(R.id.et_content);
         mClearImageView = findViewById(R.id.iv_clear);
         mEyeImageView = findViewById(R.id.iv_eye);
+        eyeIconWidth = XDisplayHelper.dp2px(context, 30);
+        eyeIconHeight = eyeIconWidth;
+        clearIconWidth = XDisplayHelper.dp2px(context, 26);
+        clearIconHeight = clearIconWidth;
 
         TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.InputLayout, defStyleAttr, 0);
         int indexCount = ta.getIndexCount();
@@ -106,13 +111,13 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
             } else if (index == R.styleable.InputLayout_xp_eyeIcon_padding) {
                 eyeIconPadding = ta.getDimensionPixelSize(index, eyeIconPadding);
             } else if (index == R.styleable.InputLayout_xp_eyeIcon_width) {
-                eyeIconWidth = ta.getDimensionPixelSize(index, XDisplayHelper.dp2px(context, 30));
+                eyeIconWidth = ta.getDimensionPixelSize(index, eyeIconWidth);
             } else if (index == R.styleable.InputLayout_xp_eyeIcon_height) {
-                eyeIconHeight = ta.getDimensionPixelSize(index, XDisplayHelper.dp2px(context, 30));
+                eyeIconHeight = ta.getDimensionPixelSize(index, eyeIconHeight);
             } else if (index == R.styleable.InputLayout_xp_clearIcon_height) {
-                clearIconHeight = ta.getDimensionPixelSize(index, XDisplayHelper.dp2px(context, 28));
+                clearIconHeight = ta.getDimensionPixelSize(index, clearIconHeight);
             } else if (index == R.styleable.InputLayout_xp_clearIcon_width) {
-                clearIconWidth = ta.getDimensionPixelSize(index, XDisplayHelper.dp2px(context, 28));
+                clearIconWidth = ta.getDimensionPixelSize(index, clearIconWidth);
             } else if (index == R.styleable.InputLayout_xp_clearIcon_padding) {
                 clearIconPadding = ta.getDimensionPixelSize(index, clearIconPadding);
             } else if (index == R.styleable.InputLayout_android_text) {
@@ -157,15 +162,13 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         setEyeIconVisible(isEyeIconShow);
         setEyeCloseDrawable(mEyeCloseDrawable);
         setEyeOpenDrawable(mEyeOpenDrawable);
-        setEyeIconHeight(eyeIconHeight);
-        setEyeIconWidth(eyeIconWidth);
+        setEyeIconSize(eyeIconWidth,eyeIconHeight);
         setEyeIconPadding(eyeIconPadding);
         setEyeIconColorFilter(eyeIconColorFilter);
 
         setClearDrawable(mClearDrawable);
         setClearIconVisible(isClearIconShow);
-        setClearIconHeight(clearIconHeight);
-        setClearIconWidth(clearIconWidth);
+        setClearIconSize(clearIconWidth,clearIconHeight);
         setClearIconPadding(clearIconPadding);
         setCleaIconColorFilter(clearIconColorFilter);
         handleViewData();
@@ -257,17 +260,6 @@ public InputLayout setClearDrawable(Drawable clearDrawable) {
         return this;
     }
 
-    public InputLayout setClearIconHeight(int clearIconHeight) {
-        this.clearIconHeight = clearIconHeight;
-        if (mClearImageView != null) {
-            ViewGroup.LayoutParams layoutParams = mClearImageView.getLayoutParams();
-            if (layoutParams != null) {
-                layoutParams.height = clearIconHeight;
-                mClearImageView.setLayoutParams(layoutParams);
-            }
-        }
-        return this;
-    }
 
     public InputLayout setClearIconPadding(int clearIconPadding) {
         this.clearIconPadding = clearIconPadding;
@@ -277,11 +269,13 @@ public InputLayout setClearIconPadding(int clearIconPadding) {
         return this;
     }
 
-    public InputLayout setClearIconWidth(int clearIconWidth) {
-        this.clearIconWidth = clearIconWidth;
+    public InputLayout setClearIconSize(int width,int height) {
+        this.clearIconHeight = height;
+        this.clearIconWidth = width;
         if (mClearImageView != null) {
             ViewGroup.LayoutParams layoutParams = mClearImageView.getLayoutParams();
             if (layoutParams != null) {
+                layoutParams.height = clearIconHeight;
                 layoutParams.width = clearIconWidth;
                 mClearImageView.setLayoutParams(layoutParams);
             }
@@ -295,23 +289,14 @@ public InputLayout setDisableCopyAndPaste(boolean disableCopyAndPaste) {
         return this;
     }
 
-    public InputLayout setEyeIconWidth(int eyeIconWidth) {
-        this.eyeIconWidth = eyeIconWidth;
-        if (mEyeImageView != null) {
-            ViewGroup.LayoutParams layoutParams = mEyeImageView.getLayoutParams();
-            if (layoutParams != null) {
-                layoutParams.width = eyeIconWidth;
-                mEyeImageView.setLayoutParams(layoutParams);
-            }
-        }
-        return this;
-    }
 
-    public InputLayout setEyeIconHeight(int eyeIconHeight) {
-        this.eyeIconHeight = eyeIconHeight;
+    public InputLayout setEyeIconSize(int width, int height) {
+        this.eyeIconWidth = width;
+        this.eyeIconHeight = height;
         if (mEyeImageView != null) {
             ViewGroup.LayoutParams layoutParams = mEyeImageView.getLayoutParams();
             if (layoutParams != null) {
+                layoutParams.width = eyeIconWidth;
                 layoutParams.height = eyeIconHeight;
                 mEyeImageView.setLayoutParams(layoutParams);
             }
diff --git a/widget/src/main/java/com/pichs/common/widget/utils/XGradientHelper.java b/widget/src/main/java/com/pichs/common/widget/utils/XGradientHelper.java
index 7a71920..c426e19 100644
--- a/widget/src/main/java/com/pichs/common/widget/utils/XGradientHelper.java
+++ b/widget/src/main/java/com/pichs/common/widget/utils/XGradientHelper.java
@@ -42,69 +42,6 @@ public class XGradientHelper {
         int state_focused = android.R.attr.state_focused;
     }
 
-    /**
-     * 获取字体颜色选择器
-     *
-     * @param pressedColor   按压时颜色
-     * @param unEnabledColor enabled=false时颜色
-     * @param checkedColor   选中时颜色
-     * @param activatedColor activated=true时颜色
-     * @param normalColor    反状态是的颜色（也就是正常的颜色）
-     * @return
-     */
-    public static ColorStateList getTextColorSelector(@ColorInt int pressedColor, @ColorInt int unEnabledColor, @ColorInt int checkedColor, @ColorInt int activatedColor, @ColorInt int normalColor) {
-        return new ColorStateListBuilder()
-                .addPressedColor(pressedColor)
-                .addUnEnabledColor(unEnabledColor)
-                .addActivatedColor(activatedColor)
-                .addCheckedColor(checkedColor)
-                .setUnSateColor(normalColor)
-                .build();
-    }
-
-
-    /**
-     * 获取字体颜色选择器
-     *
-     * @param pressedColor   按压时颜色
-     * @param unEnabledColor enabled=false时颜色
-     * @return
-     */
-    public static ColorStateList getTextColorSelector(@ColorInt int pressedColor, @ColorInt int unEnabledColor, @ColorInt int normalColor) {
-        return new ColorStateListBuilder()
-                .addPressedColor(pressedColor)
-                .addUnEnabledColor(unEnabledColor)
-                .setUnSateColor(normalColor)
-                .build();
-    }
-
-    /**
-     * 获取字体颜色选择器
-     *
-     * @param pressedColor 按压时颜色
-     * @return
-     */
-    public static ColorStateList getTextColorPressedSelector(@ColorInt int pressedColor, @ColorInt int unPressedColor) {
-        return new ColorStateListBuilder()
-                .addPressedColor(pressedColor)
-                .setUnSateColor(unPressedColor)
-                .build();
-    }
-
-    /**
-     * 获取字体颜色选择器
-     *
-     * @param unEnabledColor 按压时颜色
-     * @return
-     */
-    public static ColorStateList getTextColorUnEnabledSelector(@ColorInt int unEnabledColor, @ColorInt int enabledColor) {
-        return new ColorStateListBuilder()
-                .addUnEnabledColor(unEnabledColor)
-                .setUnSateColor(enabledColor)
-                .build();
-    }
-
-
     /**
      * * 字体颜色选择器
      * * 添加顺序可能会影响使用效果。
@@ -122,7 +59,7 @@ public static class ColorStateListBuilder {
         /**
          * 添加顺序可能会影响使用效果。
          * 建议使用顺:
-         * pressed, enabled, checked, activated , enabled
+         * pressed, enabled, checked, activated , selected
          */
         public ColorStateListBuilder() {
         }
@@ -231,7 +168,6 @@ public StateListDrawableBuilder addUnEnabledState(int color) {
             return addUnEnabledState(new ColorDrawable(color));
         }
 
-
         public StateListDrawableBuilder addState(int state, Drawable drawable) {
             if (drawable != null) {
                 stateList.add(state);
@@ -273,148 +209,6 @@ public StateListDrawable build() {
 
     }
 
-    /**
-     * 获取背景选择器
-     *
-     * @param pressedDrawable   按压Drawable
-     * @param unEnabledDrawable enabled=false Drawable
-     * @param checkedDrawable   选中 Drawable
-     * @param activatedDrawable activated Drawable
-     * @param normalDrawable    正常状态的Drawable
-     * @return
-     */
-    public static StateListDrawable getSelector(Drawable pressedDrawable, Drawable unEnabledDrawable, Drawable checkedDrawable, Drawable activatedDrawable, Drawable normalDrawable) {
-        return new StateListDrawableBuilder()
-                .addPressedState(pressedDrawable)
-                .addUnEnabledState(unEnabledDrawable)
-                .addCheckedState(checkedDrawable)
-                .addActivatedState(activatedDrawable)
-                .setUnState(normalDrawable)
-                .build();
-    }
-
-    public static StateListDrawable getSelector(int pressedColor, int unEnabledColor, int checkedColor, int activatedColor, int normalColor) {
-        return new StateListDrawableBuilder()
-                .addPressedState(pressedColor)
-                .addUnEnabledState(unEnabledColor)
-                .addCheckedState(checkedColor)
-                .addActivatedState(activatedColor)
-                .setUnState(normalColor)
-                .build();
-    }
-
-    public static StateListDrawable getSelector(Drawable pressedDrawable, Drawable unEnabledDrawable, Drawable unStateDrawable) {
-        return new StateListDrawableBuilder()
-                .addPressedState(pressedDrawable)
-                .addUnEnabledState(unEnabledDrawable)
-                .setUnState(unStateDrawable)
-                .build();
-    }
-
-    public static StateListDrawable getSelector(int pressedColor, int unEnabledColor, int unStateColor) {
-        return new StateListDrawableBuilder()
-                .addPressedState(pressedColor)
-                .addUnEnabledState(unEnabledColor)
-                .setUnState(unStateColor)
-                .build();
-    }
-
-
-    public static StateListDrawable getPressedSelector(Drawable pressedDrawable, Drawable unStateDrawable) {
-        return new StateListDrawableBuilder()
-                .addPressedState(pressedDrawable)
-                .setUnState(unStateDrawable)
-                .build();
-    }
-
-    public static StateListDrawable getPressedSelector(int pressedColor, int unPressedColor) {
-        return new StateListDrawableBuilder()
-                .addPressedState(pressedColor)
-                .setUnState(unPressedColor)
-                .build();
-    }
-
-    public static StateListDrawable getUnEnabledSelector(Drawable unEnabledDrawable, Drawable enabledDrawable) {
-        return new StateListDrawableBuilder()
-                .addPressedState(unEnabledDrawable)
-                .setUnState(enabledDrawable)
-                .build();
-    }
-
-    public static StateListDrawable getUnEnabledSelector(int unEnabledColor, int enabledColor) {
-        return new StateListDrawableBuilder()
-                .addPressedState(unEnabledColor)
-                .setUnState(enabledColor)
-                .build();
-    }
-
-    /**
-     * 获取带圆角的 selector
-     *
-     * @param radius         圆角
-     * @param pressedColor   按压
-     * @param checkedColor   选中
-     * @param activatedColor 活跃
-     * @param unEnabledColor 不可操作
-     * @param normalColor    普通色
-     * @return StateListDrawable
-     */
-    public static StateListDrawable getRoundSelector(int radius, int pressedColor, int unEnabledColor, int checkedColor, int activatedColor, int normalColor) {
-        return getSelector(
-                getDrawable(radius, pressedColor, 0, 0),
-                getDrawable(radius, unEnabledColor, 0, 0),
-                getDrawable(radius, checkedColor, 0, 0),
-                getDrawable(radius, activatedColor, 0, 0),
-                getDrawable(radius, normalColor, 0, 0)
-        );
-    }
-
-    /**
-     * 获取带圆角的 selector
-     *
-     * @param radius         圆角
-     * @param pressedColor   按压
-     * @param unEnabledColor 不可操作
-     * @param normalColor    普通色
-     * @return StateListDrawable
-     */
-    public static StateListDrawable getRoundSelector(int radius, int pressedColor, int unEnabledColor, int normalColor) {
-        return getSelector(
-                getDrawable(radius, pressedColor, 0, 0),
-                getDrawable(radius, unEnabledColor, 0, 0),
-                getDrawable(radius, normalColor, 0, 0)
-        );
-    }
-
-
-    /**
-     * 有角度，点击效果
-     *
-     * @param normalColor  无点击效果
-     * @param pressedColor 点击效果
-     * @return StateListDrawable
-     */
-    public static StateListDrawable getPressedRoundSelector(int radius, int pressedColor, int normalColor) {
-        return getPressedSelector(
-                getDrawable(radius, pressedColor, 0, 0),
-                getDrawable(radius, normalColor, 0, 0)
-        );
-    }
-
-    /**
-     * 有角度，点击效果
-     *
-     * @param normalColor    无点击效果
-     * @param unEnabledColor 点击效果
-     * @return StateListDrawable
-     */
-    public static StateListDrawable getUnEnabledRoundSelector(int radius, int unEnabledColor, int normalColor) {
-        return getUnEnabledSelector(
-                getDrawable(radius, unEnabledColor, 0, 0),
-                getDrawable(radius, normalColor, 0, 0)
-        );
-    }
-
     /**
      * 建造者创建GradientDrawable
      * 数值必须都为正数才有效
@@ -527,6 +321,24 @@ public static GradientDrawable getDrawable(int radius, @ColorInt int fillColor,
     }
 
 
+    /**
+     * 设置渐变色，默认水平方向渐变
+     * 不带边框
+     *
+     * @param radius         圆角大小 px
+     * @param gradientColors 渐变数组，从左到右渐变
+     * @return GradientDrawable
+     * GradientDrawable.Orientation.LEFT_RIGHT
+     * {@link GradientDrawable.Orientation#LEFT_RIGHT}
+     */
+    public static GradientDrawable getGradientDrawable(int radius, GradientDrawable.Orientation gradientOrientation, @ColorInt int[] gradientColors) {
+        return new GradientDrawableBuilder()
+                .setRadius(radius)
+                .setOrientation(gradientOrientation)
+                .setGradientColors(gradientColors)
+                .build();
+    }
+
     /**
      * shape 只支持默认，rectangle
      * 渐变只支持线性渐变，其他的用xml定义更舒服
@@ -575,23 +387,4 @@ public static GradientDrawable getDrawable(int radius, int topLeftRadius, int to
         return gradientDrawable;
     }
 
-
-    /**
-     * 设置渐变色，默认水平方向渐变
-     * 不带边框
-     *
-     * @param radius         圆角大小 px
-     * @param gradientColors 渐变数组，从左到右渐变
-     * @return GradientDrawable
-     * GradientDrawable.Orientation.LEFT_RIGHT
-     * {@link GradientDrawable.Orientation#LEFT_RIGHT}
-     */
-    public static GradientDrawable getGradientDrawable(int radius, GradientDrawable.Orientation gradientOrientation, @ColorInt int[] gradientColors) {
-        return new GradientDrawableBuilder()
-                .setRadius(radius)
-                .setOrientation(gradientOrientation)
-                .setGradientColors(gradientColors)
-                .build();
-    }
-
 }
diff --git a/widget/src/main/res/values/attrs.xml b/widget/src/main/res/values/attrs.xml
index 6dd3a8d..9b63815 100644
--- a/widget/src/main/res/values/attrs.xml
+++ b/widget/src/main/res/values/attrs.xml
@@ -703,4 +703,11 @@
         <attr name="xp_colorFilterMode" />
     </declare-styleable>
 
+    <declare-styleable name="XCheckBox">
+        <attr name="android:src" />
+        <attr name="xp_checked" />
+        <attr name="xp_src_checked" format="reference|color" />
+        <attr name="xp_radius" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file