Merge pull request zcweng#29 from robertoallende/feature/buttonColors

zcweng · web-flow · commit 4f2b89d52d71 · 2020-03-03T21:59:35.000+08:00
Feature/buttonColors
diff --git a/library/src/main/java/com/suke/widget/SwitchButton.java b/library/src/main/java/com/suke/widget/SwitchButton.java
@@ -135,6 +135,14 @@ private void init(Context context, AttributeSet attrs) {
         int buttonColor = optColor(typedArray,
                 R.styleable.SwitchButton_sb_button_color,
                 Color.WHITE);//Color.WHITE;
+        
+        uncheckButtonColor = optColor(typedArray,
+                R.styleable.SwitchButton_sb_uncheckbutton_color,
+                buttonColor);
+    
+        checkedButtonColor = optColor(typedArray,
+                R.styleable.SwitchButton_sb_checkedbutton_color,
+                buttonColor);
 
         int effectDuration = optInt(typedArray,
                 R.styleable.SwitchButton_sb_effect_duration,
@@ -251,6 +259,7 @@ private void setUncheckViewState(ViewState viewState){
         viewState.checkStateColor = uncheckColor;
         viewState.checkedLineColor = Color.TRANSPARENT;
         viewState.buttonX = buttonMinX;
+        buttonPaint.setColor(uncheckButtonColor);
     }
 
     /**
@@ -261,6 +270,7 @@ private void setCheckedViewState(ViewState viewState){
         viewState.checkStateColor = checkedColor;
         viewState.checkedLineColor = checkLineColor;
         viewState.buttonX = buttonMaxX;
+        buttonPaint.setColor(checkedButtonColor);
     }
 
     @Override
@@ -903,8 +913,16 @@ private static boolean optBoolean(TypedArray typedArray,
      *打开指示线位移Y
      */
     private float checkedLineOffsetY;
-
-
+    /**
+     * Color for button when it's uncheck
+     */
+    private int uncheckButtonColor;
+    /**
+     * Color for button when it's check
+     */
+    private int checkedButtonColor;
+    
+    
     /**
      * 按钮最左边
      */
diff --git a/library/src/main/res/values/switch_button_attrs.xml b/library/src/main/res/values/switch_button_attrs.xml
@@ -21,5 +21,9 @@
         <attr name="sb_show_indicator" format="reference|boolean"/>
         <attr name="sb_background" format="reference|color"/>
         <attr name="sb_enable_effect" format="reference|boolean"/>
+    
+        <attr name="sb_checkedbutton_color" format="reference|color"/>
+        <attr name="sb_uncheckbutton_color" format="reference|color"/>
+        
     </declare-styleable>
 </resources>
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -43,6 +43,8 @@
         app:sb_checkline_color="#a5dc88"
         app:sb_checked_color="#A36F95"
         app:sb_uncheckcircle_color="#A36F95"
+        app:sb_uncheckbutton_color="#fdc951"
+        app:sb_checkedbutton_color="#61d74f"
         />
 
     <com.suke.widget.SwitchButton
