Merge pull request #32 from discord/fonts/ignore-weight-extension

Remove RN Android's bizarre font weight extension pattern
discord · Nov 21, 2022 · e79fc6d · e79fc6d
2 parents 2160436 + ce20ba5
commit e79fc6d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
@@ -189,13 +189,11 @@ private static Typeface createAssetTypefaceWithFallbacks(
     // Iterate over the list of fontFamilyNames, constructing new FontFamily objects
     // for use in the CustomFallbackBuilder below.
     for (String fontFamilyName : fontFamilyNames) {
-      String extension = EXTENSIONS[style];
       for (String fileExtension : FILE_EXTENSIONS) {
         String fileName =
           new StringBuilder()
             .append(FONTS_ASSET_PATH)
             .append(fontFamilyName)
-            .append(extension)
             .append(fileExtension)
             .toString();
         try {
@@ -212,6 +210,11 @@ private static Typeface createAssetTypefaceWithFallbacks(
       }
     }
 
+    // If there's some problem constructing fonts, fall back to the default behavior.
+    if (fontFamilies.size() == 0) {
+      return createAssetTypeface(fontFamilyNames[0], style, assetManager);
+    }
+
     Typeface.CustomFallbackBuilder fallbackBuilder = new Typeface.CustomFallbackBuilder(fontFamilies.get(0));
     for (int i = 1; i < fontFamilies.size(); i++) {
       fallbackBuilder.addCustomFallback(fontFamilies.get(i));