mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-18 12:12:15 +08:00
Less Catalyst, more React
Summary: Catalyst is the old project name. Rename a few files. public Reviewed By: bestander Differential Revision: D2859553 fb-gh-sync-id: 65a87cc7bcc22f20326971becec02aa1c573e5b9
This commit is contained in:
committed by
facebook-github-bot-9
parent
481f560f64
commit
c95d74ac09
@@ -11,7 +11,7 @@ package com.facebook.react.views.art;
|
||||
|
||||
import android.view.View;
|
||||
|
||||
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.ViewManager;
|
||||
|
||||
@@ -17,7 +17,7 @@ import android.graphics.Paint;
|
||||
|
||||
import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
|
||||
import com.facebook.react.bridge.ReadableArray;
|
||||
import com.facebook.react.uimanager.CatalystStylesDiffMap;
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap;
|
||||
import com.facebook.react.uimanager.DisplayMetricsHolder;
|
||||
import com.facebook.react.uimanager.annotations.ReactProp;
|
||||
import com.facebook.react.uimanager.ReactShadowNode;
|
||||
|
||||
@@ -12,7 +12,7 @@ package com.facebook.react.views.art;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.facebook.react.bridge.ReadableArray;
|
||||
import com.facebook.react.uimanager.CatalystStylesDiffMap;
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap;
|
||||
|
||||
/**
|
||||
* Contains static helper methods for accessing props.
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
package com.facebook.react.views.text;
|
||||
|
||||
import com.facebook.react.common.annotations.VisibleForTesting;
|
||||
import com.facebook.react.uimanager.CatalystStylesDiffMap;
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap;
|
||||
import com.facebook.react.uimanager.ThemedReactContext;
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,7 +12,7 @@ package com.facebook.react.views.view;
|
||||
import android.graphics.Rect;
|
||||
import android.view.View;
|
||||
|
||||
import com.facebook.react.uimanager.CatalystStylesDiffMap;
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap;
|
||||
|
||||
/**
|
||||
* Interface that should be implemented by {@link View} subclasses that support
|
||||
@@ -52,7 +52,7 @@ public interface ReactClippingViewGroup {
|
||||
*
|
||||
* Helper method {@link ReactClippingViewGroupHelper#applyRemoveClippedSubviewsProperty} may be
|
||||
* used by {@link ViewManager} subclass to apply this property based on property update map
|
||||
* {@link CatalystStylesDiffMap}.
|
||||
* {@link ReactStylesDiffMap}.
|
||||
*/
|
||||
void setRemoveClippedSubviews(boolean removeClippedSubviews);
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import android.graphics.Rect;
|
||||
import android.view.View;
|
||||
import android.view.ViewParent;
|
||||
|
||||
import com.facebook.react.uimanager.CatalystStylesDiffMap;
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap;
|
||||
|
||||
/**
|
||||
* Provides implementation of common tasks for view and it's view manager supporting property
|
||||
|
||||
@@ -315,7 +315,7 @@ import com.facebook.csslayout.Spacing;
|
||||
}
|
||||
|
||||
private int getBorderColor(int position) {
|
||||
// Check CatalystStylesDiffMap#getColorInt() to see why this is needed
|
||||
// Check ReactStylesDiffMap#getColorInt() to see why this is needed
|
||||
return mBorderColor != null ? (int) (long) mBorderColor.get(position) : DEFAULT_BORDER_COLOR;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ import android.view.ViewGroup;
|
||||
|
||||
import com.facebook.infer.annotation.Assertions;
|
||||
import com.facebook.react.common.annotations.VisibleForTesting;
|
||||
import com.facebook.react.touch.CatalystInterceptingViewGroup;
|
||||
import com.facebook.react.touch.ReactInterceptingViewGroup;
|
||||
import com.facebook.react.touch.OnInterceptTouchEventListener;
|
||||
import com.facebook.react.uimanager.MeasureSpecAssertions;
|
||||
import com.facebook.react.uimanager.PointerEvents;
|
||||
@@ -34,7 +34,7 @@ import com.facebook.react.uimanager.ReactPointerEventsView;
|
||||
* initializes most of the storage needed for them.
|
||||
*/
|
||||
public class ReactViewGroup extends ViewGroup implements
|
||||
CatalystInterceptingViewGroup, ReactClippingViewGroup, ReactPointerEventsView {
|
||||
ReactInterceptingViewGroup, ReactClippingViewGroup, ReactPointerEventsView {
|
||||
|
||||
private static final int ARRAY_CAPACITY_INCREMENT = 12;
|
||||
private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
|
||||
|
||||
Reference in New Issue
Block a user