增加支持渐变属性

DrownCoder · DrownCoder · commit 2391495a6c6e · 2019-04-29T10:35:49.000+08:00
diff --git a/EasyTextView_Demo.jpg b/EasyTextView_Demo.jpg
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@
 * 链式调用
 * 支持给iconfont左右设置文字
 * 支持xml中直接设置常用shape的所有属性
+* 支持渐变背景色，边线，纯色背景色，圆角等
 * 支持分别设置iconfont，左文字，右文字的颜色（Selector也可以）、字号、样式（粗体、斜体）
 * 支持左边文字，中间文字，右边文字都设置iconfont
 * 支持文字和iconfont居中
@@ -39,7 +40,7 @@ dependencies {
 	}
 ```
 ### 效果
- <img src="https://github.com/DrownCoder/EasyTextView/blob/master/easttextview_demo.jpg" width = "362" height = "642" alt="自由发挥想象空间" align=center />  
+ <img src="https://github.com/DrownCoder/EasyTextView/blob/master/EasyTextView.jpg" width = "362" height = "642" alt="自由发挥想象空间" align=center />
  
 ### 使用  
 #### xml属性
@@ -108,7 +109,22 @@ dependencies {
             <enum name="bold" value="1" />
             <enum name="italic" value="2" />
         </attr>
-	<attr name="autoMaxHeight" format="boolean"/>
+        <attr name="autoMaxHeight" format="boolean" />
+     //渐变色方向
+        <attr name="gradientOrientation">
+            <enum name="top_bottom" value="0" />
+            <enum name="tp_bl" value="1" />
+            <enum name="right_left" value="2" />
+            <enum name="br_tl" value="3" />
+            <enum name="bottom_top" value="4" />
+            <enum name="bl_tr" value="5" />
+            <enum name="left_right" value="6" />
+            <enum name="tl_br" value="7" />
+        </attr>
+     //渐变色的起始色，中间色，末尾色
+        <attr name="startSolid" format="reference|color" />
+        <attr name="centerSolid" format="reference|color" />
+        <attr name="endSolid" format="reference|color" />
     </declare-styleable>
 ```
 #### java Api
