Convert View to @ReactProp.

Differential Revision: D2479795

committer: Service User <[email protected]>

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

@@ -0,0 +1,160 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+package com.facebook.react.uimanager;
+
+import android.graphics.Color;
+import android.os.Build;
+import android.view.View;
+
+import com.facebook.react.bridge.ReadableMap;
+
+/**
+ * Base class that should be suitable for the majority of subclasses of {@link ViewManager}.
+ * It provides support for base view properties such as backgroundColor, opacity, etc.
+ */
+public abstract class BaseViewManager<T extends View, C extends ReactShadowNode>
+    extends ViewManager<T, C> {
+
+  private static final String PROP_BACKGROUND_COLOR = ViewProps.BACKGROUND_COLOR;
+  private static final String PROP_DECOMPOSED_MATRIX = "decomposedMatrix";
+  private static final String PROP_DECOMPOSED_MATRIX_ROTATE = "rotate";
+  private static final String PROP_DECOMPOSED_MATRIX_SCALE_X = "scaleX";
+  private static final String PROP_DECOMPOSED_MATRIX_SCALE_Y = "scaleY";
+  private static final String PROP_DECOMPOSED_MATRIX_TRANSLATE_X = "translateX";
+  private static final String PROP_DECOMPOSED_MATRIX_TRANSLATE_Y = "translateY";
+  private static final String PROP_OPACITY = "opacity";
+  private static final String PROP_RENDER_TO_HARDWARE_TEXTURE = "renderToHardwareTextureAndroid";
+  private static final String PROP_ACCESSIBILITY_LABEL = "accessibilityLabel";
+  private static final String PROP_ACCESSIBILITY_COMPONENT_TYPE = "accessibilityComponentType";
+  private static final String PROP_ACCESSIBILITY_LIVE_REGION = "accessibilityLiveRegion";
+  private static final String PROP_IMPORTANT_FOR_ACCESSIBILITY = "importantForAccessibility";
+
+  // DEPRECATED
+  private static final String PROP_ROTATION = "rotation";
+  private static final String PROP_SCALE_X = "scaleX";
+  private static final String PROP_SCALE_Y = "scaleY";
+  private static final String PROP_TRANSLATE_X = "translateX";
+  private static final String PROP_TRANSLATE_Y = "translateY";
+
+  /**
+   * Used to locate views in end-to-end (UI) tests.
+   */
+  public static final String PROP_TEST_ID = "testID";
+
+
+  @ReactProp(name = PROP_BACKGROUND_COLOR, defaultInt = Color.TRANSPARENT, customType = "Color")
+  public void setBackgroundColor(T view, int backgroundColor) {
+    view.setBackgroundColor(backgroundColor);
+  }
+
+  @ReactProp(name = PROP_DECOMPOSED_MATRIX)
+  public void setDecomposedMatrix(T view, ReadableMap decomposedMatrix) {
+    if (decomposedMatrix == null) {
+      resetTransformMatrix(view);
+    } else {
+      setTransformMatrix(view, decomposedMatrix);
+    }
+  }
+
+  @ReactProp(name = PROP_OPACITY, defaultFloat = 1.f)
+  public void setOpacity(T view, float opacity) {
+    view.setAlpha(opacity);
+  }
+
+  @ReactProp(name = PROP_RENDER_TO_HARDWARE_TEXTURE)
+  public void setRenderToHardwareTexture(T view, boolean useHWTexture) {
+    view.setLayerType(useHWTexture ? View.LAYER_TYPE_HARDWARE : View.LAYER_TYPE_NONE, null);
+  }
+
+  @ReactProp(name = PROP_TEST_ID)
+  public void setTestId(T view, String testId) {
+    view.setTag(testId);
+  }
+
+  @ReactProp(name = PROP_ACCESSIBILITY_LABEL)
+  public void setAccessibilityLabel(T view, String accessibilityLabel) {
+    view.setContentDescription(accessibilityLabel);
+  }
+
+  @ReactProp(name = PROP_ACCESSIBILITY_COMPONENT_TYPE)
+  public void setAccessibilityComponentType(T view, String accessibilityComponentType) {
+    AccessibilityHelper.updateAccessibilityComponentType(view, accessibilityComponentType);
+  }
+
+  @ReactProp(name = PROP_IMPORTANT_FOR_ACCESSIBILITY)
+  public void setImportantForAccessibility(T view, String importantForAccessibility) {
+    if (importantForAccessibility == null || importantForAccessibility.equals("auto")) {
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
+    } else if (importantForAccessibility.equals("yes")) {
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+    } else if (importantForAccessibility.equals("no")) {
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+    } else if (importantForAccessibility.equals("no-hide-descendants")) {
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
+    }
+  }
+
+  @Deprecated
+  @ReactProp(name = PROP_ROTATION)
+  public void setRotation(T view, float rotation) {
+    view.setRotation(rotation);
+  }
+
+  @Deprecated
+  @ReactProp(name = PROP_SCALE_X, defaultFloat = 1f)
+  public void setScaleX(T view, float scaleX) {
+    view.setScaleX(scaleX);
+  }
+
+  @Deprecated
+  @ReactProp(name = PROP_SCALE_Y, defaultFloat = 1f)
+  public void setScaleY(T view, float scaleY) {
+    view.setScaleY(scaleY);
+  }
+
+  @Deprecated
+  @ReactProp(name = PROP_TRANSLATE_X, defaultFloat = 1f)
+  public void setTranslateX(T view, float translateX) {
+    view.setTranslationX(translateX);
+  }
+
+  @Deprecated
+  @ReactProp(name = PROP_TRANSLATE_Y, defaultFloat = 1f)
+  public void setTranslateY(T view, float translateY) {
+    view.setTranslationY(translateY);
+  }
+
+  @ReactProp(name = PROP_ACCESSIBILITY_LIVE_REGION)
+  public void setAccessibilityLiveRegion(T view, String liveRegion) {
+    if (Build.VERSION.SDK_INT >= 19) {
+      if (liveRegion == null || liveRegion.equals("none")) {
+        view.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_NONE);
+      } else if (liveRegion.equals("polite")) {
+        view.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
+      } else if (liveRegion.equals("assertive")) {
+        view.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_ASSERTIVE);
+      }
+    }
+  }
+
+  private static void setTransformMatrix(View view, ReadableMap matrix) {
+    view.setTranslationX(PixelUtil.toPixelFromDIP(
+            (float) matrix.getDouble(PROP_DECOMPOSED_MATRIX_TRANSLATE_X)));
+    view.setTranslationY(PixelUtil.toPixelFromDIP(
+            (float) matrix.getDouble(PROP_DECOMPOSED_MATRIX_TRANSLATE_Y)));
+    view.setRotation(
+        (float) matrix.getDouble(PROP_DECOMPOSED_MATRIX_ROTATE));
+    view.setScaleX(
+        (float) matrix.getDouble(PROP_DECOMPOSED_MATRIX_SCALE_X));
+    view.setScaleY(
+        (float) matrix.getDouble(PROP_DECOMPOSED_MATRIX_SCALE_Y));
+  }
+
+  private static void resetTransformMatrix(View view) {
+    view.setTranslationX(PixelUtil.toPixelFromDIP(0));
+    view.setTranslationY(PixelUtil.toPixelFromDIP(0));
+    view.setRotation(0);
+    view.setScaleX(1);
+    view.setScaleY(1);
+  }
+}

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

