fix font type support

ibrahimsn98 · May 27, 2019 · dd379cd · dd379cd
1 parent 95a0025
commit dd379cd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -89,6 +89,6 @@ A lightweight Android material bottom navigation bar library
 	}
 	
 	dependencies {
-	        implementation 'com.github.ibrahimsn98:NiceBottomBar:1.3'
+	        implementation 'com.github.ibrahimsn98:NiceBottomBar:1.8'
 	}
 ```
diff --git a/app/src/main/res/font/quicksand.xml b/app/src/main/res/font/quicksand.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <font
+            app:fontStyle="normal"
+            app:fontWeight="400"
+            app:font="@font/quicksand_regular" />
+
+    <font
+            app:fontStyle="normal"
+            app:fontWeight="700"
+            app:font="@font/quicksand_bold" />
+
+</font-family>
diff --git a/app/src/main/res/font/quicksand_bold.ttf b/app/src/main/res/font/quicksand_bold.ttf
diff --git a/app/src/main/res/font/quicksand_regular.ttf b/app/src/main/res/font/quicksand_regular.ttf
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -12,6 +12,7 @@
 		android:layout_height="60dp"
 		android:layout_gravity="bottom"
 	    app:menu="@menu/bottom_menu"
+		app:itemFontFamily="@font/quicksand"
 	    app:indicatorInterpolator="anticipateOvershoot" />
 
 </FrameLayout>
diff --git a/lib/src/main/java/me/ibrahimsn/lib/NiceBottomBar.kt b/lib/src/main/java/me/ibrahimsn/lib/NiceBottomBar.kt
@@ -16,6 +16,7 @@ import android.annotation.SuppressLint
 import android.animation.ArgbEvaluator
 import android.graphics.*
 import android.os.Build
+import android.support.v4.content.res.ResourcesCompat
 
 class NiceBottomBar : View {
 
@@ -92,8 +93,7 @@ class NiceBottomBar : View {
         paintBadge.color = itemBadgeColor
 
         if (itemFontFamily != 0)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                paintText.typeface = resources.getFont(itemFontFamily)
+            paintText.typeface = ResourcesCompat.getFont(context, itemFontFamily)
     }
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {