Remove Style prefix in java and cs apis

Reviewed By: splhack

Differential Revision: D4232920

fbshipit-source-id: 6e2ff21bbb7e0e441892023c14df579d1bc7aa49

Author: Emil Sjolander

ReactAndroid/src/main/java/com/facebook/csslayout/CSSNode.java

@@ -401,83 +401,83 @@ public void setPosition(int spacingType, float position) {
 
   private native float jni_CSSNodeStyleGetWidth(long nativePointer);
   @Override
-  public float getStyleWidth() {
+  public float getWidth() {
     return jni_CSSNodeStyleGetWidth(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetWidth(long nativePointer, float width);
   @Override
-  public void setStyleWidth(float width) {
+  public void setWidth(float width) {
     jni_CSSNodeStyleSetWidth(mNativePointer, width);
   }
 
   private native float jni_CSSNodeStyleGetHeight(long nativePointer);
   @Override
-  public float getStyleHeight() {
+  public float getHeight() {
     return jni_CSSNodeStyleGetHeight(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetHeight(long nativePointer, float height);
   @Override
-  public void setStyleHeight(float height) {
+  public void setHeight(float height) {
     jni_CSSNodeStyleSetHeight(mNativePointer, height);
   }
 
   private native float jni_CSSNodeStyleGetMinWidth(long nativePointer);
   @Override
-  public float getStyleMinWidth() {
+  public float getMinWidth() {
     return jni_CSSNodeStyleGetMinWidth(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetMinWidth(long nativePointer, float minWidth);
   @Override
-  public void setStyleMinWidth(float minWidth) {
+  public void setMinWidth(float minWidth) {
     jni_CSSNodeStyleSetMinWidth(mNativePointer, minWidth);
   }
 
   private native float jni_CSSNodeStyleGetMinHeight(long nativePointer);
   @Override
-  public float getStyleMinHeight() {
+  public float getMinHeight() {
     return jni_CSSNodeStyleGetMinHeight(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetMinHeight(long nativePointer, float minHeight);
   @Override
-  public void setStyleMinHeight(float minHeight) {
+  public void setMinHeight(float minHeight) {
     jni_CSSNodeStyleSetMinHeight(mNativePointer, minHeight);
   }
 
   private native float jni_CSSNodeStyleGetMaxWidth(long nativePointer);
   @Override
-  public float getStyleMaxWidth() {
+  public float getMaxWidth() {
     return jni_CSSNodeStyleGetMaxWidth(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
   @Override
-  public void setStyleMaxWidth(float maxWidth) {
+  public void setMaxWidth(float maxWidth) {
     jni_CSSNodeStyleSetMaxWidth(mNativePointer, maxWidth);
   }
 
   private native float jni_CSSNodeStyleGetMaxHeight(long nativePointer);
   @Override
-  public float getStyleMaxHeight() {
+  public float getMaxHeight() {
     return jni_CSSNodeStyleGetMaxHeight(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetMaxHeight(long nativePointer, float maxheight);
   @Override
-  public void setStyleMaxHeight(float maxheight) {
+  public void setMaxHeight(float maxheight) {
     jni_CSSNodeStyleSetMaxHeight(mNativePointer, maxheight);
   }
 
   private native float jni_CSSNodeStyleGetAspectRatio(long nativePointer);
-  public float getStyleAspectRatio() {
+  public float getAspectRatio() {
     return jni_CSSNodeStyleGetAspectRatio(mNativePointer);
   }
 
   private native void jni_CSSNodeStyleSetAspectRatio(long nativePointer, float aspectRatio);
-  public void setStyleAspectRatio(float aspectRatio) {
+  public void setAspectRatio(float aspectRatio) {
     jni_CSSNodeStyleSetAspectRatio(mNativePointer, aspectRatio);
   }
 

ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeAPI.java

@@ -68,18 +68,18 @@ long measure(
   void setBorder(int spacingType, float border);
   float getPosition(int spacingType);
   void setPosition(int spacingType, float position);
-  float getStyleWidth();
-  void setStyleWidth(float width);
-  float getStyleHeight();
-  void setStyleHeight(float height);
-  float getStyleMaxWidth();
-  void setStyleMaxWidth(float maxWidth);
-  float getStyleMinWidth();
-  void setStyleMinWidth(float minWidth);
-  float getStyleMaxHeight();
-  void setStyleMaxHeight(float maxHeight);
-  float getStyleMinHeight();
-  void setStyleMinHeight(float minHeight);
+  float getWidth();
+  void setWidth(float width);
+  float getHeight();
+  void setHeight(float height);
+  float getMaxWidth();
+  void setMaxWidth(float maxWidth);
+  float getMinWidth();
+  void setMinWidth(float minWidth);
+  float getMaxHeight();
+  void setMaxHeight(float maxHeight);
+  float getMinHeight();
+  void setMinHeight(float minHeight);
   float getLayoutX();
   float getLayoutY();
   float getLayoutWidth();

ReactAndroid/src/main/java/com/facebook/csslayout/CSSNodeDEPRECATED.java

@@ -464,12 +464,12 @@ public void setPosition(int spacingType, float position) {
    * Get this node's width, as defined in the style.
    */
   @Override
-  public float getStyleWidth() {
+  public float getWidth() {
     return style.dimensions[DIMENSION_WIDTH];
   }
 
   @Override
-  public void setStyleWidth(float width) {
+  public void setWidth(float width) {
     if (!valuesEqual(style.dimensions[DIMENSION_WIDTH], width)) {
       style.dimensions[DIMENSION_WIDTH] = width;
       dirty();
@@ -480,12 +480,12 @@ public void setStyleWidth(float width) {
    * Get this node's height, as defined in the style.
    */
   @Override
-  public float getStyleHeight() {
+  public float getHeight() {
     return style.dimensions[DIMENSION_HEIGHT];
   }
 
   @Override
-  public void setStyleHeight(float height) {
+  public void setHeight(float height) {
     if (!valuesEqual(style.dimensions[DIMENSION_HEIGHT], height)) {
       style.dimensions[DIMENSION_HEIGHT] = height;
       dirty();
@@ -496,12 +496,12 @@ public void setStyleHeight(float height) {
    * Get this node's max width, as defined in the style
    */
   @Override
-  public float getStyleMaxWidth() {
+  public float getMaxWidth() {
     return style.maxWidth;
   }
 
   @Override
-  public void setStyleMaxWidth(float maxWidth) {
+  public void setMaxWidth(float maxWidth) {
     if (!valuesEqual(style.maxWidth, maxWidth)) {
       style.maxWidth = maxWidth;
       dirty();
@@ -512,12 +512,12 @@ public void setStyleMaxWidth(float maxWidth) {
    * Get this node's min width, as defined in the style
    */
   @Override
-  public float getStyleMinWidth() {
+  public float getMinWidth() {
     return style.minWidth;
   }
 
   @Override
-  public void setStyleMinWidth(float minWidth) {
+  public void setMinWidth(float minWidth) {
     if (!valuesEqual(style.minWidth, minWidth)) {
       style.minWidth = minWidth;
       dirty();
@@ -528,12 +528,12 @@ public void setStyleMinWidth(float minWidth) {
    * Get this node's max height, as defined in the style
    */
   @Override
-  public float getStyleMaxHeight() {
+  public float getMaxHeight() {
     return style.maxHeight;
   }
 
   @Override
-  public void setStyleMaxHeight(float maxHeight) {
+  public void setMaxHeight(float maxHeight) {
     if (!valuesEqual(style.maxHeight, maxHeight)) {
       style.maxHeight = maxHeight;
       dirty();
@@ -544,12 +544,12 @@ public void setStyleMaxHeight(float maxHeight) {
    * Get this node's min height, as defined in the style
    */
   @Override
-  public float getStyleMinHeight() {
+  public float getMinHeight() {
     return style.minHeight;
   }
 
   @Override
-  public void setStyleMinHeight(float minHeight) {
+  public void setMinHeight(float minHeight) {
     if (!valuesEqual(style.minHeight, minHeight)) {
       style.minHeight = minHeight;
       dirty();

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java

@@ -529,35 +529,35 @@ public void setLayoutDirection(CSSDirection direction) {
   }
 
   public final float getStyleWidth() {
-    return mCSSNode.getStyleWidth();
+    return mCSSNode.getWidth();
   }
 
   public void setStyleWidth(float widthPx) {
-    mCSSNode.setStyleWidth(widthPx);
+    mCSSNode.setWidth(widthPx);
   }
 
   public void setStyleMinWidth(float widthPx) {
-    mCSSNode.setStyleMinWidth(widthPx);
+    mCSSNode.setMinWidth(widthPx);
   }
 
   public void setStyleMaxWidth(float widthPx) {
-    mCSSNode.setStyleMaxWidth(widthPx);
+    mCSSNode.setMaxWidth(widthPx);
   }
 
   public final float getStyleHeight() {
-    return mCSSNode.getStyleHeight();
+    return mCSSNode.getHeight();
   }
 
   public void setStyleHeight(float heightPx) {
-    mCSSNode.setStyleHeight(heightPx);
+    mCSSNode.setHeight(heightPx);
   }
 
   public void setStyleMinHeight(float widthPx) {
-    mCSSNode.setStyleMinHeight(widthPx);
+    mCSSNode.setMinHeight(widthPx);
   }
 
   public void setStyleMaxHeight(float widthPx) {
-    mCSSNode.setStyleMaxHeight(widthPx);
+    mCSSNode.setMaxHeight(widthPx);
   }
 
   public void setFlex(float flex) {
@@ -577,7 +577,7 @@ public void setFlexBasis(float flexBasis) {
   }
 
   public void setStyleAspectRatio(float aspectRatio) {
-    mCSSNode.setStyleAspectRatio(aspectRatio);
+    mCSSNode.setAspectRatio(aspectRatio);
   }
 
   public void setFlexDirection(CSSFlexDirection flexDirection) {