@@ -20,6 +20,8 @@
 
 /**
  * Takes common view properties from JS and applies them to a given {@link View}.
+ *
+ * TODO(krzysztof): Blow away this class once refactoring is complete
  */
 public class BaseViewPropertyApplicator {
 

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

@@ -12,24 +12,21 @@
 import android.view.View;
 
 /**
- * A partial implementation of {@link ViewManager} that applies common properties such as background
- * color, opacity and CSS layout. Implementations should make sure to call
- * {@code super.updateView()} in order for these properties to be applied.
+ * Common base class for most of the {@link ViewManager}s. It provides support for most common
+ * properties through extending {@link BaseViewManager}. It also reduces boilerplate by specifying
+ * the type of shadow node to be {@link ReactShadowNode} and providing default, empty implementation
+ * for some of the methods of {@link ViewManager} interface.
  *
  * @param <T> the view handled by this manager
  */
-public abstract class SimpleViewManager<T extends View> extends ViewManager<T, ReactShadowNode> {
+public abstract class SimpleViewManager<T extends View> extends
+    BaseViewManager<T, ReactShadowNode> {
 
   @Override
   public ReactShadowNode createCSSNodeInstance() {
     return new ReactShadowNode();
   }
 
-  @Override
-  public void updateView(T root, CatalystStylesDiffMap props) {
-    BaseViewPropertyApplicator.applyCommonViewProperties(root, props);
-  }
-
   @Override
   public void updateExtraData(T root, Object extraData) {
   }

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

@@ -25,6 +25,8 @@
  *   @UIProp(UIProp.Type.BOOLEAN) public static final String PROP_FOO = "foo";
  *   @UIProp(UIProp.Type.STRING) public static final String PROP_BAR = "bar";
  * }
+ *
+ * TODO(krzysztof): Kill this class once @ReactProp refactoring is done
  */
 @Target(ElementType.FIELD)
 @Retention(RUNTIME)

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

@@ -16,18 +16,13 @@
  * Class providing children management API for view managers of classes extending ViewGroup.
  */
 public abstract class ViewGroupManager <T extends ViewGroup>
-    extends ViewManager<T, ReactShadowNode> {
+    extends BaseViewManager<T, ReactShadowNode> {
 
   @Override
   public ReactShadowNode createCSSNodeInstance() {
     return new ReactShadowNode();
   }
 
-  @Override
-  public void updateView(T root, CatalystStylesDiffMap props) {
-    BaseViewPropertyApplicator.applyCommonViewProperties(root, props);
-  }
-
   @Override
   public void updateExtraData(T root, Object extraData) {
   }