Merge pull request hanks-zyh#47 from PGMacDesign/master

hanks-zyh · web-flow · commit 60a1abdce207 · 2017-03-09T10:03:59.000+08:00
Bugfix for setTextColor
diff --git a/htextview-library/src/main/java/com/hanks/htextview/HTextView.java b/htextview-library/src/main/java/com/hanks/htextview/HTextView.java
@@ -161,6 +161,15 @@ public void setAnimateType(HTextViewType type) {
         initHText(attrs, defStyle);
     }
 
+    
+    @Override
+    public void setTextColor(@ColorInt int color) {
+        //Check for RainbowText. Do not alter color if on that type due to paint conflicts
+        if(animateType != 8){
+            super.setTextColor(color);
+        }
+    }
+    
     @Override
     public Parcelable onSaveInstanceState() {
         Parcelable superState = super.onSaveInstanceState();
diff --git a/htextview-library/src/main/java/com/hanks/htextview/animatetext/HText.java b/htextview-library/src/main/java/com/hanks/htextview/animatetext/HText.java
@@ -82,6 +82,10 @@ public abstract class HText implements IHText {
         drawFrame(canvas);
     }
 
+    public void setTextColor(int color){
+        mHTextView.setTextColor(color);
+    }
+    
     private void prepareAnimate() {
         mTextSize = mHTextView.getTextSize();
         mPaint.setTextSize(mTextSize);