@@ -154,12 +170,14 @@ public void addSpanRight(Object object, int start, int end, int flags);
 详细使用说明参考[Wiki](https://github.com/DrownCoder/EasyTextView/wiki)
 
 ### 版本更新
-v1.13 
->1.修改icon类型从String改为charsequence  
->2.进一步拓展JAVA的API  
->3.补充Error信息  
+v1.14
+>新增xml中支持设置渐变色
+v1.13
+>1.修改icon类型从String改为charsequence
+>2.进一步拓展JAVA的API
+>3.补充Error信息
 
-v1.12 
+v1.12
 >1.修复center_vertical时文字重叠问题  
 >2.新增boolean型autoMaxHeight属性,当为true时解决以下问题  
 >-修复左右文字大小大于中间文字大小高度不准问题  
diff --git a/WX20180614-214347@2x.png b/WX20180614-214347@2x.png
diff --git a/app/src/main/java/com/study/xuan/easytextview/MainActivity.java b/app/src/main/java/com/study/xuan/easytextview/MainActivity.java
@@ -3,23 +3,15 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 import android.text.style.UnderlineSpan;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 
 import com.study.xuan.library.widget.EasyTextView;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class MainActivity extends AppCompatActivity {
     private EasyTextView textView;
     private int[] color = new int[]{
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -85,6 +85,7 @@
 
         <com.study.xuan.library.widget.EasyTextView
             android:layout_marginLeft="20dp"
+            android:id="@+id/etv_address"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:textLeft="坐标:"
@@ -95,12 +96,11 @@
             android:text="&#xe63f;"
             app:textRight="北京"
             android:gravity="center"
-            app:textPadding="4dp"
+            android:includeFontPadding="false"
             app:textRightColor="@color/black"
             android:padding="4dp"
             app:totalRadius="4dp"
-            app:soildBac="@color/white"
-            />
+            app:soildBac="@color/white" />
     </LinearLayout>
 
 
@@ -110,14 +110,14 @@
         android:orientation="horizontal"
         android:background="@color/lightblack"
         android:layout_marginTop="10dp"
-        android:gravity="center_vertical"
-        >
+        android:gravity="center_vertical">
+
         <TextView
             android:layout_marginLeft="10dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="span样式："
-            />
+            android:text="span样式：" />
+
         <com.study.xuan.library.widget.EasyTextView
             android:id="@+id/easyText"
             android:paddingTop="5dp"
@@ -390,33 +390,22 @@
             android:layout_marginLeft="10dp"
             android:gravity="center_vertical"
             android:padding="5dp"
-            android:text="中间文字"
+            android:text="渐变"
             app:textCenterStyle="bold"
-            android:textColor="#494949"
+            android:textColor="@color/white"
             app:textLeft="@string/icon_font"
             app:textRight="@string/icon_font"
             android:textSize="12dp"
             app:radiusBottomLeft="15dp"
             app:radiusBottomRight="2dp"
             app:radiusTopLeft="15dp"
             app:radiusTopRight="8dp"
-            app:soildBac="@color/bohegreen"
+            app:gradientOrientation="left_right"
+            app:startSolid="@color/bohegreen"
+            app:endSolid="@color/colorPrimary"
             app:strokeColor="@color/bohegreen"
             app:textPadding="5dp" />
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp" />
-
-    <!--<android.support.v7.widget.RecyclerView
-        android:id="@+id/rcy"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        />-->
-
 </LinearLayout>
diff --git a/device-2018-04-28-151248.png b/device-2018-04-28-151248.png
diff --git a/library/build.gradle b/library/build.gradle
@@ -31,5 +31,5 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:26.+'
     testCompile 'junit:junit:4.12'
-    compile 'com.github.sdfdzx:SupperShape:v1.0.0'
+    compile 'com.github.sdfdzx:SupperShape:v1.0.3'
 }
diff --git a/library/src/main/java/com/study/xuan/library/widget/EasyTextView.java b/library/src/main/java/com/study/xuan/library/widget/EasyTextView.java
@@ -4,6 +4,7 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
 import android.support.annotation.ColorInt;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -82,6 +83,12 @@ public class EasyTextView extends TextView {
     private int iconIndex = 0;
     //是否开启计算文字边界，开启后会以最大文字大小为View高度，并且会增加部分文字高度，防止部分英文类型y,g由于基线的原因无法显示完全
     private boolean autoMaxHeight;
+    //渐变色
+    private ColorStateList startColor = null;
+    private ColorStateList centerColor = null;
+    private ColorStateList endColor = null;
+    //渐变方向
+    GradientDrawable.Orientation orientation;
 
     public EasyTextView(Context context) {
         this(context, null);
@@ -146,8 +153,8 @@ private void initIconFont() {
 
                 if (!TextUtils.isEmpty(mTextRight)) {
                     AbsoluteSizeSpan sizeSpan = new AbsoluteSizeSpan((int) mTextPadding);
-                    stringBuilder.setSpan(sizeSpan, iconIndex + centerSize, iconIndex + centerSize + 1, Spanned
-                            .SPAN_EXCLUSIVE_EXCLUSIVE);
+                    stringBuilder.setSpan(sizeSpan, iconIndex + centerSize, iconIndex +
+                            centerSize + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                 }
 
             }
@@ -207,7 +214,8 @@ private void initIconFont() {
             for (SpanContainer container : rightContainer) {
                 for (Object o : container.spans) {
                     try {
-                        stringBuilder.setSpan(o, start + container.start, start + container.end, container.flag);
+                        stringBuilder.setSpan(o, start + container.start, start + container.end,
+                                container.flag);
                     } catch (Exception e) {
                         //please check invoke clearSpan() method first
                     }
@@ -280,7 +288,8 @@ private void setLeftTextAttr(SpannableStringBuilder stringBuilder) {
         }
     }
 
-    private void initTextSize(SpannableStringBuilder stringBuilder, int start, int end, float textSize, int mCurColor) {
+    private void initTextSize(SpannableStringBuilder stringBuilder, int start, int end, float
+            textSize, int mCurColor) {
         if (textSize != 0) {
             CharacterStyle sizeSpan;
             final int gravity = getGravity() & Gravity.VERTICAL_GRAVITY_MASK;
@@ -308,7 +317,8 @@ private void initTextLeftColor(SpannableStringBuilder stringBuilder, int end) {
         }
     }
 
-    private void initTextStyle(int textStyle, SpannableStringBuilder stringBuilder, int start, int end) {
+    private void initTextStyle(int textStyle, SpannableStringBuilder stringBuilder, int start,
+                               int end) {
         StyleSpan span;
         if (textStyle != Typeface.NORMAL) {
             span = new StyleSpan(textStyle);
@@ -327,14 +337,53 @@ private void initShape() {
     }
 
     private void setShape() {
+        ShapeBuilder shapeBuilder;
         if (mRadius != 0) {
-            ShapeBuilder.create().Type(type).Radius(mRadius).Soild(mSoild).Stroke
-                    (mStrokeWidth, mStrokeColor).build(this);
+            shapeBuilder = ShapeBuilder.create().Type(type).Radius(mRadius).Stroke
+                    (mStrokeWidth, mStrokeColor);
+        } else {
+            shapeBuilder = ShapeBuilder.create().Type(type).Radius(mRadiusTopLeft,
+                    mRadiusTopRight, mRadiusBottomLeft, mRadiusBottomRight).Stroke
+                    (mStrokeWidth, mStrokeColor);
+        }
+        if (orientation != null && startColor != null && endColor != null) {
+            //渐变
+            if (centerColor != null) {
+                shapeBuilder.Gradient(orientation, getColor(startColor), getColor(centerColor),
+                        getColor(endColor));
+            } else {
+                shapeBuilder.GradientInit(orientation, getColor(startColor), getColor(endColor));
+            }
         } else {
-            ShapeBuilder.create().Type(type).Radius(mRadiusTopLeft,
-                    mRadiusTopRight, mRadiusBottomLeft, mRadiusBottomRight).Soild(mSoild).Stroke
-                    (mStrokeWidth, mStrokeColor).build(this);
+            shapeBuilder.Solid(mSoild);
+        }
+        shapeBuilder.build(this);
+    }
+
+    private int getColor(ColorStateList color) {
+        return color.getColorForState(getDrawableState(), 0);
+    }
+
+    private GradientDrawable.Orientation switchEnumToOrientation(int orientation) {
+        switch (orientation) {
+            case 0:
+                return GradientDrawable.Orientation.TOP_BOTTOM;
+            case 1:
+                return GradientDrawable.Orientation.TR_BL;
+            case 2:
+                return GradientDrawable.Orientation.RIGHT_LEFT;
+            case 3:
+                return GradientDrawable.Orientation.BR_TL;
+            case 4:
+                return GradientDrawable.Orientation.BOTTOM_TOP;
+            case 5:
+                return GradientDrawable.Orientation.BL_TR;
+            case 6:
+                return GradientDrawable.Orientation.LEFT_RIGHT;
+            case 7:
+                return GradientDrawable.Orientation.TL_BR;
         }
+        return GradientDrawable.Orientation.LEFT_RIGHT;
     }
 
     private void clearText() {
@@ -377,8 +426,6 @@ private void initAttr(Context context, AttributeSet attrs) {
                 mTextRight = textValue.string;
             }
         }
-        //mTextLeft = array.getString(R.styleable.EasyTextView_textLeft);
-        //mTextRight = array.getString(R.styleable.EasyTextView_textRight);
         mIconColor = array.getColorStateList(R.styleable.EasyTextView_iconColor);
         mLeftColor = array.getColorStateList(R.styleable.EasyTextView_textLeftColor);
         mRightColor = array.getColorStateList(R.styleable.EasyTextView_textRightColor);
@@ -388,6 +435,11 @@ private void initAttr(Context context, AttributeSet attrs) {
         mTextRightStyle = array.getInt(R.styleable.EasyTextView_textRightStyle, Typeface.NORMAL);
         mTextCenterStyle = array.getInt(R.styleable.EasyTextView_textCenterStyle, Typeface.NORMAL);
         autoMaxHeight = array.getBoolean(R.styleable.EasyTextView_autoMaxHeight, false);
+        orientation = switchEnumToOrientation(array.getInt(R.styleable
+                .EasyTextView_gradientOrientation, 0));
+        startColor = array.getColorStateList(R.styleable.EasyTextView_startSolid);
+        centerColor = array.getColorStateList(R.styleable.EasyTextView_centerSolid);
+        endColor = array.getColorStateList(R.styleable.EasyTextView_endSolid);
         array.recycle();
     }
 
@@ -859,14 +911,19 @@ public EasyTextView build() {
     }
 
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if(this.autoMaxHeight) {
+        try {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        } catch (Exception e) {
+
+        }
+        if (this.autoMaxHeight) {
             int lead = 0;
-            if(this.getPaint() != null) {
+            if (this.getPaint() != null) {
                 lead = this.getPaint().getFontMetricsInt().leading * 3;
             }
-
-            this.setMeasuredDimension(this.getMeasuredWidth(), (int)(Math.max((float)this.getMeasuredHeight(), Math.max(this.mLeftSize, this.mRightSize)) + (float)lead));
+            this.setMeasuredDimension(this.getMeasuredWidth(), (int) (Math.max((float) this
+                    .getMeasuredHeight(), Math.max(this.mLeftSize, this.mRightSize)) + (float)
+                    lead));
         }
 
     }
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -7,17 +7,22 @@
             <enum name="oval" value="1" />
             <enum name="LINE" value="2" />
         </attr>
-        <attr name="totalRadius"  format="dimension"/>
-        <attr name="radiusTopLeft" format="dimension"/>
-        <attr name="radiusBottomLeft" format="dimension"/>
-        <attr name="radiusTopRight" format="dimension"/>
-        <attr name="radiusBottomRight" format="dimension"/>
-        <attr name="strokeColor"  format="color"/>
+        <attr name="totalRadius" format="dimension" />
+        <attr name="radiusTopLeft" format="dimension" />
+        <attr name="radiusBottomLeft" format="dimension" />
+        <attr name="radiusTopRight" format="dimension" />
+        <attr name="radiusBottomRight" format="dimension" />
+        <attr name="strokeColor" format="color" />
         <attr name="strokeWidth" format="dimension" />
-        <attr name="soildBac" format="color"/>
-        <attr name="textPadding" format="dimension"/>
-        <attr name="textLeft" format="reference|string"/>
-        <attr name="textRight" format="reference|string"/>
+        <attr name="soildBac" format="color" />
+        <attr name="textPadding" format="dimension" />
+        <attr name="textLeft" format="string" />
+        <attr name="textRight" format="string" />
+        <attr name="iconColor" format="reference|color" />
+        <attr name="textLeftColor" format="reference|color" />
+        <attr name="textRightColor" format="reference|color" />
+        <attr name="textLeftSize" format="dimension" />
+        <attr name="textRightSize" format="dimension" />
         <attr name="textLeftStyle">
             <enum name="bold" value="1" />
             <enum name="italic" value="2" />
@@ -30,11 +35,19 @@
             <enum name="bold" value="1" />
             <enum name="italic" value="2" />
         </attr>
-        <attr name="iconColor" format="reference|color"/>
-        <attr name="textLeftColor" format="reference|color"/>
-        <attr name="textRightColor" format="reference|color"/>
-        <attr name="textLeftSize" format="dimension"/>
-        <attr name="textRightSize" format="dimension"/>
-        <attr name="autoMaxHeight" format="boolean"/>
+        <attr name="autoMaxHeight" format="boolean" />
+        <attr name="gradientOrientation">
+            <enum name="top_bottom" value="0" />
+            <enum name="tp_bl" value="1" />
+            <enum name="right_left" value="2" />
+            <enum name="br_tl" value="3" />
+            <enum name="bottom_top" value="4" />
+            <enum name="bl_tr" value="5" />
+            <enum name="left_right" value="6" />
+            <enum name="tl_br" value="7" />
+        </attr>
+        <attr name="startSolid" format="reference|color" />
+        <attr name="centerSolid" format="reference|color" />
+        <attr name="endSolid" format="reference|color" />
     </declare-styleable>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ dependencies {`
`31`	`31`	`})`
`32`	`32`	`compile 'com.android.support:appcompat-v7:26.+'`
`33`	`33`	`testCompile 'junit:junit:4.12'`
`34`		`- compile 'com.github.sdfdzx:SupperShape:v1.0.0'`
	`34`	`+ compile 'com.github.sdfdzx:SupperShape:v1.0.3'`
`35`	`35`	`}`