update PR based on facebook#35949

fabOnReact · Feb 9, 2023 · eb0b424 · eb0b424
1 parent c4d82d3
commit eb0b424
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -17,7 +17,6 @@
 @Nullsafe(Nullsafe.Mode.LOCAL)
 public class CustomStyleSpan extends MetricAffectingSpan implements ReactSpan {
 
-  private static final String TAG = "CustomStyleSpan";
   /**
    * A {@link MetricAffectingSpan} that allows to change the style of the displayed font.
    * CustomStyleSpan will try to load the fontFamily with the right style and weight from the
@@ -58,9 +57,9 @@ public CustomStyleSpan(
       int fontWeight,
       @Nullable String fontFeatureSettings,
       @Nullable String fontFamily,
+      AssetManager assetManager,
       TextAlignVertical textAlignVertical,
-      int textSize,
-      AssetManager assetManager) {
+      int textSize) {
     this(fontStyle, fontWeight, fontFeatureSettings, fontFamily, assetManager);
     mTextAlignVertical = textAlignVertical;
     mSize = textSize;

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -181,9 +181,9 @@ private static void buildSpannableFromFragment(
                       textAttributes.mFontWeight,
                       textAttributes.mFontFeatureSettings,
                       textAttributes.mFontFamily,
+                      context.getAssets(),
                       textAlignVertical,
-                      textAttributes.mFontSize,
-                      context.getAssets())));
+                      textAttributes.mFontSize)));
         }
         if (textAttributes.mIsUnderlineTextDecorationSet) {
           ops.add(new SetSpanOperation(start, end, new ReactUnderlineSpan()));