Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated java code

Browse Source 
Reviewed By: AaaChiuuu

Differential Revision: D4233198

fbshipit-source-id: 736d79be266e1b9f2d62e5fe6d901de47123cdc1
This commit is contained in:
Emil Sjolander
2016-11-29 12:28:55 -08:00
committed by Facebook Github Bot
parent 837814240b
commit b58c8ad916
22 changed files with 61 additions and 2284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+16 -17
View File
@@ -14,17 +14,16 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import com.facebook.csslayout.CSSAlign;
import com.facebook.csslayout.CSSEdge;
import com.facebook.csslayout.CSSConstants;
import com.facebook.csslayout.CSSDirection;
import com.facebook.csslayout.CSSFlexDirection;
import com.facebook.csslayout.CSSJustify;
import com.facebook.csslayout.CSSLayoutContext;
import com.facebook.csslayout.CSSNode;
import com.facebook.csslayout.CSSNodeAPI;
import com.facebook.csslayout.CSSOverflow;
import com.facebook.csslayout.CSSPositionType;
import com.facebook.csslayout.CSSWrap;
import com.facebook.csslayout.Spacing;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
@@ -352,8 +351,8 @@ public class ReactShadowNode {
return mShouldNotifyOnLayout;
}
public void calculateLayout(CSSLayoutContext layoutContext) {
mCSSNode.calculateLayout(layoutContext);
public void calculateLayout() {
mCSSNode.calculateLayout();
}
public final boolean hasNewLayout() {
@@ -605,11 +604,11 @@ public class ReactShadowNode {
}
public void setMargin(int spacingType, float margin) {
mCSSNode.setMargin(spacingType, margin);
mCSSNode.setMargin(CSSEdge.fromInt(spacingType), margin);
}
public final float getPadding(int spacingType) {
return mCSSNode.getPadding(spacingType);
return mCSSNode.getPadding(CSSEdge.fromInt(spacingType));
}
public void setDefaultPadding(int spacingType, float padding) {
@@ -625,40 +624,40 @@ public class ReactShadowNode {
private void updatePadding() {
for (int spacingType = Spacing.LEFT; spacingType <= Spacing.ALL; spacingType++) {
if (spacingType == Spacing.LEFT ||
spacingType == Spacing.RIGHT ||
spacingType == Spacing.START ||
spacingType == Spacing.END) {
spacingType == Spacing.RIGHT ||
spacingType == Spacing.START ||
spacingType == Spacing.END) {
if (CSSConstants.isUndefined(mPadding.getRaw(spacingType)) &&
CSSConstants.isUndefined(mPadding.getRaw(Spacing.HORIZONTAL)) &&
CSSConstants.isUndefined(mPadding.getRaw(Spacing.ALL))) {
mCSSNode.setPadding(spacingType, mDefaultPadding.getRaw(spacingType));
mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mDefaultPadding.getRaw(spacingType));
} else {
mCSSNode.setPadding(spacingType, mPadding.getRaw(spacingType));
mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mPadding.getRaw(spacingType));
}
} else if (spacingType == Spacing.TOP || spacingType == Spacing.BOTTOM) {
if (CSSConstants.isUndefined(mPadding.getRaw(spacingType)) &&
CSSConstants.isUndefined(mPadding.getRaw(Spacing.VERTICAL)) &&
CSSConstants.isUndefined(mPadding.getRaw(Spacing.ALL))) {
mCSSNode.setPadding(spacingType, mDefaultPadding.getRaw(spacingType));
mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mDefaultPadding.getRaw(spacingType));
} else {
mCSSNode.setPadding(spacingType, mPadding.getRaw(spacingType));
mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mPadding.getRaw(spacingType));
}
} else {
if (CSSConstants.isUndefined(mPadding.getRaw(spacingType))) {
mCSSNode.setPadding(spacingType, mDefaultPadding.getRaw(spacingType));
mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mDefaultPadding.getRaw(spacingType));
} else {
mCSSNode.setPadding(spacingType, mPadding.getRaw(spacingType));
mCSSNode.setPadding(CSSEdge.fromInt(spacingType), mPadding.getRaw(spacingType));
}
}
}
}
public void setBorder(int spacingType, float borderWidth) {
mCSSNode.setBorder(spacingType, borderWidth);
mCSSNode.setBorder(CSSEdge.fromInt(spacingType), borderWidth);
}
public void setPosition(int spacingType, float position) {
mCSSNode.setPosition(spacingType, position);
mCSSNode.setPosition(CSSEdge.fromInt(spacingType), position);
}
public void setPositionType(CSSPositionType positionType) {