Merge pull request #50 from liy010/master

axelra-ag · May 16, 2024 · d37e373 · d37e373
2 parents 559bb62 + a87b79a
commit d37e373
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/android/src/main/java/com/reactnativereanimatedtext/CustomLineHeightSpan.java b/android/src/main/java/com/reactnativereanimatedtext/CustomLineHeightSpan.java
@@ -10,7 +10,7 @@
 import android.graphics.Paint;
 import android.text.style.LineHeightSpan;
 
-import com.facebook.react.views.text.ReactSpan;
+import com.facebook.react.views.text.internal.span.ReactSpan;
 
 /**
  * We use a custom {@link LineHeightSpan}, because `lineSpacingExtra` is broken. Details here:

diff --git a/android/src/main/java/com/reactnativereanimatedtext/JBBaseTextShadowNode.java b/android/src/main/java/com/reactnativereanimatedtext/JBBaseTextShadowNode.java
@@ -28,23 +28,23 @@
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.text.CustomLetterSpacingSpan;
-import com.facebook.react.views.text.CustomStyleSpan;
-import com.facebook.react.views.text.ReactAbsoluteSizeSpan;
-import com.facebook.react.views.text.ReactBackgroundColorSpan;
-import com.facebook.react.views.text.ReactForegroundColorSpan;
+import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
+import com.facebook.react.views.text.internal.span.CustomStyleSpan;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
 import com.facebook.react.views.text.ReactRawTextShadowNode;
-import com.facebook.react.views.text.ReactSpan;
-import com.facebook.react.views.text.ReactStrikethroughSpan;
-import com.facebook.react.views.text.ReactTagSpan;
-import com.facebook.react.views.text.ReactTextInlineImageShadowNode;
+import com.facebook.react.views.text.internal.span.ReactSpan;
+import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
+import com.facebook.react.views.text.internal.span.ReactTagSpan;
+import com.facebook.react.views.text.internal.ReactTextInlineImageShadowNode;
 import com.facebook.react.views.text.ReactTextViewManagerCallback;
 import com.facebook.react.views.text.ReactTypefaceUtils;
-import com.facebook.react.views.text.ReactUnderlineSpan;
-import com.facebook.react.views.text.ShadowStyleSpan;
+import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
+import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
 import com.facebook.react.views.text.TextAttributes;
-import com.facebook.react.views.text.TextInlineImageSpan;
-import com.facebook.react.views.text.TextInlineViewPlaceholderSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.react.views.text.TextTransform;
 import com.facebook.yoga.YogaDirection;
 import com.facebook.yoga.YogaUnit;

diff --git a/android/src/main/java/com/reactnativereanimatedtext/JBTextShadowNode.java b/android/src/main/java/com/reactnativereanimatedtext/JBTextShadowNode.java
@@ -34,10 +34,10 @@
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.views.text.FontMetricsUtil;
-import com.facebook.react.views.text.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
 import com.facebook.react.views.text.ReactTextUpdate;
 import com.facebook.react.views.text.ReactTextViewManagerCallback;
-import com.facebook.react.views.text.TextInlineViewPlaceholderSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;
 import com.facebook.yoga.YogaMeasureFunction;

diff --git a/android/src/main/java/com/reactnativereanimatedtext/JBTextViewManager.java b/android/src/main/java/com/reactnativereanimatedtext/JBTextViewManager.java
@@ -29,7 +29,7 @@
 import com.facebook.react.views.text.ReactTextViewManager;
 import com.facebook.react.views.text.ReactTextViewManagerCallback;
 import com.facebook.react.views.text.TextAttributeProps;
-import com.facebook.react.views.text.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.yoga.YogaMeasureMode;
 import java.util.Map;