diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaAlign.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaAlign.java index 0ad384501a..74bcde7326 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaAlign.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaAlign.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaConstants.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaConstants.java index 03db3feb16..93dc9f818b 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaConstants.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaConstants.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; public class YogaConstants { diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDimension.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDimension.java index a73f49c8ad..dfa3c09367 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDimension.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDimension.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDirection.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDirection.java index 2c0473aae4..f0955bd7ea 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDirection.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaDirection.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaEdge.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaEdge.java index 811297f0b8..8c6c7a7456 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaEdge.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaEdge.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaExperimentalFeature.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaExperimentalFeature.java index f0d91f0b48..19c540cae8 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaExperimentalFeature.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaExperimentalFeature.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaFlexDirection.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaFlexDirection.java index b16128db10..d01cc96ade 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaFlexDirection.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaFlexDirection.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaJustify.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaJustify.java index eb328dd4dd..be481bf312 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaJustify.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaJustify.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogLevel.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogLevel.java index 75d74e08f7..b6b33caa11 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogLevel.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogLevel.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogger.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogger.java index 82bd19b654..a856b7be43 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogger.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaLogger.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureFunction.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureFunction.java index 84a4852101..6570e5b5b7 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureFunction.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureFunction.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureMode.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureMode.java index 6ea9d0381d..68fb6c5df6 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureMode.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureMode.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureOutput.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureOutput.java index 6c96800892..7bb845a0d6 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureOutput.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaMeasureOutput.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; /** * Helpers for building measure output value. diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNode.java index 99314b02d2..2aa11faa79 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNode.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNode.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import javax.annotation.Nullable; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNodeAPI.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNodeAPI.java index f56401e7da..cb3b5be875 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNodeAPI.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaNodeAPI.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; // This only exists for legacy reasons. It will be removed sometime in the near future. public interface YogaNodeAPI { diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaOverflow.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaOverflow.java index 0fa04bb417..d0509e2401 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaOverflow.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaOverflow.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPositionType.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPositionType.java index 0215c62761..fe2d4fd23f 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPositionType.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPositionType.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPrintOptions.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPrintOptions.java index fae22f0a9e..dae2866064 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPrintOptions.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaPrintOptions.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaWrap.java b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaWrap.java index 8a371d5e52..91cc3d5a8a 100644 --- a/ReactAndroid/src/main/java/com/facebook/csslayout/YogaWrap.java +++ b/ReactAndroid/src/main/java/com/facebook/csslayout/YogaWrap.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.csslayout; +package com.facebook.yoga; import com.facebook.proguard.annotations.DoNotStrip; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java index 464aef2bd0..e824b8bd60 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java @@ -6,13 +6,13 @@ import javax.annotation.Nullable; import java.util.Locale; -import com.facebook.csslayout.YogaAlign; -import com.facebook.csslayout.YogaConstants; -import com.facebook.csslayout.YogaFlexDirection; -import com.facebook.csslayout.YogaJustify; -import com.facebook.csslayout.YogaOverflow; -import com.facebook.csslayout.YogaPositionType; -import com.facebook.csslayout.YogaWrap; +import com.facebook.yoga.YogaAlign; +import com.facebook.yoga.YogaConstants; +import com.facebook.yoga.YogaFlexDirection; +import com.facebook.yoga.YogaJustify; +import com.facebook.yoga.YogaOverflow; +import com.facebook.yoga.YogaPositionType; +import com.facebook.yoga.YogaWrap; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactPropGroup; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java index d36ed7f4a2..c09fc38694 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java @@ -13,17 +13,17 @@ import javax.annotation.Nullable; import java.util.ArrayList; -import com.facebook.csslayout.YogaAlign; -import com.facebook.csslayout.YogaEdge; -import com.facebook.csslayout.YogaConstants; -import com.facebook.csslayout.YogaDirection; -import com.facebook.csslayout.YogaFlexDirection; -import com.facebook.csslayout.YogaJustify; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNode; -import com.facebook.csslayout.YogaOverflow; -import com.facebook.csslayout.YogaPositionType; -import com.facebook.csslayout.YogaWrap; +import com.facebook.yoga.YogaAlign; +import com.facebook.yoga.YogaEdge; +import com.facebook.yoga.YogaConstants; +import com.facebook.yoga.YogaDirection; +import com.facebook.yoga.YogaFlexDirection; +import com.facebook.yoga.YogaJustify; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNode; +import com.facebook.yoga.YogaOverflow; +import com.facebook.yoga.YogaPositionType; +import com.facebook.yoga.YogaWrap; import com.facebook.infer.annotation.Assertions; import com.facebook.react.uimanager.annotations.ReactPropertyHolder; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java index 98c8053103..2dc9ffb66d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java @@ -9,7 +9,7 @@ package com.facebook.react.uimanager; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import java.util.Arrays; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java index 36525e27fa..f176d07a1a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.List; import com.facebook.common.logging.FLog; -import com.facebook.csslayout.YogaDirection; +import com.facebook.yoga.YogaDirection; import com.facebook.infer.annotation.Assertions; import com.facebook.react.animation.Animation; import com.facebook.react.bridge.Arguments; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java index a7b06720be..c71b261237 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java @@ -2,7 +2,7 @@ package com.facebook.react.uimanager; -import com.facebook.csslayout.YogaNode; +import com.facebook.yoga.YogaNode; import com.facebook.react.common.ClearableSynchronizedPool; /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java index b54b973a8e..23d5907296 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java @@ -9,9 +9,9 @@ package com.facebook.react.views.art; -import com.facebook.csslayout.YogaMeasureMode; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNodeAPI; +import com.facebook.yoga.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNodeAPI; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.ThemedReactContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java index 8d21a4450c..a6fa2bb9c0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java @@ -16,7 +16,7 @@ import java.util.Map; import android.graphics.Color; import android.graphics.PorterDuff.Mode; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.controller.AbstractDraweeControllerBuilder; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java index b826198e96..a30d1c8653 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java @@ -30,7 +30,7 @@ import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import com.facebook.common.util.UriUtil; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.drawee.controller.AbstractDraweeControllerBuilder; import com.facebook.drawee.controller.BaseControllerListener; import com.facebook.drawee.controller.ControllerListener; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java index 82b51a0003..48266ba0b1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java @@ -19,10 +19,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; -import com.facebook.csslayout.YogaMeasureMode; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNodeAPI; -import com.facebook.csslayout.YogaMeasureOutput; +import com.facebook.yoga.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNodeAPI; +import com.facebook.yoga.YogaMeasureOutput; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.annotations.ReactProp; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java index 1c8b6de11e..36fb73fd82 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java @@ -15,10 +15,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.SeekBar; -import com.facebook.csslayout.YogaMeasureMode; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNodeAPI; -import com.facebook.csslayout.YogaMeasureOutput; +import com.facebook.yoga.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNodeAPI; +import com.facebook.yoga.YogaMeasureOutput; import com.facebook.react.bridge.ReactContext; import com.facebook.react.common.MapBuilder; import com.facebook.react.uimanager.LayoutShadowNode; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java index a5345fee30..b1a49de220 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java @@ -14,10 +14,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; -import com.facebook.csslayout.YogaMeasureMode; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNodeAPI; -import com.facebook.csslayout.YogaMeasureOutput; +import com.facebook.yoga.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNodeAPI; +import com.facebook.yoga.YogaMeasureOutput; import com.facebook.react.bridge.ReactContext; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.SimpleViewManager; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java index 7600172574..3f4b2b9363 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java @@ -9,7 +9,7 @@ package com.facebook.react.views.text; -import com.facebook.csslayout.YogaNode; +import com.facebook.yoga.YogaNode; import com.facebook.react.uimanager.LayoutShadowNode; /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java index 582505e9a2..53e2bbca53 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java @@ -30,12 +30,12 @@ import android.text.style.UnderlineSpan; import android.view.Gravity; import android.widget.TextView; -import com.facebook.csslayout.YogaDirection; -import com.facebook.csslayout.YogaConstants; -import com.facebook.csslayout.YogaMeasureMode; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNodeAPI; -import com.facebook.csslayout.YogaMeasureOutput; +import com.facebook.yoga.YogaDirection; +import com.facebook.yoga.YogaConstants; +import com.facebook.yoga.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNodeAPI; +import com.facebook.yoga.YogaMeasureOutput; import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReadableMap; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java index 255581a100..2e49a90487 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java @@ -16,7 +16,7 @@ import android.text.TextUtils; import android.view.Gravity; import android.widget.TextView; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.BaseViewManager; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java index a28e2ca546..ed251529ed 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java @@ -18,7 +18,7 @@ import android.content.res.Resources; import android.net.Uri; import com.facebook.common.util.UriUtil; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.drawee.controller.AbstractDraweeControllerBuilder; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.ViewProps; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index 2e18a18d4f..5384aec5eb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -28,7 +28,7 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.widget.TextView; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReactContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java index 51920266af..3536f37707 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java @@ -16,11 +16,11 @@ import android.util.TypedValue; import android.view.ViewGroup; import android.widget.EditText; -import com.facebook.csslayout.YogaDirection; -import com.facebook.csslayout.YogaMeasureMode; -import com.facebook.csslayout.YogaMeasureFunction; -import com.facebook.csslayout.YogaNodeAPI; -import com.facebook.csslayout.YogaMeasureOutput; +import com.facebook.yoga.YogaDirection; +import com.facebook.yoga.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureFunction; +import com.facebook.yoga.YogaNodeAPI; +import com.facebook.yoga.YogaMeasureOutput; import com.facebook.infer.annotation.Assertions; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.uimanager.PixelUtil; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java index 74aeb7b971..338428f0e7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/MeasureUtil.java @@ -4,7 +4,7 @@ package com.facebook.react.views.view; import android.view.View; -import com.facebook.csslayout.YogaMeasureMode; +import com.facebook.yoga.YogaMeasureMode; public class MeasureUtil { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java index 019d10c4a1..ab84ef512b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java @@ -27,7 +27,7 @@ import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.os.Build; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.uimanager.FloatUtil; import com.facebook.react.uimanager.Spacing; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java index cc394758b9..b57fb619dc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java @@ -19,7 +19,7 @@ import android.graphics.Rect; import android.os.Build; import android.view.View; -import com.facebook.csslayout.YogaConstants; +import com.facebook.yoga.YogaConstants; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; diff --git a/ReactAndroid/src/main/jni/first-party/csslayoutjni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/csslayoutjni/jni/YGJNI.cpp index 085ba5b971..2e9fd99db9 100644 --- a/ReactAndroid/src/main/jni/first-party/csslayoutjni/jni/YGJNI.cpp +++ b/ReactAndroid/src/main/jni/first-party/csslayoutjni/jni/YGJNI.cpp @@ -58,7 +58,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node, float height, YGMeasureMode heightMode) { if (auto obj = YGNodeJobject(node)->lockLocal()) { - static auto measureFunc = findClassLocal("com/facebook/csslayout/YogaNode") + static auto measureFunc = findClassLocal("com/facebook/yoga/YogaNode") ->getMethod("measure"); YGTransferLayoutDirection(node, obj); @@ -81,7 +81,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node, } struct JYogaLogLevel : public JavaClass { - static constexpr auto kJavaDescriptor = "Lcom/facebook/csslayout/YogaLogLevel;"; + static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogLevel;"; }; static global_ref *jLogger; @@ -89,7 +89,7 @@ static int YGLog(YGLogLevel level, const char *format, va_list args) { char buffer[256]; int result = vsnprintf(buffer, sizeof(buffer), format, args); - static auto logFunc = findClassLocal("com/facebook/csslayout/YogaLogger") + static auto logFunc = findClassLocal("com/facebook/yoga/YogaLogger") ->getMethod, jstring)>("log"); static auto logLevelFromInt = @@ -261,7 +261,7 @@ YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio); jint JNI_OnLoad(JavaVM *vm, void *) { return initialize(vm, [] { - registerNatives("com/facebook/csslayout/YogaNode", + registerNatives("com/facebook/yoga/YogaNode", { YGMakeNativeMethod(jni_YGNodeNew), YGMakeNativeMethod(jni_YGNodeFree), diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java index 453a6abb55..f516e3b405 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java @@ -11,11 +11,11 @@ package com.facebook.react.uimanager; import android.util.DisplayMetrics; -import com.facebook.csslayout.YogaAlign; -import com.facebook.csslayout.YogaConstants; -import com.facebook.csslayout.YogaFlexDirection; -import com.facebook.csslayout.YogaJustify; -import com.facebook.csslayout.YogaPositionType; +import com.facebook.yoga.YogaAlign; +import com.facebook.yoga.YogaConstants; +import com.facebook.yoga.YogaFlexDirection; +import com.facebook.yoga.YogaJustify; +import com.facebook.yoga.YogaPositionType; import com.facebook.react.bridge.JavaOnlyMap; import org.junit.After;