diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java index 0b80e4c..0c833ac 100755 --- a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java +++ b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java @@ -14,7 +14,6 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.view.ContextThemeWrapper; -import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; @@ -28,6 +27,8 @@ import java.util.ArrayList; import java.util.List; +import androidx.core.content.res.ResourcesCompat; + public class FloatingActionMenu extends ViewGroup { private static final int ANIMATION_DURATION = 300; @@ -165,10 +166,13 @@ private void init(Context context, AttributeSet attrs) { mLabelsMaxLines = attr.getInt(R.styleable.FloatingActionMenu_menu_labels_maxLines, -1); mMenuFabSize = attr.getInt(R.styleable.FloatingActionMenu_menu_fab_size, FloatingActionButton.SIZE_NORMAL); mLabelsStyle = attr.getResourceId(R.styleable.FloatingActionMenu_menu_labels_style, 0); - String customFont = attr.getString(R.styleable.FloatingActionMenu_menu_labels_customFont); + int customFont = attr.getResourceId( + R.styleable.FloatingActionMenu_menu_labels_customFont, + 0 + ); try { - if (!TextUtils.isEmpty(customFont)) { - mCustomTypefaceFromFont = Typeface.createFromAsset(getContext().getAssets(), customFont); + if (customFont != 0) { + mCustomTypefaceFromFont = ResourcesCompat.getFont(context, customFont); } } catch (RuntimeException ex) { throw new IllegalArgumentException("Unable to load specified custom font: " + customFont, ex); @@ -985,7 +989,7 @@ public void addMenuButton(FloatingActionButton fab, int index) { public void removeAllMenuButtons() { close(true); - + List viewsToRemove = new ArrayList<>(); for (int i = 0; i < getChildCount(); i++) { View v = getChildAt(i); diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index a88bc79..c1192bb 100755 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -66,7 +66,7 @@ - + @@ -84,4 +84,4 @@ - \ No newline at end of file + diff --git a/sample/src/main/res/font/nunito_sans_regular.ttf b/sample/src/main/res/font/nunito_sans_regular.ttf new file mode 100755 index 0000000..35c0c4a Binary files /dev/null and b/sample/src/main/res/font/nunito_sans_regular.ttf differ diff --git a/sample/src/main/res/layout/menus_fragment.xml b/sample/src/main/res/layout/menus_fragment.xml index ee76f6a..e9be576 100644 --- a/sample/src/main/res/layout/menus_fragment.xml +++ b/sample/src/main/res/layout/menus_fragment.xml @@ -45,6 +45,7 @@ fab:menu_labels_hideAnimation="@anim/jump_to_down" fab:menu_animationDelayPerItem="0" fab:menu_shadowColor="#444" + fab:menu_labels_customFont="@font/nunito_sans_regular" fab:menu_colorNormal="#FFB805" fab:menu_colorPressed="#F2AB00" fab:menu_colorRipple="#D99200"> @@ -285,4 +286,4 @@ - \ No newline at end of file +