Rename directories

Reviewed By: gkassabli

Differential Revision: D4284681

fbshipit-source-id: f0c6855c2c6e4389b7867f48f72cbb697830fc5a
This commit is contained in:
Emil Sjolander
2016-12-07 05:12:11 -08:00
committed by Facebook Github Bot
parent cf3ae6c32a
commit 7f8c2985a8
61 changed files with 148 additions and 167 deletions

View File

@@ -1,8 +1,8 @@
include_defs('//ReactAndroid/DEFS')
android_library(
name = 'csslayout',
srcs = glob(['csslayout/*.java']),
name = 'yoga',
srcs = glob(['yoga/*.java']),
deps = [
react_native_dep('java/com/facebook/proguard/annotations:annotations'),
react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
@@ -13,5 +13,5 @@ android_library(
)
project_config(
src_target = ':csslayout',
src_target = ':yoga',
)

View File

@@ -1,15 +0,0 @@
The source of truth for css-layout is: https://github.com/facebook/css-layout
The code here should be kept in sync with GitHub.
HEAD at the time this code was synced: https://github.com/facebook/css-layout/commit/a1f36b53f5464c8ee7abc311765dc3ecb1b879c6
There is generated code in:
- README (this file)
- fbandroid/java/com/facebook/csslayout
- fbandroid/javatests/com/facebook/csslayout
- fbobjc/Libraries/FBReactKit/js/react-native-github/React/Layout
The code was generated by running 'make' in the css-layout folder and running:
scripts/sync-css-layout.sh <pathToGithubRepo> <pathToFbSourceRepo>

View File

@@ -9,7 +9,7 @@ android_library(
'layoutanimation/*.java'
]),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('java/com/facebook/systrace:systrace'),
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
react_native_dep('third-party/android/support/v4:lib-support-v4'),

View File

@@ -659,7 +659,7 @@ public class ReactShadowNode {
if ((measureFunction == null ^ mYogaNode.isMeasureDefined()) &&
getChildCount() != 0) {
throw new RuntimeException(
"Since a node with a measure function does not add any native CSSLayout children, it's " +
"Since a node with a measure function does not add any native yoga children, it's " +
"not safe to transition to/from having a measure function unless a node has no children");
}
mYogaNode.setMeasureFunction(measureFunction);

View File

@@ -4,7 +4,7 @@ android_library(
name = 'art',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'drawer',
srcs = glob(['**/*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/jsr-305:jsr-305'),

View File

@@ -24,7 +24,7 @@ android_library(
':imageevents',
],
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'modal',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'progressbar',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'slider',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('android_res/android/support/v7/appcompat-orig:res-for-react-native'),
react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
react_native_dep('third-party/java/jsr-305:jsr-305'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'switchview',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('third-party/android/support/v7/appcompat-orig:appcompat'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'text',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'frescosupport',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('libraries/fresco/fresco-react-native:fbcore'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'textinput',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'toolbar',
srcs = glob(['**/*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('android_res/android/support/v7/appcompat-orig:res-for-react-native'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-drawee'),
react_native_dep('libraries/fresco/fresco-react-native:fresco-react-native'),

View File

@@ -4,7 +4,7 @@ android_library(
name = 'view',
srcs = glob(['*.java']),
deps = [
CSSLAYOUT_TARGET,
YOGA_TARGET,
react_native_dep('third-party/java/infer-annotations:infer-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),

View File

@@ -42,7 +42,7 @@ public class ReactViewPager extends ViewPager {
// We need to do that since {@link ViewPager} relies on layout passes to position those views
// in a right way (also thanks to {@link ReactViewPagerManager#needsCustomLayoutForChildren}
// returning {@code true}). Currently we only call {@link View#measure} and
// {@link View#layout} after CSSLayout step.
// {@link View#layout} after yoga step.
// TODO(7323049): Remove this workaround once we figure out a way to re-layout some views on
// request