diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java index a12ca76d5b2f7e..88d42d83368bde 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java @@ -31,21 +31,21 @@ 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.span.CustomLetterSpacingSpan; -import com.facebook.react.views.text.span.CustomLineHeightSpan; -import com.facebook.react.views.text.span.CustomStyleSpan; -import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan; -import com.facebook.react.views.text.span.ReactBackgroundColorSpan; -import com.facebook.react.views.text.span.ReactClickableSpan; -import com.facebook.react.views.text.span.ReactForegroundColorSpan; -import com.facebook.react.views.text.span.ReactSpan; -import com.facebook.react.views.text.span.ReactStrikethroughSpan; -import com.facebook.react.views.text.span.ReactTagSpan; -import com.facebook.react.views.text.span.ReactUnderlineSpan; -import com.facebook.react.views.text.span.SetSpanOperation; -import com.facebook.react.views.text.span.ShadowStyleSpan; -import com.facebook.react.views.text.span.TextInlineImageSpan; -import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan; +import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan; +import com.facebook.react.views.text.internal.span.CustomLineHeightSpan; +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.ReactClickableSpan; +import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan; +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.span.ReactUnderlineSpan; +import com.facebook.react.views.text.internal.span.SetSpanOperation; +import com.facebook.react.views.text.internal.span.ShadowStyleSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan; import com.facebook.yoga.YogaDirection; import com.facebook.yoga.YogaUnit; import com.facebook.yoga.YogaValue; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java index 9f49d1cc6b09a0..7a74418f1bec67 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java @@ -8,7 +8,7 @@ package com.facebook.react.views.text; import com.facebook.react.uimanager.LayoutShadowNode; -import com.facebook.react.views.text.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; import com.facebook.yoga.YogaNode; /** Base class for {@link YogaNode}s that represent inline images. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java index b0281bd122e9dd..96bb3495cd31d0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java @@ -32,8 +32,8 @@ import com.facebook.react.uimanager.UIViewOperationQueue; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.events.RCTEventEmitter; -import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan; -import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan; +import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan; +import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan; import com.facebook.yoga.YogaBaselineFunction; import com.facebook.yoga.YogaConstants; import com.facebook.yoga.YogaDirection; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java index 1bd4a48a290e5d..cf50efcbfa1a0a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java @@ -40,9 +40,9 @@ import com.facebook.react.uimanager.ViewDefaults; import com.facebook.react.uimanager.common.UIManagerType; import com.facebook.react.uimanager.common.ViewUtil; -import com.facebook.react.views.text.span.ReactTagSpan; -import com.facebook.react.views.text.span.TextInlineImageSpan; -import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan; +import com.facebook.react.views.text.internal.span.ReactTagSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan; import com.facebook.react.views.view.ReactViewBackgroundManager; import java.util.ArrayList; import java.util.Collections; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java index ce5560f5634d7a..de2f290935549f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java @@ -25,8 +25,8 @@ import com.facebook.react.uimanager.StateWrapper; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ViewProps; -import com.facebook.react.views.text.span.ReactClickableSpan; -import com.facebook.react.views.text.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.ReactClickableSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; import com.facebook.yoga.YogaMeasureMode; import java.util.HashMap; import java.util.Map; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java index 9a7470458a5c29..8c555f2f978671 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java @@ -38,19 +38,19 @@ import com.facebook.react.uimanager.ReactStylesDiffMap; import com.facebook.react.uimanager.ViewProps; import com.facebook.react.views.text.fragments.BridgeTextFragmentList; -import com.facebook.react.views.text.span.CustomLetterSpacingSpan; -import com.facebook.react.views.text.span.CustomLineHeightSpan; -import com.facebook.react.views.text.span.CustomStyleSpan; -import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan; -import com.facebook.react.views.text.span.ReactBackgroundColorSpan; -import com.facebook.react.views.text.span.ReactClickableSpan; -import com.facebook.react.views.text.span.ReactForegroundColorSpan; -import com.facebook.react.views.text.span.ReactStrikethroughSpan; -import com.facebook.react.views.text.span.ReactTagSpan; -import com.facebook.react.views.text.span.ReactUnderlineSpan; -import com.facebook.react.views.text.span.SetSpanOperation; -import com.facebook.react.views.text.span.ShadowStyleSpan; -import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan; +import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan; +import com.facebook.react.views.text.internal.span.CustomLineHeightSpan; +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.ReactClickableSpan; +import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan; +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.span.ReactUnderlineSpan; +import com.facebook.react.views.text.internal.span.SetSpanOperation; +import com.facebook.react.views.text.internal.span.ShadowStyleSpan; +import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan; import com.facebook.yoga.YogaConstants; import com.facebook.yoga.YogaMeasureMode; import com.facebook.yoga.YogaMeasureOutput; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java index 96097d4979c680..eab5471ef7cc7f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java @@ -38,19 +38,19 @@ import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole; import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role; import com.facebook.react.views.text.fragments.MapBufferTextFragmentList; -import com.facebook.react.views.text.span.CustomLetterSpacingSpan; -import com.facebook.react.views.text.span.CustomLineHeightSpan; -import com.facebook.react.views.text.span.CustomStyleSpan; -import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan; -import com.facebook.react.views.text.span.ReactBackgroundColorSpan; -import com.facebook.react.views.text.span.ReactClickableSpan; -import com.facebook.react.views.text.span.ReactForegroundColorSpan; -import com.facebook.react.views.text.span.ReactStrikethroughSpan; -import com.facebook.react.views.text.span.ReactTagSpan; -import com.facebook.react.views.text.span.ReactUnderlineSpan; -import com.facebook.react.views.text.span.SetSpanOperation; -import com.facebook.react.views.text.span.ShadowStyleSpan; -import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan; +import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan; +import com.facebook.react.views.text.internal.span.CustomLineHeightSpan; +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.ReactClickableSpan; +import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan; +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.span.ReactUnderlineSpan; +import com.facebook.react.views.text.internal.span.SetSpanOperation; +import com.facebook.react.views.text.internal.span.ShadowStyleSpan; +import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan; import com.facebook.yoga.YogaConstants; import com.facebook.yoga.YogaMeasureMode; import com.facebook.yoga.YogaMeasureOutput; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt index 03745623cdc2e9..e72afed9458222 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt @@ -17,19 +17,19 @@ import com.facebook.react.uimanager.PixelUtil import com.facebook.react.uimanager.ReactAccessibilityDelegate import com.facebook.react.views.text.fragments.TextFragment import com.facebook.react.views.text.fragments.TextFragmentList -import com.facebook.react.views.text.span.CustomLetterSpacingSpan -import com.facebook.react.views.text.span.CustomLineHeightSpan -import com.facebook.react.views.text.span.CustomStyleSpan -import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan -import com.facebook.react.views.text.span.ReactBackgroundColorSpan -import com.facebook.react.views.text.span.ReactClickableSpan -import com.facebook.react.views.text.span.ReactForegroundColorSpan -import com.facebook.react.views.text.span.ReactStrikethroughSpan -import com.facebook.react.views.text.span.ReactTagSpan -import com.facebook.react.views.text.span.ReactUnderlineSpan -import com.facebook.react.views.text.span.SetSpanOperation -import com.facebook.react.views.text.span.ShadowStyleSpan -import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan +import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan +import com.facebook.react.views.text.internal.span.CustomLineHeightSpan +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.ReactClickableSpan +import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan +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.span.ReactUnderlineSpan +import com.facebook.react.views.text.internal.span.SetSpanOperation +import com.facebook.react.views.text.internal.span.ShadowStyleSpan +import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan /** Utility methods for building [Spannable]s */ internal object TextLayoutUtils { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java index fbc7286c4f5c5b..3bfba353fab313 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java @@ -22,7 +22,7 @@ import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.views.text.ReactTextInlineImageShadowNode; -import com.facebook.react.views.text.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; import com.facebook.yoga.YogaConstants; import java.util.Locale; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java index 06691964f21857..2f3cf1cc3daa82 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java @@ -27,7 +27,7 @@ import com.facebook.react.modules.fresco.ReactNetworkImageRequest; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.views.image.ImageResizeMode; -import com.facebook.react.views.text.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; /** * FrescoBasedTextInlineImageSpan is a span for Images that are inside . It computes its size diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomLetterSpacingSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLetterSpacingSpan.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomLetterSpacingSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLetterSpacingSpan.java index d7cb3d44e325e2..6de79326400c55 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomLetterSpacingSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLetterSpacingSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomLineHeightSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomLineHeightSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java index 69462326cf440c..6c6858d82f98a2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomLineHeightSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.graphics.Paint; import android.text.style.LineHeightSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomStyleSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomStyleSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.java index 624fd6b4c9c1d8..5ec7e645385952 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/CustomStyleSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.content.res.AssetManager; import android.graphics.Paint; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactAbsoluteSizeSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactAbsoluteSizeSpan.java similarity index 89% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactAbsoluteSizeSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactAbsoluteSizeSpan.java index 9f1e646d267e8d..460bcd20c6a5b3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactAbsoluteSizeSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactAbsoluteSizeSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.style.AbsoluteSizeSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactBackgroundColorSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactBackgroundColorSpan.java similarity index 89% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactBackgroundColorSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactBackgroundColorSpan.java index b9f1ba05bb295d..a04f2439dffe64 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactBackgroundColorSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactBackgroundColorSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.style.BackgroundColorSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactClickableSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactClickableSpan.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactClickableSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactClickableSpan.java index 987401aefc790a..8aba070b1d210f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactClickableSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactClickableSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.TextPaint; import android.text.style.ClickableSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactForegroundColorSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactForegroundColorSpan.java similarity index 89% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactForegroundColorSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactForegroundColorSpan.java index 51bb0e7388c0f5..0a7b489b9230c3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactForegroundColorSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactForegroundColorSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.style.ForegroundColorSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactSpan.java similarity index 88% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactSpan.java index 74182494fe591b..1b47e63d19bf7e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; /* * Enables us to distinguish between spans that were added by React Native and spans that were diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactStrikethroughSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactStrikethroughSpan.java similarity index 88% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactStrikethroughSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactStrikethroughSpan.java index 5997aedfc57f26..d2164156b1818a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactStrikethroughSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactStrikethroughSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.style.StrikethroughSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactTagSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactTagSpan.java similarity index 91% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactTagSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactTagSpan.java index e8d2a73caa5431..04497ba19954e2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactTagSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactTagSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; /** * Instances of this class are used to place reactTag information of nested text react nodes into diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactUnderlineSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactUnderlineSpan.java similarity index 87% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactUnderlineSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactUnderlineSpan.java index c0fc4b075e4c9d..7676230f0b6c51 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ReactUnderlineSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactUnderlineSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.style.UnderlineSpan; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/SetSpanOperation.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/SetSpanOperation.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.java index ccb34d13581e58..40b523268cc14f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/SetSpanOperation.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.Spannable; import android.text.SpannableStringBuilder; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ShadowStyleSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.java similarity index 92% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ShadowStyleSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.java index 6800203c4acfa7..63325f32638b12 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/ShadowStyleSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.text.TextPaint; import android.text.style.CharacterStyle; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/TextInlineImageSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineImageSpan.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/TextInlineImageSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineImageSpan.java index 6dae41ba4d5ed0..34638cefd1d87e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/TextInlineImageSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineImageSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.graphics.drawable.Drawable; import android.text.Spannable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/TextInlineViewPlaceholderSpan.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/TextInlineViewPlaceholderSpan.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.java index bf0c9b9305e682..acb9c93c63b890 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/span/TextInlineViewPlaceholderSpan.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.text.span; +package com.facebook.react.views.text.internal.span; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java index 6885ce07c5d13f..71132bede4159b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java @@ -52,19 +52,19 @@ import com.facebook.react.uimanager.StateWrapper; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.EventDispatcher; -import com.facebook.react.views.text.span.CustomLetterSpacingSpan; -import com.facebook.react.views.text.span.CustomLineHeightSpan; -import com.facebook.react.views.text.span.CustomStyleSpan; -import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan; -import com.facebook.react.views.text.span.ReactBackgroundColorSpan; -import com.facebook.react.views.text.span.ReactForegroundColorSpan; -import com.facebook.react.views.text.span.ReactSpan; -import com.facebook.react.views.text.span.ReactStrikethroughSpan; +import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan; +import com.facebook.react.views.text.internal.span.CustomLineHeightSpan; +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.internal.span.ReactSpan; +import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan; import com.facebook.react.views.text.ReactTextUpdate; import com.facebook.react.views.text.ReactTypefaceUtils; -import com.facebook.react.views.text.span.ReactUnderlineSpan; +import com.facebook.react.views.text.internal.span.ReactUnderlineSpan; import com.facebook.react.views.text.TextAttributes; -import com.facebook.react.views.text.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; import com.facebook.react.views.text.TextLayoutManager; import com.facebook.react.views.view.ReactViewBackgroundManager; import java.util.ArrayList; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index f96f5d5004ccd6..190c422f6c44e0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -69,7 +69,7 @@ import com.facebook.react.views.text.ReactTextViewManagerCallback; import com.facebook.react.views.text.ReactTypefaceUtils; import com.facebook.react.views.text.TextAttributeProps; -import com.facebook.react.views.text.span.TextInlineImageSpan; +import com.facebook.react.views.text.internal.span.TextInlineImageSpan; import com.facebook.react.views.text.TextLayoutManager; import com.facebook.react.views.text.TextLayoutManagerMapBuffer; import com.facebook.react.views.text.TextTransform; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.kt index b7b9e8c226d429..f55c90af78de44 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.kt @@ -8,7 +8,7 @@ package com.facebook.react.views.text import android.graphics.Paint -import com.facebook.react.views.text.span.CustomLineHeightSpan +import com.facebook.react.views.text.internal.span.CustomLineHeightSpan import org.assertj.core.api.Assertions.assertThat import org.junit.Test import org.junit.runner.RunWith