From 79b757643d0d6c1215de6d6cd0514ee4eb22fe30 Mon Sep 17 00:00:00 2001
From: Kale <developer_kale@foxmail.com>
Date: Sat, 28 Apr 2018 14:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BA=86=E7=94=A8svg?=
 =?UTF-8?q?=E5=81=9A=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable-xhdpi/kale_mask.png | Bin 0 -> 11129 bytes
 app/src/main/res/layout/image_layout.xml      |   1 -
 app/src/main/res/layout/svg_layout.xml        |  58 ++++++++++++++++--
 app/src/main/res/layout/text_layout.xml       |   3 -
 .../kale/injection/SelectorInjection.java     |  23 ++++---
 .../main/java/kale/utils/SelectorUtils.java   |   2 +-
 lib/src/main/res/values/attrs.xml             |  13 ++--
 7 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/kale_mask.png

diff --git a/app/src/main/res/drawable-xhdpi/kale_mask.png b/app/src/main/res/drawable-xhdpi/kale_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..976032d8f03997b09122c8d42982eb98111e4fd7
GIT binary patch
literal 11129
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
PHvsZ7O45}e<KX`TdjLcD

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/image_layout.xml b/app/src/main/res/layout/image_layout.xml
index f106026..facfec4 100644
--- a/app/src/main/res/layout/image_layout.xml
+++ b/app/src/main/res/layout/image_layout.xml
@@ -101,7 +101,6 @@
             app:src="@drawable/icon_facebook_svg"
             />
 
-
         <kale.ui.view.SelectorImageView
             android:layout_width="100dp"
             android:layout_height="100dp"
diff --git a/app/src/main/res/layout/svg_layout.xml b/app/src/main/res/layout/svg_layout.xml
index b090c4d..3af5b6c 100644
--- a/app/src/main/res/layout/svg_layout.xml
+++ b/app/src/main/res/layout/svg_layout.xml
@@ -125,23 +125,25 @@
         <ImageView
             android:layout_width="60dp"
             android:layout_height="60dp"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
+
             android:gravity="center_vertical"
 
             android:tint="@color/blue"
-
             app:srcCompat="@drawable/icon_facebook_svg"
             />
 
         <ImageView
             android:layout_width="20dp"
             android:layout_height="20dp"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:contentDescription="控件小于SVG的大小"
-            android:gravity="center_vertical"
 
+            android:gravity="center_vertical"
             android:tint="@color/orange"
             app:srcCompat="@drawable/icon_facebook_svg"
             />
@@ -161,10 +163,11 @@
         <ImageView
             android:layout_width="60dp"
             android:layout_height="60dp"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:scaleType="center"
 
+            android:scaleType="center"
             android:tint="@color/green"
             app:srcCompat="@drawable/icon_facebook_svg"
             />
@@ -179,18 +182,61 @@
         android:contentDescription="上下左右icon分别着色"
         android:gravity="center_vertical"
         android:padding="@dimen/activity_horizontal_margin"
-        
+
         app:drawableBottom="@drawable/icon_facebook_svg"
         app:drawableBottomTint="@color/green"
-        
+
         app:drawableLeft="@drawable/icon_facebook_svg"
         app:drawableLeftTint="@color/red"
 
         app:drawableRight="@drawable/icon_facebook_svg"
         app:drawableRightTint="@color/green"
-        
+
         app:drawableTop="@drawable/icon_vimeo_svg"
         app:drawableTopTint="@color/blue"
         />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:background="@color/white"
+        android:padding="@dimen/activity_horizontal_margin"
+        >
+
+        <kale.ui.view.SelectorButton
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+
+            app:background="@drawable/icon_renren_svg"
+            app:backgroundTint="@color/blue"
+            />
+
+        <kale.ui.view.SelectorButton
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+
+            app:background="@drawable/icon_robot"
+            app:backgroundTint="@color/orange"
+            />
+
+        <kale.ui.view.SelectorButton
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+
+            app:background="@drawable/kale_mask"
+            app:backgroundTint="@color/green"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/text_layout.xml b/app/src/main/res/layout/text_layout.xml
index 1dba1dc..c362e77 100644
--- a/app/src/main/res/layout/text_layout.xml
+++ b/app/src/main/res/layout/text_layout.xml
@@ -59,7 +59,6 @@
         app:normalDrawable="@drawable/shape_rectangle_with_shadow"
         />
 
-
     <kale.ui.view.SelectorTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -93,7 +92,6 @@
         app:normalDrawable="@drawable/shape_rectangle"
         />
 
-
     <kale.ui.view.SelectorTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -120,5 +118,4 @@
         app:normalDrawable="@drawable/shape_rectangle"
         />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/lib/src/main/java/kale/injection/SelectorInjection.java b/lib/src/main/java/kale/injection/SelectorInjection.java
index 9b77400..b8387a1 100644
--- a/lib/src/main/java/kale/injection/SelectorInjection.java
+++ b/lib/src/main/java/kale/injection/SelectorInjection.java
@@ -62,12 +62,6 @@ public void loadFromAttributes(AttributeSet attrs, int defStyleAttr) {
 
         TintTypedArray a = TintTypedArray.obtainStyledAttributes(context, attrs, R.styleable.SelectorInjection, defStyleAttr, 0);
 
-        smartColor = a.getBoolean(R.styleable.SelectorInjection_smartColor, true);
-        inSrc = a.getBoolean(R.styleable.SelectorInjection_inSrc, false);
-        showRipple = a.getBoolean(R.styleable.SelectorInjection_ripple, false);
-
-        Drawable src = a.getDrawable(R.styleable.SelectorInjection_src);
-
         normal = SelectorBean.create(a,
                 R.styleable.SelectorInjection_normalDrawable,
                 R.styleable.SelectorInjection_normalColor,
@@ -93,11 +87,24 @@ public void loadFromAttributes(AttributeSet attrs, int defStyleAttr) {
                 R.styleable.SelectorInjection_disableStrokeWidth
         );
 
-        a.recycle();
+        inSrc = a.getBoolean(R.styleable.SelectorInjection_inSrc, false);
+        smartColor = a.getBoolean(R.styleable.SelectorInjection_smartColor, true);
+        showRipple = a.getBoolean(R.styleable.SelectorInjection_ripple, false);
 
+        Drawable src = a.getDrawable(R.styleable.SelectorInjection_src);
         if (src != null && view instanceof ImageView) {
             ((ImageView) view).setImageDrawable(src);
         }
+
+        Drawable background = a.getDrawable(R.styleable.SelectorInjection_background);
+        int backgroundTint = a.getColor(R.styleable.SelectorInjection_backgroundTint, DEFAULT_COLOR);
+        
+        if (backgroundTint != DEFAULT_COLOR && background != null) {
+            SelectorUtils.tintDrawable(background, backgroundTint);
+            view.setBackground(background);
+        }
+
+        a.recycle();
     }
 
     public void injection() {
@@ -202,7 +209,7 @@ private void setSelectorDrawableToView() {
             return;
         }
 
-        view.setBackgroundDrawable(selector);
+        view.setBackground(selector);
     }
 
     public void configButtonDrawable() {
diff --git a/lib/src/main/java/kale/utils/SelectorUtils.java b/lib/src/main/java/kale/utils/SelectorUtils.java
index 42a2d91..cefecd6 100644
--- a/lib/src/main/java/kale/utils/SelectorUtils.java
+++ b/lib/src/main/java/kale/utils/SelectorUtils.java
@@ -23,7 +23,7 @@ public static SelectorInjection injectionToSelectorView(View view, AttributeSet
             SvgInjection svgInjection = new SvgInjection(view);
             svgInjection.loadFromAttributes(attrs, defStyle);
             svgInjection.injection();
-            
+
             SelectorInjection injection = ((ISelectorView) view).createSelectorInjection(view.getContext(), attrs);
             injection.loadFromAttributes(attrs, defStyle);
             injection.injection();
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
index 4727aca..624ac09 100644
--- a/lib/src/main/res/values/attrs.xml
+++ b/lib/src/main/res/values/attrs.xml
@@ -45,13 +45,11 @@
         <attr name="android:drawableTop" />
         <attr name="android:drawableBottom" />
         <attr name="src" format="reference" />
+        <attr name="button" format="reference"/>
         <attr name="background" format="reference" />
 
-        <!-- svg & tint support -->
+        <!-- tint support -->
 
-        <attr name="button" format="reference"/>
-        <attr name="buttonTint" format="color" />
-        
         <attr name="drawableLeftTint" format="color" />
         <attr name="drawableTopTint" format="color" />
         <attr name="drawableRightTint" format="color" />
@@ -61,7 +59,10 @@
         <attr name="drawableBottom" format="reference" />
         <attr name="drawableLeft" format="reference" />
         <attr name="drawableRight" format="reference" />
-        
+
+        <attr name="buttonTint" format="color" />
+        <attr name="backgroundTint" format="color" />
+
         <!-- 事件控制 -->
         <attr name="isClicked" format="boolean" />
         <attr name="android:contentDescription" />
@@ -100,6 +101,7 @@
         <attr name="drawableLeft"/>
         <attr name="drawableRight"/>
         <attr name="background"/>
+        <attr name="backgroundTint"/>
     </declare-styleable>
 
     <declare-styleable name="SelectorImageView">
@@ -124,6 +126,7 @@
         <attr name="ripple"/>
         <attr name="src"/>
         <attr name="background"/>
+        <attr name="backgroundTint"/>
     </declare-styleable>