Merge pull request #110 from aureleoules/master

.setTextStyle method added
deano2390 · Jun 15, 2017 · a5baa24 · a5baa24
2 parents 25b345b + dd252a8
commit a5baa24
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java b/library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java
@@ -11,6 +11,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
@@ -374,6 +375,14 @@ private void setDismissText(CharSequence dismissText) {
         }
     }
 
+    private void setDismissStyle(Typeface dismissStyle) {
+        if (mDismissButton != null) {
+            mDismissButton.setTypeface(dismissStyle);
+
+            updateDismissButton();
+        }
+    }
+
     private void setTitleTextColor(int textColour) {
         if (mTitleTextView != null) {
             mTitleTextView.setTextColor(textColour);
@@ -463,6 +472,8 @@ public void setConfig(ShowcaseConfig config) {
         setFadeDuration(config.getFadeDuration());
         setContentTextColor(config.getContentTextColor());
         setDismissTextColor(config.getDismissTextColor());
+        setDismissStyle(config.getDismissTextStyle());
+
         setMaskColour(config.getMaskColor());
         setShape(config.getShape());
         setShapePadding(config.getShapePadding());
@@ -538,6 +549,11 @@ public Builder setDismissText(CharSequence dismissText) {
             return this;
         }
 
+        public Builder setDismissStyle(Typeface dismissStyle) {
+            showcaseView.setDismissStyle(dismissStyle);
+            return this;
+        }
+
         /**
          * Set the content text shown on the ShowcaseView.
          */

diff --git a/library/src/main/java/uk/co/deanwild/materialshowcaseview/ShowcaseConfig.java b/library/src/main/java/uk/co/deanwild/materialshowcaseview/ShowcaseConfig.java
@@ -1,6 +1,7 @@
 package uk.co.deanwild.materialshowcaseview;
 
 import android.graphics.Color;
+import android.graphics.Typeface;
 
 import uk.co.deanwild.materialshowcaseview.shape.CircleShape;
 import uk.co.deanwild.materialshowcaseview.shape.Shape;
@@ -16,6 +17,8 @@ public class ShowcaseConfig {
 
     private long mDelay = DEFAULT_DELAY;
     private int mMaskColour;
+    private Typeface mDismissTextStyle = Typeface.DEFAULT_BOLD;
+
     private int mContentTextColor;
     private int mDismissTextColor;
     private long mFadeDuration = DEFAULT_FADE_TIME;
@@ -61,6 +64,14 @@ public void setDismissTextColor(int dismissTextColor) {
         this.mDismissTextColor = dismissTextColor;
     }
 
+    public Typeface getDismissTextStyle() {
+        return mDismissTextStyle;
+    }
+
+    public void setDismissTextStyle(Typeface dismissTextStyle) {
+        this.mDismissTextStyle = dismissTextStyle;
+    }
+
     public long getFadeDuration() {
         return mFadeDuration;
     }