From 2c04da063bbb35d0849680540e1cdeec606be200 Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Wed, 23 Jan 2019 15:16:06 +0200 Subject: [PATCH] [android] Fix dynamically loaded font compatibility Fixes #905 Adds support for react-native-dynamic-fonts --- android/src/main/java/com/horcrux/svg/TSpanView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/horcrux/svg/TSpanView.java b/android/src/main/java/com/horcrux/svg/TSpanView.java index 7f6eb2af..04c95760 100644 --- a/android/src/main/java/com/horcrux/svg/TSpanView.java +++ b/android/src/main/java/com/horcrux/svg/TSpanView.java @@ -26,6 +26,7 @@ import android.view.ViewParent; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.annotations.ReactProp; +import com.facebook.react.views.text.ReactFontManager; import javax.annotation.Nullable; @@ -929,7 +930,7 @@ class TSpanView extends TextView { typeface = Typeface.createFromAsset(assetManager, path); } catch (Exception ignored2) { try { - typeface = Typeface.create(fontFamily, fontStyle); + typeface = ReactFontManager.getInstance().getTypeface(fontFamily, fontStyle, assetManager); } catch (Exception ignored3) { } }