From e9dba410eb109391cab3e28a31ed1c55bbe8aa37 Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Mon, 5 Dec 2016 02:56:20 -0800 Subject: [PATCH] Update java package name to yoga Summary: Update package name of java code to refer to yoga instead of csslayout. Still need to change the name of the folder where this code resides but that requires update github sync scripts etc so it is safer and easier to split these diffs apart. Differential Revision: D4271420 --- .../main/java/com/facebook/react/flat/AndroidView.java | 2 +- .../facebook/react/flat/FlatARTSurfaceViewManager.java | 6 +++--- .../com/facebook/react/flat/FlatUIImplementation.java | 2 +- .../com/facebook/react/flat/NativeViewWrapper.java | 2 +- .../src/main/java/com/facebook/react/flat/RCTText.java | 10 +++++----- .../java/com/facebook/react/flat/RCTTextInput.java | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java index 8fd10bbb862..98d0f89d52c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java @@ -29,7 +29,7 @@ interface AndroidView { void resetPaddingChanged(); /** - * Get the padding for a certain spacingType defined in com.facebook.csslayout.Spacing + * Get the padding for a certain spacingType defined in com.facebook.yoga.Spacing */ float getPadding(int spacingType); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java index cbbac0a24b7..11e548ed950 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java @@ -9,9 +9,9 @@ package com.facebook.react.flat; -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.uimanager.BaseViewManager; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.views.art.ARTSurfaceView; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java index f3fff4ba412..c734e5b2af9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.facebook.csslayout.YogaDirection; +import com.facebook.yoga.YogaDirection; import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.ReactApplicationContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java index 4eac3152a9e..73d7163f0be 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java @@ -11,7 +11,7 @@ package com.facebook.react.flat; import javax.annotation.Nullable; -import com.facebook.csslayout.YogaMeasureFunction; +import com.facebook.yoga.YogaMeasureFunction; import com.facebook.react.uimanager.ReactStylesDiffMap; import com.facebook.react.uimanager.ReactShadowNode; import com.facebook.react.uimanager.ThemedReactContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java index 1020216d883..9a264451c50 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java @@ -16,11 +16,11 @@ import android.text.Layout; import android.text.TextUtils; import android.view.Gravity; -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.fbui.textlayoutbuilder.TextLayoutBuilder; import com.facebook.fbui.textlayoutbuilder.glyphwarmer.GlyphWarmerImpl; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java index 818d781e689..b845c172319 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java @@ -18,10 +18,10 @@ import android.util.TypedValue; import android.view.ViewGroup; import android.widget.EditText; -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.infer.annotation.Assertions; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.Spacing;