added custom font support

islamdidarmd · Nov 25, 2018 · e310730 · e310730
1 parent c8c9c1e
commit e310730
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/loadingbutton/build.gradle b/loadingbutton/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
-        versionName "0.1.2"
+        versionName "0.1.4"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/loadingbutton/src/main/java/com/droidbond/loadingbutton/LoadingButton.kt b/loadingbutton/src/main/java/com/droidbond/loadingbutton/LoadingButton.kt
@@ -7,6 +7,7 @@ import android.graphics.PorterDuff
 import android.graphics.Typeface
 import android.support.annotation.NonNull
 import android.support.annotation.Nullable
+import android.support.v4.content.res.ResourcesCompat
 import android.util.AttributeSet
 import android.util.Log
 import android.view.Gravity
@@ -96,7 +97,13 @@ class LoadingButton @JvmOverloads constructor(
         var size = array!!.getDimension(R.styleable.app_textSize, 14f * Resources.getSystem().displayMetrics.density)
         size /= Resources.getSystem().displayMetrics.density
 
-        tvText!!.textSize = size
+        tvText?.textSize = size
+
+        if (array!!.hasValue(R.styleable.app_customFontFamily)) {
+            val fontId = array!!.getResourceId(R.styleable.app_customFontFamily, -1)
+            val typeface = ResourcesCompat.getFont(context, fontId)
+            tvText?.typeface = typeface
+        }
 
         array?.recycle()
     }

diff --git a/loadingbutton/src/main/res/values/styles.xml b/loadingbutton/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
         <attr name="textSize" format="dimension"/>
         <attr name="progressColor" format="color"/>
         <attr name="background" format="reference"/>
+        <attr name="customFontFamily" format="reference"/>
         <attr name="progressBarSize" format="enum">
             <enum name="large" value="64"/>
             <enum name="medium" value="48"/>