Use the UNSET constant more consistently

cubuspl42 · Nov 1, 2023 · 6bc6966 · 6bc6966
1 parent 4f59241
commit 6bc6966
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/...-native/ReactAndroid/src/main/java/com/facebook/react/common/assets/ReactFontManager.java b/...-native/ReactAndroid/src/main/java/com/facebook/react/common/assets/ReactFontManager.java
@@ -7,6 +7,8 @@
 
 package com.facebook.react.common.assets;
 
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Typeface;
@@ -167,7 +169,6 @@ public static class TypefaceStyle {
 
     public static final int BOLD = 700;
     public static final int NORMAL = 400;
-    public static final int UNSET = -1;
 
     private static final int MIN_WEIGHT = 1;
     private static final int MAX_WEIGHT = 1000;

diff --git a/...id/src/main/java/com/facebook/react/internal/views/text/EffectiveTextAttributeProvider.kt b/...id/src/main/java/com/facebook/react/internal/views/text/EffectiveTextAttributeProvider.kt
@@ -1,16 +1,12 @@
 package com.facebook.react.internal.views.text
 
-import com.facebook.react.common.assets.ReactFontManager
+import com.facebook.react.views.text.TextAttributeProps.UNSET
 import com.facebook.react.views.text.TextTransform
 
 /**
  * Interface for an entity providing effective text attributes of a text node/fragment
  */
 interface EffectiveTextAttributeProvider : BasicTextAttributeProvider {
-  companion object {
-    const val UNSET = ReactFontManager.TypefaceStyle.UNSET
-  }
-
   val textTransform: TextTransform
 
   val effectiveLetterSpacing: Float

diff --git a/...d/src/main/java/com/facebook/react/internal/views/text/HierarchicTextAttributeProvider.kt b/...d/src/main/java/com/facebook/react/internal/views/text/HierarchicTextAttributeProvider.kt
@@ -1,6 +1,7 @@
 package com.facebook.react.internal.views.text
 
 import com.facebook.react.views.text.ReactBaseTextShadowNode
+import com.facebook.react.views.text.TextAttributeProps.UNSET
 import com.facebook.react.views.text.TextAttributes
 import com.facebook.react.views.text.TextTransform
 
@@ -37,7 +38,7 @@ class HierarchicTextAttributeProvider(
       return if (parentTextAttributes == null || parentTextAttributes.effectiveFontSize != fontSize) {
         fontSize
       } else {
-        EffectiveTextAttributeProvider.UNSET
+        UNSET
       }
     }
 

diff --git a/...tive/ReactAndroid/src/main/java/com/facebook/react/internal/views/text/TextLayoutUtils.kt b/...tive/ReactAndroid/src/main/java/com/facebook/react/internal/views/text/TextLayoutUtils.kt
@@ -11,18 +11,17 @@ import android.content.Context
 import android.graphics.Color
 import android.text.*
 import android.view.View
-import com.facebook.react.common.assets.ReactFontManager
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.ReactAccessibilityDelegate
 import com.facebook.react.internal.views.text.fragments.TextFragmentList
 import com.facebook.react.views.text.*
+import com.facebook.react.views.text.TextAttributeProps.UNSET
 
 /**
  * Utility methods for building [Spannable]s
  */
 object TextLayoutUtils {
   private const val INLINE_VIEW_PLACEHOLDER = "0"
-  private const val UNSET = ReactFontManager.TypefaceStyle.UNSET
 
   fun buildSpannableFromTextFragmentList(
     context: Context,

diff --git a/...eact-native/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/...eact-native/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -7,6 +7,8 @@
 
 package com.facebook.react.views.text;
 
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
 import android.content.res.AssetManager;
 import android.graphics.Paint;
 import android.graphics.Typeface;
@@ -61,11 +63,11 @@ public void updateMeasureState(TextPaint paint) {
   }
 
   public int getStyle() {
-    return mStyle == ReactFontManager.TypefaceStyle.UNSET ? Typeface.NORMAL : mStyle;
+    return mStyle == UNSET ? Typeface.NORMAL : mStyle;
   }
 
   public int getWeight() {
-    return mWeight == ReactFontManager.TypefaceStyle.UNSET
+    return mWeight == UNSET
         ? ReactFontManager.TypefaceStyle.NORMAL
         : mWeight;
   }

diff --git a/...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -7,6 +7,9 @@
 
 package com.facebook.react.views.text;
 
+
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Build;
@@ -21,7 +24,6 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.assets.ReactFontManager;
 import com.facebook.react.internal.views.text.BasicTextAttributeProvider;
 import com.facebook.react.internal.views.text.HierarchicTextAttributeProvider;
 import com.facebook.react.internal.views.text.TextLayoutUtils;
@@ -59,7 +61,6 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode implement
   // character.
   // https://en.wikipedia.org/wiki/Bi-directional_text#weak_characters
   private static final String INLINE_VIEW_PLACEHOLDER = "0";
-  public static final int UNSET = ReactFontManager.TypefaceStyle.UNSET;
 
   public static final String PROP_SHADOW_OFFSET = "textShadowOffset";
   public static final String PROP_SHADOW_OFFSET_WIDTH = "width";

diff --git a/...-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/...-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -7,6 +7,8 @@
 
 package com.facebook.react.views.text;
 
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
 import android.os.Build;
 import android.text.BoringLayout;
 import android.text.Layout;

diff --git a/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java b/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
@@ -7,13 +7,16 @@
 
 package com.facebook.react.views.text;
 
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
 import android.content.res.AssetManager;
 import android.graphics.Typeface;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.assets.ReactFontManager;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,7 +48,7 @@ public static int parseFontWeight(@Nullable String fontWeightString) {
           return 900;
       }
     }
-    return ReactFontManager.TypefaceStyle.UNSET;
+    return UNSET;
   }
 
   public static int parseFontStyle(@Nullable String fontStyleString) {
@@ -57,7 +60,7 @@ public static int parseFontStyle(@Nullable String fontStyleString) {
         return Typeface.NORMAL;
       }
     }
-    return ReactFontManager.TypefaceStyle.UNSET;
+    return UNSET;
   }
 
   public static @Nullable String parseFontVariant(@Nullable ReadableArray fontVariantArray) {

diff --git a/...actAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/...actAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -7,6 +7,8 @@
 
 package com.facebook.react.views.textinput;
 
+import static com.facebook.react.views.text.TextAttributeProps.UNSET;
+
 import android.text.Layout;
 import android.util.TypedValue;
 import android.view.ViewGroup;