Update java package name to yoga

Differential Revision: D4271420

fbshipit-source-id: b3cf150569a2331868410339cd19e5c694f2059e
This commit is contained in:
Emil Sjolander 2016-12-05 02:56:20 -08:00 committed by Martin Konicek
parent f82bbe1dc1
commit b5283785ec
41 changed files with 84 additions and 84 deletions

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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 { public class YogaConstants {

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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. * Helpers for building measure output value.

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import javax.annotation.Nullable;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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. // This only exists for legacy reasons. It will be removed sometime in the near future.
public interface YogaNodeAPI<YogaNodeType extends YogaNodeAPI> { public interface YogaNodeAPI<YogaNodeType extends YogaNodeAPI> {

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory. * 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; import com.facebook.proguard.annotations.DoNotStrip;

View File

@ -6,13 +6,13 @@ import javax.annotation.Nullable;
import java.util.Locale; import java.util.Locale;
import com.facebook.csslayout.YogaAlign; import com.facebook.yoga.YogaAlign;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import com.facebook.csslayout.YogaFlexDirection; import com.facebook.yoga.YogaFlexDirection;
import com.facebook.csslayout.YogaJustify; import com.facebook.yoga.YogaJustify;
import com.facebook.csslayout.YogaOverflow; import com.facebook.yoga.YogaOverflow;
import com.facebook.csslayout.YogaPositionType; import com.facebook.yoga.YogaPositionType;
import com.facebook.csslayout.YogaWrap; import com.facebook.yoga.YogaWrap;
import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.uimanager.annotations.ReactPropGroup; import com.facebook.react.uimanager.annotations.ReactPropGroup;

View File

@ -13,17 +13,17 @@ import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import com.facebook.csslayout.YogaAlign; import com.facebook.yoga.YogaAlign;
import com.facebook.csslayout.YogaEdge; import com.facebook.yoga.YogaEdge;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import com.facebook.csslayout.YogaDirection; import com.facebook.yoga.YogaDirection;
import com.facebook.csslayout.YogaFlexDirection; import com.facebook.yoga.YogaFlexDirection;
import com.facebook.csslayout.YogaJustify; import com.facebook.yoga.YogaJustify;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNode; import com.facebook.yoga.YogaNode;
import com.facebook.csslayout.YogaOverflow; import com.facebook.yoga.YogaOverflow;
import com.facebook.csslayout.YogaPositionType; import com.facebook.yoga.YogaPositionType;
import com.facebook.csslayout.YogaWrap; import com.facebook.yoga.YogaWrap;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
import com.facebook.react.uimanager.annotations.ReactPropertyHolder; import com.facebook.react.uimanager.annotations.ReactPropertyHolder;

View File

@ -9,7 +9,7 @@
package com.facebook.react.uimanager; package com.facebook.react.uimanager;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import java.util.Arrays; import java.util.Arrays;

View File

@ -14,7 +14,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import com.facebook.common.logging.FLog; 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.infer.annotation.Assertions;
import com.facebook.react.animation.Animation; import com.facebook.react.animation.Animation;
import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Arguments;

View File

@ -2,7 +2,7 @@
package com.facebook.react.uimanager; package com.facebook.react.uimanager;
import com.facebook.csslayout.YogaNode; import com.facebook.yoga.YogaNode;
import com.facebook.react.common.ClearableSynchronizedPool; import com.facebook.react.common.ClearableSynchronizedPool;
/** /**

View File

@ -9,9 +9,9 @@
package com.facebook.react.views.art; package com.facebook.react.views.art;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNodeAPI; import com.facebook.yoga.YogaNodeAPI;
import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ThemedReactContext;

View File

@ -16,7 +16,7 @@ import java.util.Map;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PorterDuff.Mode; 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.backends.pipeline.Fresco;
import com.facebook.drawee.controller.AbstractDraweeControllerBuilder; import com.facebook.drawee.controller.AbstractDraweeControllerBuilder;
import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.JSApplicationIllegalArgumentException;

View File

@ -30,7 +30,7 @@ import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import com.facebook.common.util.UriUtil; 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.AbstractDraweeControllerBuilder;
import com.facebook.drawee.controller.BaseControllerListener; import com.facebook.drawee.controller.BaseControllerListener;
import com.facebook.drawee.controller.ControllerListener; import com.facebook.drawee.controller.ControllerListener;

View File

@ -19,10 +19,10 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNodeAPI; import com.facebook.yoga.YogaNodeAPI;
import com.facebook.csslayout.YogaMeasureOutput; import com.facebook.yoga.YogaMeasureOutput;
import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactProp;

View File

@ -15,10 +15,10 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.SeekBar; import android.widget.SeekBar;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNodeAPI; import com.facebook.yoga.YogaNodeAPI;
import com.facebook.csslayout.YogaMeasureOutput; import com.facebook.yoga.YogaMeasureOutput;
import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.MapBuilder; import com.facebook.react.common.MapBuilder;
import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.LayoutShadowNode;

View File

@ -14,10 +14,10 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNodeAPI; import com.facebook.yoga.YogaNodeAPI;
import com.facebook.csslayout.YogaMeasureOutput; import com.facebook.yoga.YogaMeasureOutput;
import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReactContext;
import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.SimpleViewManager;

View File

@ -9,7 +9,7 @@
package com.facebook.react.views.text; package com.facebook.react.views.text;
import com.facebook.csslayout.YogaNode; import com.facebook.yoga.YogaNode;
import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.LayoutShadowNode;
/** /**

View File

@ -30,12 +30,12 @@ import android.text.style.UnderlineSpan;
import android.view.Gravity; import android.view.Gravity;
import android.widget.TextView; import android.widget.TextView;
import com.facebook.csslayout.YogaDirection; import com.facebook.yoga.YogaDirection;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNodeAPI; import com.facebook.yoga.YogaNodeAPI;
import com.facebook.csslayout.YogaMeasureOutput; import com.facebook.yoga.YogaMeasureOutput;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMap;

View File

@ -16,7 +16,7 @@ import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.widget.TextView; import android.widget.TextView;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManager;

View File

@ -18,7 +18,7 @@ import android.content.res.Resources;
import android.net.Uri; import android.net.Uri;
import com.facebook.common.util.UriUtil; 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.AbstractDraweeControllerBuilder;
import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.ViewProps;

View File

@ -28,7 +28,7 @@ import android.view.View;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.TextView; import android.widget.TextView;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReactContext;

View File

@ -16,11 +16,11 @@ import android.util.TypedValue;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import com.facebook.csslayout.YogaDirection; import com.facebook.yoga.YogaDirection;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
import com.facebook.csslayout.YogaMeasureFunction; import com.facebook.yoga.YogaMeasureFunction;
import com.facebook.csslayout.YogaNodeAPI; import com.facebook.yoga.YogaNodeAPI;
import com.facebook.csslayout.YogaMeasureOutput; import com.facebook.yoga.YogaMeasureOutput;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.common.annotations.VisibleForTesting;
import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.PixelUtil;

View File

@ -4,7 +4,7 @@ package com.facebook.react.views.view;
import android.view.View; import android.view.View;
import com.facebook.csslayout.YogaMeasureMode; import com.facebook.yoga.YogaMeasureMode;
public class MeasureUtil { public class MeasureUtil {

View File

@ -27,7 +27,7 @@ import android.graphics.RectF;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; 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.common.annotations.VisibleForTesting;
import com.facebook.react.uimanager.FloatUtil; import com.facebook.react.uimanager.FloatUtil;
import com.facebook.react.uimanager.Spacing; import com.facebook.react.uimanager.Spacing;

View File

@ -19,7 +19,7 @@ import android.graphics.Rect;
import android.os.Build; import android.os.Build;
import android.view.View; 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.JSApplicationIllegalArgumentException;
import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMap;

View File

@ -58,7 +58,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node,
float height, float height,
YGMeasureMode heightMode) { YGMeasureMode heightMode) {
if (auto obj = YGNodeJobject(node)->lockLocal()) { if (auto obj = YGNodeJobject(node)->lockLocal()) {
static auto measureFunc = findClassLocal("com/facebook/csslayout/YogaNode") static auto measureFunc = findClassLocal("com/facebook/yoga/YogaNode")
->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure"); ->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
YGTransferLayoutDirection(node, obj); YGTransferLayoutDirection(node, obj);
@ -81,7 +81,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node,
} }
struct JYogaLogLevel : public JavaClass<JYogaLogLevel> { struct JYogaLogLevel : public JavaClass<JYogaLogLevel> {
static constexpr auto kJavaDescriptor = "Lcom/facebook/csslayout/YogaLogLevel;"; static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogLevel;";
}; };
static global_ref<jobject> *jLogger; static global_ref<jobject> *jLogger;
@ -89,7 +89,7 @@ static int YGLog(YGLogLevel level, const char *format, va_list args) {
char buffer[256]; char buffer[256];
int result = vsnprintf(buffer, sizeof(buffer), format, args); 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<void(local_ref<JYogaLogLevel>, jstring)>("log"); ->getMethod<void(local_ref<JYogaLogLevel>, jstring)>("log");
static auto logLevelFromInt = static auto logLevelFromInt =
@ -261,7 +261,7 @@ YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio);
jint JNI_OnLoad(JavaVM *vm, void *) { jint JNI_OnLoad(JavaVM *vm, void *) {
return initialize(vm, [] { return initialize(vm, [] {
registerNatives("com/facebook/csslayout/YogaNode", registerNatives("com/facebook/yoga/YogaNode",
{ {
YGMakeNativeMethod(jni_YGNodeNew), YGMakeNativeMethod(jni_YGNodeNew),
YGMakeNativeMethod(jni_YGNodeFree), YGMakeNativeMethod(jni_YGNodeFree),

View File

@ -11,11 +11,11 @@ package com.facebook.react.uimanager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import com.facebook.csslayout.YogaAlign; import com.facebook.yoga.YogaAlign;
import com.facebook.csslayout.YogaConstants; import com.facebook.yoga.YogaConstants;
import com.facebook.csslayout.YogaFlexDirection; import com.facebook.yoga.YogaFlexDirection;
import com.facebook.csslayout.YogaJustify; import com.facebook.yoga.YogaJustify;
import com.facebook.csslayout.YogaPositionType; import com.facebook.yoga.YogaPositionType;
import com.facebook.react.bridge.JavaOnlyMap; import com.facebook.react.bridge.JavaOnlyMap;
import org.junit.After; import org.junit.After;