修复设置文本描边后必须设置文本渐变才能显示正常的问题

Author: getActivity

library/src/main/java/com/hjq/shape/builder/TextColorBuilder.java

@@ -227,6 +227,7 @@ public SpannableStringBuilder buildTextSpannable(CharSequence text) {
         } else if (linearGradientFontSpan != null) {
             builder.setSpan(linearGradientFontSpan, 0, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         } else if (strokeFontSpan != null) {
+            strokeFontSpan.setTextSolidColor(mTextColor);
             builder.setSpan(strokeFontSpan, 0, builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 

library/src/main/java/com/hjq/shape/span/StrokeFontSpan.java

@@ -1,7 +1,9 @@
 package com.hjq.shape.span;
 
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
+import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -23,6 +25,9 @@ public class StrokeFontSpan extends CommonFontSpan {
     private int mTextStrokeColor;
     private int mTextStrokeSize;
 
+    /** 文本颜色 */
+    private int mTextSolidColor;
+
     /**
      * 构建一个文字描边的 Spannable 对象
      */
@@ -58,10 +63,22 @@ public void onDraw(@NonNull Canvas canvas, @NonNull Paint paint, CharSequence te
         // 设置粗体
         //mStrokePaint.setFakeBoldText(true);
         mStrokePaint.setColor(mTextStrokeColor);
+        // 绘制文本描边
         canvas.drawText(text, start, end, x, y, mStrokePaint);
+
+        // 绘制文本内容
+        if (mTextSolidColor != Color.TRANSPARENT) {
+            paint.setColor(mTextSolidColor);
+            canvas.drawText(text, start, end, x, y, paint);
+        }
+    }
+
+    public StrokeFontSpan setTextSolidColor(@ColorInt int color) {
+        mTextSolidColor = color;
+        return this;
     }
 
-    public StrokeFontSpan setTextStrokeColor(int color) {
+    public StrokeFontSpan setTextStrokeColor(@ColorInt int color) {
         mTextStrokeColor = color;
         return this;
     }