status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename enums 

Summary: new name, start by renaming enums

Differential Revision: D4244360
This commit is contained in:
Emil Sjolander 2016-12-02 05:47:43 -08:00 committed by Ahmed El-Helw
parent 75561f7f78
commit b7c2cfcb34
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
View File

@ -9,7 +9,7 @@
package com.facebook.react.flat; package com.facebook.react.flat;
import com.facebook.csslayout.CSSMeasureMode; import com.facebook.csslayout.YogaMeasureMode;
import com.facebook.csslayout.CSSNodeAPI; import com.facebook.csslayout.CSSNodeAPI;
import com.facebook.csslayout.MeasureOutput; import com.facebook.csslayout.MeasureOutput;
import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.BaseViewManager;
@ -26,9 +26,9 @@ import com.facebook.react.views.art.ARTSurfaceView;
public long measure( public long measure(
CSSNodeAPI node, CSSNodeAPI node,
float width, float width,
CSSMeasureMode widthMode, YogaMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { YogaMeasureMode heightMode) {
throw new IllegalStateException("SurfaceView should have explicit width and height set"); throw new IllegalStateException("SurfaceView should have explicit width and height set");
} }
}; };

4
ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
View File

@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import com.facebook.csslayout.CSSDirection; import com.facebook.csslayout.YogaDirection;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactApplicationContext;
@ -115,7 +115,7 @@ public class FlatUIImplementation extends UIImplementation {
ReactShadowNode node = new FlatRootShadowNode(); ReactShadowNode node = new FlatRootShadowNode();
I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance(); I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
if (sharedI18nUtilInstance.isRTL(mReactContext)) { if (sharedI18nUtilInstance.isRTL(mReactContext)) {
node.setLayoutDirection(CSSDirection.RTL); node.setLayoutDirection(YogaDirection.RTL);
} }
return node; return node;
} }

14
ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
View File

@ -16,8 +16,8 @@ import android.text.Layout;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import com.facebook.csslayout.CSSDirection; import com.facebook.csslayout.YogaDirection;
import com.facebook.csslayout.CSSMeasureMode; import com.facebook.csslayout.YogaMeasureMode;
import com.facebook.csslayout.CSSNodeAPI; import com.facebook.csslayout.CSSNodeAPI;
import com.facebook.csslayout.MeasureOutput; import com.facebook.csslayout.MeasureOutput;
import com.facebook.fbui.textlayoutbuilder.TextLayoutBuilder; import com.facebook.fbui.textlayoutbuilder.TextLayoutBuilder;
@ -76,9 +76,9 @@ import com.facebook.react.uimanager.annotations.ReactProp;
public long measure( public long measure(
CSSNodeAPI node, CSSNodeAPI node,
float width, float width,
CSSMeasureMode widthMode, YogaMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { YogaMeasureMode heightMode) {
CharSequence text = getText(); CharSequence text = getText();
if (TextUtils.isEmpty(text)) { if (TextUtils.isEmpty(text)) {
@ -155,7 +155,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
if (mDrawCommand == null) { if (mDrawCommand == null) {
mDrawCommand = new DrawTextLayout(createTextLayout( mDrawCommand = new DrawTextLayout(createTextLayout(
(int) Math.ceil(right - left), (int) Math.ceil(right - left),
CSSMeasureMode.EXACTLY, YogaMeasureMode.EXACTLY,
TextUtils.TruncateAt.END, TextUtils.TruncateAt.END,
true, true,
mNumberOfLines, mNumberOfLines,
@ -276,7 +276,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
} }
public Layout.Alignment getAlignment() { public Layout.Alignment getAlignment() {
boolean isRtl = getLayoutDirection() == CSSDirection.RTL; boolean isRtl = getLayoutDirection() == YogaDirection.RTL;
switch (mAlignment) { switch (mAlignment) {
// Layout.Alignment.RIGHT and Layout.Alignment.LEFT are @hide :( // Layout.Alignment.RIGHT and Layout.Alignment.LEFT are @hide :(
case Gravity.LEFT: case Gravity.LEFT:
@ -295,7 +295,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
private static Layout createTextLayout( private static Layout createTextLayout(
int width, int width,
CSSMeasureMode widthMode, YogaMeasureMode widthMode,
TextUtils.TruncateAt ellipsize, TextUtils.TruncateAt ellipsize,
boolean shouldIncludeFontPadding, boolean shouldIncludeFontPadding,
int maxLines, int maxLines,

6
ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
View File

@ -18,7 +18,7 @@ import android.util.TypedValue;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import com.facebook.csslayout.CSSMeasureMode; import com.facebook.csslayout.YogaMeasureMode;
import com.facebook.csslayout.CSSNodeAPI; import com.facebook.csslayout.CSSNodeAPI;
import com.facebook.csslayout.MeasureOutput; import com.facebook.csslayout.MeasureOutput;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
@ -78,9 +78,9 @@ public class RCTTextInput extends RCTVirtualText implements AndroidView, CSSNode
public long measure( public long measure(
CSSNodeAPI node, CSSNodeAPI node,
float width, float width,
CSSMeasureMode widthMode, YogaMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { YogaMeasureMode heightMode) {
// measure() should never be called before setThemedContext() // measure() should never be called before setThemedContext()
EditText editText = Assertions.assertNotNull(mEditText); EditText editText = Assertions.assertNotNull(mEditText);