custom fontWeight numeric values for Text on Android

RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java

@@ -47,7 +47,7 @@ public List<ReactPackage> getPackages() {
 
   @Override
   public void onCreate() {
-    ReactFontManager.getInstance().addCustomFont(this, "Srisakdi", R.font.srisakdi);
+    ReactFontManager.getInstance().addCustomFont(this, "Rubik", R.font.rubik);
     super.onCreate();
   }
 

RNTester/android/app/src/main/res/font/rubik.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+  <font app:fontStyle="normal" app:fontWeight="300" app:font="@font/rubik_light"/>
+  <font app:fontStyle="normal" app:fontWeight="400" app:font="@font/rubik_regular"/>
+  <font app:fontStyle="normal" app:fontWeight="500" app:font="@font/rubik_medium" />
+  <font app:fontStyle="normal" app:fontWeight="700" app:font="@font/rubik_bold" />
+  <font app:fontStyle="italic" app:fontWeight="500" app:font="@font/rubik_medium_italic" />
+</font-family>

RNTester/js/examples/Text/TextExample.android.js

@@ -181,13 +181,41 @@ class TextExample extends React.Component<{}> {
               <Text style={{fontFamily: 'notoserif', fontStyle: 'italic'}}>
                 NotoSerif Italic (Missing Font file)
               </Text>
-              <Text style={{fontFamily: 'Srisakdi'}}>Srisakdi Regular</Text>
               <Text
                 style={{
-                  fontFamily: 'Srisakdi',
-                  fontWeight: 'bold',
+                  fontFamily: 'Rubik',
+                  fontWeight: 'normal',
+                }}>
+                Rubik Regular
+              </Text>
+              <Text
+                style={{
+                  fontFamily: 'Rubik',
+                  fontWeight: '300',
+                }}>
+                Rubik Light
+              </Text>
+              <Text
+                style={{
+                  fontFamily: 'Rubik',
+                  fontWeight: '700',
+                }}>
+                Rubik Bold
+              </Text>
+              <Text
+                style={{
+                  fontFamily: 'Rubik',
+                  fontWeight: '500',
+                }}>
+                Rubik Medium
+              </Text>
+              <Text
+                style={{
+                  fontFamily: 'Rubik',
+                  fontStyle: 'italic',
+                  fontWeight: '500',
                 }}>
-                Srisakdi Bold
+                Rubik Medium Italic
               </Text>
             </View>
           </View>
@@ -203,15 +231,15 @@ class TextExample extends React.Component<{}> {
         </RNTesterBlock>
         <RNTesterBlock title="Font Weight">
           <Text style={{fontWeight: 'bold'}}>Move fast and be bold</Text>
-          <Text style={{fontWeight: 'normal'}}>Move fast and be bold</Text>
+          <Text style={{fontWeight: 'normal'}}>Move fast and be normal</Text>
         </RNTesterBlock>
         <RNTesterBlock title="Font Style">
-          <Text style={{fontStyle: 'italic'}}>Move fast and be bold</Text>
-          <Text style={{fontStyle: 'normal'}}>Move fast and be bold</Text>
+          <Text style={{fontStyle: 'italic'}}>Move fast and be italic</Text>
+          <Text style={{fontStyle: 'normal'}}>Move fast and be normal</Text>
         </RNTesterBlock>
         <RNTesterBlock title="Font Style and Weight">
           <Text style={{fontStyle: 'italic', fontWeight: 'bold'}}>
-            Move fast and be bold
+            Move fast and be both bold and italic
           </Text>
         </RNTesterBlock>
         <RNTesterBlock title="Text Decoration">

ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java

@@ -104,7 +104,7 @@ private static void apply(
     }
 
     if (family != null) {
-      typeface = ReactFontManager.getInstance().getTypeface(family, want, assetManager);
+      typeface = ReactFontManager.getInstance().getTypeface(family, want, weight, assetManager);
     } else if (typeface != null) {
       // TODO(t9055065): Fix custom fonts getting applied to text children with different style
       typeface = Typeface.create(typeface, want);

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

@@ -488,13 +488,11 @@ public void setFontFamily(@Nullable String fontFamily) {
   public void setFontWeight(@Nullable String fontWeightString) {
     int fontWeightNumeric =
         fontWeightString != null ? parseNumericFontWeight(fontWeightString) : -1;
-    int fontWeight = UNSET;
-    if (fontWeightNumeric >= 500 || "bold".equals(fontWeightString)) {
-      fontWeight = Typeface.BOLD;
-    } else if ("normal".equals(fontWeightString)
-        || (fontWeightNumeric != -1 && fontWeightNumeric < 500)) {
-      fontWeight = Typeface.NORMAL;
-    }
+    int fontWeight = fontWeightNumeric != -1 ? fontWeightNumeric : Typeface.NORMAL;
+
+    if (fontWeight == 700 || "bold".equals(fontWeightString)) fontWeight = Typeface.BOLD;
+    else if (fontWeight == 400 || "normal".equals(fontWeightString)) fontWeight = Typeface.NORMAL;
+
     if (fontWeight != mFontWeight) {
       mFontWeight = fontWeight;
       markUpdated();

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java

@@ -13,6 +13,7 @@
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.util.SparseArray;
 
 import androidx.annotation.NonNull;
@@ -54,23 +55,32 @@ public static ReactFontManager getInstance() {
     return sReactFontManagerInstance;
   }
 
+  public @Nullable Typeface getTypeface(
+    String fontFamilyName,
+    int style,
+    AssetManager assetManager) {
+    return getTypeface(fontFamilyName, style, 0, assetManager);
+  }
+
   public @Nullable Typeface getTypeface(
       String fontFamilyName,
       int style,
+      int weight,
       AssetManager assetManager) {
+    if(mCustomTypefaceCache.containsKey(fontFamilyName)) {
+      Typeface typeface = mCustomTypefaceCache.get(fontFamilyName);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && weight >= 100 && weight <= 1000) {
+        return Typeface.create(typeface, weight, (style & Typeface.ITALIC) != 0);
+      }
+      return Typeface.create(typeface, style);
+    }
+
     FontFamily fontFamily = mFontCache.get(fontFamilyName);
     if (fontFamily == null) {
       fontFamily = new FontFamily();
       mFontCache.put(fontFamilyName, fontFamily);
     }
 
-    if(mCustomTypefaceCache.containsKey(fontFamilyName)) {
-      return Typeface.create(
-        mCustomTypefaceCache.get(fontFamilyName),
-        style
-      );
-    }
-
     Typeface typeface = fontFamily.getTypeface(style);
     if (typeface == null) {
       typeface = createTypeface(fontFamilyName, style, assetManager);