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

Less Catalyst, more React 

Summary:
Catalyst is the old project name. Rename a few files.

@public

Reviewed By: bestander

Differential Revision: D2859553
This commit is contained in:
Martin Konicek 2016-01-25 05:55:06 -08:00 committed by Ahmed El-Helw
parent 59fe71caff
commit 0b79d44dcf
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
package com.facebook.react.flat;
import com.facebook.csslayout.CSSNode;
import com.facebook.react.uimanager.CatalystStylesDiffMap;
import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.ReactShadowNode;
import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.ViewGroupManager;
@ -70,7 +70,7 @@ import com.facebook.react.uimanager.ViewManager;
}
@Override
/* package*/ void handleUpdateProperties(CatalystStylesDiffMap styles) {
/* package*/ void handleUpdateProperties(ReactStylesDiffMap styles) {
if (mReactShadowNode != null) {
mReactShadowNode.updateProperties(styles);
}

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

@ -12,7 +12,7 @@ package com.facebook.react.flat;
import javax.annotation.Nullable;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.uimanager.CatalystStylesDiffMap;
import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.uimanager.ViewProps;
@ -50,7 +50,7 @@ import com.facebook.react.uimanager.ViewProps;
private int mMoveToIndexInParent;
private boolean mIsOverflowVisible = true;
/* package */ void handleUpdateProperties(CatalystStylesDiffMap styles) {
/* package */ void handleUpdateProperties(ReactStylesDiffMap styles) {
if (!mountsToView()) {
// Make sure we mount this FlatShadowNode to a View if any of these properties are present.
if (styles.hasKey(PROP_DECOMPOSED_MATRIX) ||

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

@ -20,7 +20,7 @@ import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.uimanager.CatalystStylesDiffMap;
import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.ReactShadowNode;
import com.facebook.react.uimanager.UIImplementation;
import com.facebook.react.uimanager.ViewManager;
@ -121,7 +121,7 @@ public class FlatUIImplementation extends UIImplementation {
protected void handleCreateView(
ReactShadowNode cssNode,
int rootViewTag,
@Nullable CatalystStylesDiffMap styles) {
@Nullable ReactStylesDiffMap styles) {
FlatShadowNode node = (FlatShadowNode) cssNode;
if (styles != null) {
@ -138,7 +138,7 @@ public class FlatUIImplementation extends UIImplementation {
protected void handleUpdateView(
ReactShadowNode cssNode,
String className,
CatalystStylesDiffMap styles) {
ReactStylesDiffMap styles) {
FlatShadowNode node = (FlatShadowNode) cssNode;
node.handleUpdateProperties(styles);

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

@ -26,7 +26,7 @@ import android.view.ViewParent;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.SoftAssertions;
import com.facebook.react.touch.CatalystInterceptingViewGroup;
import com.facebook.react.touch.ReactInterceptingViewGroup;
import com.facebook.react.touch.OnInterceptTouchEventListener;
import com.facebook.react.uimanager.PointerEvents;
import com.facebook.react.uimanager.ReactCompoundView;
@ -39,7 +39,7 @@ import com.facebook.react.views.image.ImageLoadEvent;
* array of DrawCommands, executing them one by one.
*/
/* package */ final class FlatViewGroup extends ViewGroup
implements CatalystInterceptingViewGroup, ReactCompoundView, ReactPointerEventsView {
implements ReactInterceptingViewGroup, ReactCompoundView, ReactPointerEventsView {
/**
* Helper class that allows AttachDetachListener to invalidate the hosting View.
*/

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

@ -15,7 +15,7 @@ import javax.annotation.Nullable;
import com.facebook.csslayout.CSSNode;
import com.facebook.csslayout.Spacing;
import com.facebook.react.uimanager.CatalystStylesDiffMap;
import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.OnLayoutEvent;
import com.facebook.react.uimanager.events.EventDispatcher;
@ -127,7 +127,7 @@ import com.facebook.react.uimanager.events.EventDispatcher;
/* package */ void ensureBackingViewIsCreated(
FlatShadowNode node,
int tag,
@Nullable CatalystStylesDiffMap styles) {
@Nullable ReactStylesDiffMap styles) {
if (node.isBackingViewCreated()) {
if (styles != null) {
// if the View is already created, make sure propagate new styles.