docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace replace replace keep keep keep keep keep | <mask>
<mask> if (YGNodeIsFlex(child)) {
<mask> totalFlexGrowFactors += YGResolveFlexGrow(child);
<mask>
<mask> // Unlike the grow factor, the shrink factor is scaled relative to the
<mask> // child
<mask> // dimension.
<mask> totalFlexShrinkScaledFactors +=
<mask> -YGNodeResolveFlexShrink(child) * child->layout.computedFlexBasis;
<mask> }
<mask>
<mask> // Store a private linked list of children that need to be layed out.
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove sizeConsumedOnCurrentLine += flexBasisWithMaxConstraints + childMarginMainAxis;
</s> add sizeConsumedOnCurrentLine += flexBasisWithMinAndMaxConstraints + childMarginMainAxis; </s> remove // The implementation std::rethrow_if_nested uses a dynamic_cast to determine
// if the exception is a nested_exception. If the exception is from a library
// built with -fno-rtti, then that will crash. This avoids that.
void rethrow_if_nested() {
</s> add // For each exception in the chain of the exception_ptr argument, func
// will be called with that exception (in reverse order, i.e. innermost first).
#ifndef FBJNI_NO_EXCEPTION_PTR
void denest(const std::function<void(std::exception_ptr)>& func, std::exception_ptr ptr) {
FBASSERT(ptr); </s> remove // TODO(T6618159) Take a stack dump here to save context if it results in a crash when propagated
</s> add // TODO(T6618159) Inject the c++ stack into the exception's stack trace. One
// issue: when a java exception is created, it captures the full java stack
// across jni boundaries. lyra will only capture the c++ stack to the jni
// boundary. So, as we pass the java exception up to c++, we need to capture
// the c++ stack and then insert it into the correct place in the java stack
// trace. Then, as the exception propagates across the boundaries, we will
// slowly fill in the c++ parts of the trace. </s> remove // space we've used is all space we need
</s> add // space we've used is all space we need. Root node also should be shrunk to minimum </s> remove static void runStdFunctionImpl(alias_ref<JClass>, jlong ptr) {
(*reinterpret_cast<std::function<void()>*>(ptr))();
}
static void OnLoad() {
// We need the javaClassStatic so that the class lookup is cached and that
// runStdFunction can be called from a ThreadScope-attached thread.
javaClassStatic()->registerNatives({
makeNativeMethod("runStdFunctionImpl", runStdFunctionImpl),
});
}
};
</s> add ThreadLocal<ThreadScope>& scopeStorage() {
// We don't want the ThreadLocal to delete the ThreadScopes.
static ThreadLocal<ThreadScope> scope([] (void*) {});
return scope; </s> add friend struct Environment;
ThreadScope* previous_;
// If the JNIEnv* is set, it is guaranteed to be valid at least through the
// lifetime of this ThreadScope. The only case where that guarantee can be
// made is when there is a java frame in the stack below this.
JNIEnv* env_; | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> } else {
<mask> if (!node->config->useLegacyStretchBehaviour &&
<mask> (totalFlexGrowFactors == 0 || YGResolveFlexGrow(node) == 0)) {
<mask> // If we don't have any children to flex or we can't flex the node itself,
<mask> // space we've used is all space we need
<mask> availableInnerMainDim = sizeConsumedOnCurrentLine;
<mask> }
<mask> }
<mask> }
<mask>
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove // draw top
if (Color.alpha(topColor) != 0 && topWidth != 0) {
PAINT.setColor(topColor);
</s> add // Draw center. Any of the borders might be opaque or transparent, so we need to draw this.
if (Color.alpha(mBackgroundColor) != 0) {
PAINT.setColor(mBackgroundColor);
canvas.drawRect(left, top, right, bottom, PAINT);
} </s> remove // shouldn't have to jump through java.
</s> add // shouldn't have to jump through java. It should be enough to check if the
// attach state env* is set. </s> remove // If the file name of a stack frame is numeric (+ ".js"), we assume it's a lazily injected module
// coming from a "random access bundle". We are using special source maps for these bundles, so
// that we can symbolicate stack traces for multiple injected files with a single source map.
// We have to include the module id in the stack for that, though. The ".js" suffix is kept to
// avoid ambiguities between "module-id:line" and "line:column".
private static String stackFrameToModuleId(ReadableMap frame) {
if (frame.hasKey("file") && !frame.isNull("file") && frame.getType("file") == ReadableType.String) {
final Matcher matcher = mJsModuleIdPattern.matcher(frame.getString("file"));
if (matcher.find()) {
return matcher.group(1) + ":";
}
}
return "";
}
private String stackTraceToString(String message, ReadableArray stack) {
StringBuilder stringBuilder = new StringBuilder(message).append(", stack:\n");
for (int i = 0; i < stack.size(); i++) {
ReadableMap frame = stack.getMap(i);
stringBuilder.append(frame.getString("methodName")).append("@").append(stackFrameToModuleId(frame)).append(frame.getInt("lineNumber"));
if (frame.hasKey("column") && !frame.isNull("column") && frame.getType("column") == ReadableType.Number) {
stringBuilder.append(":").append(frame.getInt("column"));
}
stringBuilder.append("\n");
}
return stringBuilder.toString();
}
</s> add </s> remove int width = bounds.width();
int height = bounds.height();
// If the path drawn previously is of the same color,
// there would be a slight white space between borders
// with anti-alias set to true.
// Therefore we need to disable anti-alias, and
// after drawing is done, we will re-enable it.
mPaint.setAntiAlias(false);
if (mPathForBorder == null) {
mPathForBorder = new Path();
}
if (borderLeft > 0 && colorLeft != Color.TRANSPARENT) {
mPaint.setColor(colorLeft);
mPathForBorder.reset();
mPathForBorder.moveTo(left, top);
mPathForBorder.lineTo(left + borderLeft, top + borderTop);
mPathForBorder.lineTo(left + borderLeft, top + height - borderBottom);
mPathForBorder.lineTo(left, top + height);
mPathForBorder.lineTo(left, top);
canvas.drawPath(mPathForBorder, mPaint);
}
if (borderTop > 0 && colorTop != Color.TRANSPARENT) {
mPaint.setColor(colorTop);
mPathForBorder.reset();
mPathForBorder.moveTo(left, top);
mPathForBorder.lineTo(left + borderLeft, top + borderTop);
mPathForBorder.lineTo(left + width - borderRight, top + borderTop);
mPathForBorder.lineTo(left + width, top);
mPathForBorder.lineTo(left, top);
canvas.drawPath(mPathForBorder, mPaint);
}
if (borderRight > 0 && colorRight != Color.TRANSPARENT) {
mPaint.setColor(colorRight);
mPathForBorder.reset();
mPathForBorder.moveTo(left + width, top);
mPathForBorder.lineTo(left + width, top + height);
mPathForBorder.lineTo(left + width - borderRight, top + height - borderBottom);
mPathForBorder.lineTo(left + width - borderRight, top + borderTop);
mPathForBorder.lineTo(left + width, top);
canvas.drawPath(mPathForBorder, mPaint);
}
</s> add int top = bounds.top; </s> add JNIEnv* env;
// We should be able to just get the JNIEnv* by just calling
// AttachCurrentThread, but the spec is unclear (and using getEnv is probably
// generally more reliable).
auto result = getEnv(&env);
// We don't know how to deal with anything other than JNI_OK or JNI_DETACHED.
FBASSERT(result == JNI_OK || result == JNI_EDETACHED);
if (result == JNI_EDETACHED) {
// The thread should not be detached while a ThreadScope is in the stack.
FBASSERT(!scope);
env = attachCurrentThread();
}
FBASSERT(env); </s> remove boolean isDrawPathRequired = isBorderColorDifferentAtIntersectionPoints();
if (isDrawPathRequired && mPathForBorder == null) {
mPathForBorder = new Path();
}
</s> add // Check for fast path to border drawing.
int fastBorderColor = fastBorderCompatibleColorOrZero(
borderLeft,
borderTop,
borderRight,
borderBottom,
leftColor,
topColor,
rightColor,
bottomColor);
if (fastBorderColor != 0) {
// Fast border color draw.
if (Color.alpha(fastBorderColor) != 0) {
// Border color is not transparent.
// Draw center.
if (Color.alpha(mBackgroundColor) != 0) {
PAINT.setColor(mBackgroundColor);
if (Color.alpha(fastBorderColor) == 255) {
// The border will draw over the edges, so only draw the inset background.
canvas.drawRect(leftInset, topInset, rightInset, bottomInset, PAINT);
} else {
// The border is opaque, so we have to draw the entire background color.
canvas.drawRect(left, top, right, bottom, PAINT);
}
}
PAINT.setColor(fastBorderColor);
if (borderLeft > 0) {
canvas.drawRect(left, top, leftInset, bottom - borderBottom, PAINT);
}
if (borderTop > 0) {
canvas.drawRect(left + borderLeft, top, right, topInset, PAINT);
}
if (borderRight > 0) {
canvas.drawRect(rightInset, top + borderTop, right, bottom, PAINT);
}
if (borderBottom > 0) {
canvas.drawRect(left, bottomInset, right - borderRight, bottom, PAINT);
}
}
} else {
if (mPathForBorder == null) {
mPathForBorder = new Path();
} | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> float deltaFlexShrinkScaledFactors = 0;
<mask> float deltaFlexGrowFactors = 0;
<mask> currentRelativeChild = firstRelativeChild;
<mask> while (currentRelativeChild != NULL) {
<mask> childFlexBasis = currentRelativeChild->layout.computedFlexBasis;
<mask>
<mask> if (remainingFreeSpace < 0) {
<mask> flexShrinkScaledFactor = -YGNodeResolveFlexShrink(currentRelativeChild) * childFlexBasis;
<mask>
<mask> // Is this child able to shrink?
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove childFlexBasis = currentRelativeChild->layout.computedFlexBasis;
</s> add childFlexBasis =
fminf(YGResolveValue(¤tRelativeChild->style.maxDimensions[dim[mainAxis]],
mainAxisParentSize),
fmaxf(YGResolveValue(¤tRelativeChild->style.minDimensions[dim[mainAxis]],
mainAxisParentSize),
currentRelativeChild->layout.computedFlexBasis)); </s> remove float totalFlexBasis = 0;
</s> add float totalOuterFlexBasis = 0; </s> remove if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_MS) {
</s> add if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_NS) { </s> add bool useRoundedComparison = config != NULL && config->pointScaleFactor != 0;
const float effectiveWidth = useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false) : width;
const float effectiveHeight = useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false) : height;
const float effectiveLastWidth = useRoundedComparison ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false) : lastWidth;
const float effectiveLastHeight = useRoundedComparison ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false) : lastHeight; </s> remove protected int mLineHeightInput = UNSET;
</s> add protected float mLineHeightInput = UNSET; </s> remove fmaxf(YGResolveValue(&child->style.minDimensions[dim[mainAxis]],
mainAxisParentSize),
child->layout.computedFlexBasis));
</s> add child->layout.computedFlexBasis); | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> // Second pass: resolve the sizes of the flexible items
<mask> deltaFreeSpace = 0;
<mask> currentRelativeChild = firstRelativeChild;
<mask> while (currentRelativeChild != NULL) {
<mask> childFlexBasis = currentRelativeChild->layout.computedFlexBasis;
<mask> float updatedMainSize = childFlexBasis;
<mask>
<mask> if (remainingFreeSpace < 0) {
<mask> flexShrinkScaledFactor = -YGNodeResolveFlexShrink(currentRelativeChild) * childFlexBasis;
<mask> // Is this child able to shrink?
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove childFlexBasis = currentRelativeChild->layout.computedFlexBasis;
</s> add childFlexBasis =
fminf(YGResolveValue(¤tRelativeChild->style.maxDimensions[dim[mainAxis]],
mainAxisParentSize),
fmaxf(YGResolveValue(¤tRelativeChild->style.minDimensions[dim[mainAxis]],
mainAxisParentSize),
currentRelativeChild->layout.computedFlexBasis)); </s> remove float totalFlexBasis = 0;
</s> add float totalOuterFlexBasis = 0; </s> remove marginAxisColumn)) {
</s> add marginAxisColumn,
config)) { </s> remove fmaxf(YGResolveValue(&child->style.minDimensions[dim[mainAxis]],
mainAxisParentSize),
child->layout.computedFlexBasis));
</s> add child->layout.computedFlexBasis); </s> remove boolean isDrawPathRequired = isBorderColorDifferentAtIntersectionPoints();
if (isDrawPathRequired && mPathForBorder == null) {
mPathForBorder = new Path();
}
</s> add // Check for fast path to border drawing.
int fastBorderColor = fastBorderCompatibleColorOrZero(
borderLeft,
borderTop,
borderRight,
borderBottom,
leftColor,
topColor,
rightColor,
bottomColor);
if (fastBorderColor != 0) {
// Fast border color draw.
if (Color.alpha(fastBorderColor) != 0) {
// Border color is not transparent.
// Draw center.
if (Color.alpha(mBackgroundColor) != 0) {
PAINT.setColor(mBackgroundColor);
if (Color.alpha(fastBorderColor) == 255) {
// The border will draw over the edges, so only draw the inset background.
canvas.drawRect(leftInset, topInset, rightInset, bottomInset, PAINT);
} else {
// The border is opaque, so we have to draw the entire background color.
canvas.drawRect(left, top, right, bottom, PAINT);
}
}
PAINT.setColor(fastBorderColor);
if (borderLeft > 0) {
canvas.drawRect(left, top, leftInset, bottom - borderBottom, PAINT);
}
if (borderTop > 0) {
canvas.drawRect(left + borderLeft, top, right, topInset, PAINT);
}
if (borderRight > 0) {
canvas.drawRect(rightInset, top + borderTop, right, bottom, PAINT);
}
if (borderBottom > 0) {
canvas.drawRect(left, bottomInset, right - borderRight, bottom, PAINT);
}
}
} else {
if (mPathForBorder == null) {
mPathForBorder = new Path();
} </s> remove if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_MS) {
</s> add if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_NS) { | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> // parents height yet.
<mask> if (!YGNodeIsStyleDimDefined(child, crossAxis, availableInnerCrossDim)) {
<mask> const float childWidth =
<mask> isMainAxisRow ? (child->layout.measuredDimensions[YGDimensionWidth] +
<mask> YGNodeMarginForAxis(child, crossAxis, availableInnerWidth))
<mask> : lineHeight;
<mask>
<mask> const float childHeight =
<mask> !isMainAxisRow ? (child->layout.measuredDimensions[YGDimensionHeight] +
<mask> YGNodeMarginForAxis(child, crossAxis, availableInnerWidth))
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove YGNodeTrailingPosition(child, crossAxis, width);
</s> add YGNodeTrailingMargin(child, crossAxis, width) -
YGNodeTrailingPosition(child, crossAxis, isMainAxisRow ? height : width); </s> remove totalFlexBasis += child->layout.computedFlexBasis;
</s> add totalOuterFlexBasis +=
child->layout.computedFlexBasis + YGNodeMarginForAxis(child, mainAxis, availableInnerWidth);
; </s> remove fmaxf(YGResolveValue(&child->style.minDimensions[dim[mainAxis]],
mainAxisParentSize),
child->layout.computedFlexBasis));
</s> add child->layout.computedFlexBasis); </s> add bool useRoundedComparison = config != NULL && config->pointScaleFactor != 0;
const float effectiveWidth = useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false) : width;
const float effectiveHeight = useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false) : height;
const float effectiveLastWidth = useRoundedComparison ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false) : lastWidth;
const float effectiveLastHeight = useRoundedComparison ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false) : lastHeight; </s> remove config->pointScaleFactor = 1.0f / pixelsInPoint;
}
}
static float YGRoundValueToPixelGrid(const float value,
const float pointScaleFactor,
const bool forceCeil,
const bool forceFloor) {
float fractial = fmodf(value, pointScaleFactor);
if (YGFloatsEqual(fractial, 0)) {
// Still remove fractial as fractial could be extremely small.
return value - fractial;
}
if (forceCeil) {
return value - fractial + pointScaleFactor;
} else if (forceFloor) {
return value - fractial;
} else {
return value - fractial + (fractial >= pointScaleFactor / 2.0f ? pointScaleFactor : 0);
</s> add config->pointScaleFactor = pixelsInPoint; </s> remove const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
</s> add // We want to make sure we don't call measure with negative size
const float innerWidth = YGFloatIsUndefined(availableWidth)
? availableWidth
: fmaxf(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
const float innerHeight = YGFloatIsUndefined(availableHeight)
? availableHeight
: fmaxf(0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn); | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> const float lastHeight,
<mask> const float lastComputedWidth,
<mask> const float lastComputedHeight,
<mask> const float marginRow,
<mask> const float marginColumn) {
<mask> if (lastComputedHeight < 0 || lastComputedWidth < 0) {
<mask> return false;
<mask> }
<mask>
<mask> const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(lastWidth, width);
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(lastWidth, width);
const bool hasSameHeightSpec = lastHeightMode == heightMode && YGFloatsEqual(lastHeight, height);
</s> add const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(effectiveLastWidth, effectiveWidth);
const bool hasSameHeightSpec = lastHeightMode == heightMode && YGFloatsEqual(effectiveLastHeight, effectiveHeight); </s> add bool useRoundedComparison = config != NULL && config->pointScaleFactor != 0;
const float effectiveWidth = useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false) : width;
const float effectiveHeight = useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false) : height;
const float effectiveLastWidth = useRoundedComparison ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false) : lastWidth;
const float effectiveLastHeight = useRoundedComparison ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false) : lastHeight; </s> remove const float marginColumn);
</s> add const float marginColumn,
YGConfigRef config); </s> remove config->pointScaleFactor = 1.0f / pixelsInPoint;
}
}
static float YGRoundValueToPixelGrid(const float value,
const float pointScaleFactor,
const bool forceCeil,
const bool forceFloor) {
float fractial = fmodf(value, pointScaleFactor);
if (YGFloatsEqual(fractial, 0)) {
// Still remove fractial as fractial could be extremely small.
return value - fractial;
}
if (forceCeil) {
return value - fractial + pointScaleFactor;
} else if (forceFloor) {
return value - fractial;
} else {
return value - fractial + (fractial >= pointScaleFactor / 2.0f ? pointScaleFactor : 0);
</s> add config->pointScaleFactor = pixelsInPoint; </s> remove float totalFlexBasis = 0;
</s> add float totalOuterFlexBasis = 0; </s> remove const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
</s> add // We want to make sure we don't call measure with negative size
const float innerWidth = YGFloatIsUndefined(availableWidth)
? availableWidth
: fmaxf(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
const float innerHeight = YGFloatIsUndefined(availableHeight)
? availableHeight
: fmaxf(0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn); | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep add keep keep keep keep keep keep | <mask> if (lastComputedHeight < 0 || lastComputedWidth < 0) {
<mask> return false;
<mask> }
<mask>
<mask> const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(effectiveLastWidth, effectiveWidth);
<mask> const bool hasSameHeightSpec = lastHeightMode == heightMode && YGFloatsEqual(effectiveLastHeight, effectiveHeight);
<mask>
<mask> const bool widthIsCompatible =
<mask> hasSameWidthSpec || YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(widthMode,
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(lastWidth, width);
const bool hasSameHeightSpec = lastHeightMode == heightMode && YGFloatsEqual(lastHeight, height);
</s> add const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(effectiveLastWidth, effectiveWidth);
const bool hasSameHeightSpec = lastHeightMode == heightMode && YGFloatsEqual(effectiveLastHeight, effectiveHeight); </s> remove const float marginColumn) {
</s> add const float marginColumn,
const YGConfigRef config) { </s> remove const bool flexBasisOverflows =
measureModeMainDim == YGMeasureModeUndefined ? false : totalFlexBasis > availableInnerMainDim;
</s> add const bool flexBasisOverflows = measureModeMainDim == YGMeasureModeUndefined
? false
: totalOuterFlexBasis > availableInnerMainDim; </s> add UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FBJSContextStartGCTimers)
</s> remove totalFlexBasis += child->layout.computedFlexBasis;
</s> add totalOuterFlexBasis +=
child->layout.computedFlexBasis + YGNodeMarginForAxis(child, mainAxis, availableInnerWidth);
; </s> remove Object asObject();
</s> add RN_EXPORT Object asObject() const; | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace replace keep keep keep keep keep | <mask> if (lastComputedHeight < 0 || lastComputedWidth < 0) {
<mask> return false;
<mask> }
<mask>
<mask> const bool hasSameWidthSpec = lastWidthMode == widthMode && YGFloatsEqual(lastWidth, width);
<mask> const bool hasSameHeightSpec = lastHeightMode == heightMode && YGFloatsEqual(lastHeight, height);
<mask>
<mask> const bool widthIsCompatible =
<mask> hasSameWidthSpec || YGMeasureModeSizeIsExactAndMatchesOldMeasuredSize(widthMode,
<mask> width - marginRow,
<mask> lastComputedWidth) ||
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove const float marginColumn) {
</s> add const float marginColumn,
const YGConfigRef config) { </s> add bool useRoundedComparison = config != NULL && config->pointScaleFactor != 0;
const float effectiveWidth = useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false) : width;
const float effectiveHeight = useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false) : height;
const float effectiveLastWidth = useRoundedComparison ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false) : lastWidth;
const float effectiveLastHeight = useRoundedComparison ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false) : lastHeight; </s> remove const bool flexBasisOverflows =
measureModeMainDim == YGMeasureModeUndefined ? false : totalFlexBasis > availableInnerMainDim;
</s> add const bool flexBasisOverflows = measureModeMainDim == YGMeasureModeUndefined
? false
: totalOuterFlexBasis > availableInnerMainDim; </s> remove YGNodeTrailingPosition(child, mainAxis, width);
</s> add YGNodeTrailingMargin(child, mainAxis, width) -
YGNodeTrailingPosition(child, mainAxis, isMainAxisRow ? width : height); </s> add UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FBJSContextStartGCTimers)
</s> remove totalFlexBasis += child->layout.computedFlexBasis;
</s> add totalOuterFlexBasis +=
child->layout.computedFlexBasis + YGNodeMarginForAxis(child, mainAxis, availableInnerWidth);
; | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> layout->cachedLayout.availableHeight,
<mask> layout->cachedLayout.computedWidth,
<mask> layout->cachedLayout.computedHeight,
<mask> marginAxisRow,
<mask> marginAxisColumn)) {
<mask> cachedResults = &layout->cachedLayout;
<mask> } else {
<mask> // Try to use the measurement cache.
<mask> for (uint32_t i = 0; i < layout->nextCachedMeasurementsIndex; i++) {
<mask> if (YGNodeCanUseCachedMeasurement(widthMeasureMode,
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove float totalFlexBasis = 0;
</s> add float totalOuterFlexBasis = 0; </s> remove if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_MS) {
</s> add if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_NS) { </s> remove return getClass().getSimpleName() + " (virtual node)";
</s> add for (int i = 0; i < getChildCount(); i++) {
getChildAt(i).toStringWithIndentation(result, level + 1);
} </s> remove YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, hasMeasure, false) -
YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, textRounding, false) -
YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, textRounding); </s> remove marginAxisColumn)) {
</s> add marginAxisColumn,
config)) { </s> remove Matcher matcher = STACK_FRAME_PATTERN.matcher(stackTrace[i]);
if (!matcher.find()) {
throw new IllegalArgumentException(
</s> add if (stackTrace[i].equals("[native code]")) {
result[i] = new StackFrameImpl(null, stackTrace[i], -1, -1);
} else {
Matcher matcher = STACK_FRAME_PATTERN.matcher(stackTrace[i]);
if (!matcher.find()) {
throw new IllegalArgumentException( | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> layout->cachedMeasurements[i].availableHeight,
<mask> layout->cachedMeasurements[i].computedWidth,
<mask> layout->cachedMeasurements[i].computedHeight,
<mask> marginAxisRow,
<mask> marginAxisColumn)) {
<mask> cachedResults = &layout->cachedMeasurements[i];
<mask> break;
<mask> }
<mask> }
<mask> }
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove marginAxisColumn)) {
</s> add marginAxisColumn,
config)) { </s> remove auto func = [&previous] () {
local_ref<JThrowable> current;
try {
throw;
} catch(const JniException& ex) {
current = ex.getThrowable();
} catch(const std::ios_base::failure& ex) {
current = JIOException::create(ex.what());
} catch(const std::bad_alloc& ex) {
current = JOutOfMemoryError::create(ex.what());
} catch(const std::out_of_range& ex) {
current = JArrayIndexOutOfBoundsException::create(ex.what());
} catch(const std::system_error& ex) {
current = JCppSystemErrorException::create(ex);
} catch(const std::runtime_error& ex) {
current = JRuntimeException::create(ex.what());
} catch(const std::exception& ex) {
current = JCppException::create(ex.what());
} catch(const char* msg) {
current = JUnknownCppException::create(msg);
} catch(...) {
current = JUnknownCppException::create();
}
</s> add auto func = [&previous] (std::exception_ptr ptr) {
auto current = convertCppExceptionToJavaException(ptr); </s> remove throw;
} catch (const std::exception& e) {
try {
rethrow_if_nested();
} catch (...) {
denest(func);
}
func();
</s> add std::rethrow_exception(ptr);
addCppStack = false;
} catch (const JniException& ex) {
current = ex.getThrowable();
} catch (const std::ios_base::failure& ex) {
current = JIOException::create(ex.what());
} catch (const std::bad_alloc& ex) {
current = JOutOfMemoryError::create(ex.what());
} catch (const std::out_of_range& ex) {
current = JArrayIndexOutOfBoundsException::create(ex.what());
} catch (const std::system_error& ex) {
current = JCppSystemErrorException::create(ex);
} catch (const std::runtime_error& ex) {
current = JRuntimeException::create(ex.what());
} catch (const std::exception& ex) {
current = JCppException::create(ex.what());
} catch (const char* msg) {
current = JUnknownCppException::create(msg); </s> remove mShakeListener.onShake();
</s> add if (currentTimestamp - mLastShakeTimestamp >= VISIBLE_TIME_RANGE_NS) {
mNumShakes++;
}
mLastShakeTimestamp = currentTimestamp;
if (mNumShakes >= mMinNumShakes) {
mNumShakes = 0;
mLastShakeTimestamp = 0;
mShakeListener.onShake();
}
}
if (currentTimestamp - mLastShakeTimestamp > SHAKING_WINDOW_NS) {
mNumShakes = 0;
mLastShakeTimestamp = 0; </s> remove func();
</s> add current = JUnknownCppException::create();
}
if (addCppStack) {
addCppStacktraceToJavaException(current, ptr); </s> add String& operator=(String&& other) {
if (m_string) {
JSC_JSStringRelease(m_context, m_string);
}
m_context = other.m_context;
m_string = other.m_string;
other.m_string = nullptr;
return *this;
}
| https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> if (pixelsInPoint == 0.0f) {
<mask> // Zero is used to skip rounding
<mask> config->pointScaleFactor = 0.0f;
<mask> } else {
<mask> config->pointScaleFactor = 1.0f / pixelsInPoint;
<mask> }
<mask> }
<mask>
<mask> static float YGRoundValueToPixelGrid(const float value,
<mask> const float pointScaleFactor,
<mask> const bool forceCeil,
<mask> const bool forceFloor) {
<mask> float fractial = fmodf(value, pointScaleFactor);
<mask> if (YGFloatsEqual(fractial, 0)) {
<mask> // Still remove fractial as fractial could be extremely small.
<mask> return value - fractial;
<mask> }
<mask>
<mask> if (forceCeil) {
<mask> return value - fractial + pointScaleFactor;
<mask> } else if (forceFloor) {
<mask> return value - fractial;
<mask> } else {
<mask> return value - fractial + (fractial >= pointScaleFactor / 2.0f ? pointScaleFactor : 0);
<mask> }
<mask> }
<mask>
<mask> static void YGRoundToPixelGrid(const YGNodeRef node,
<mask> const float pointScaleFactor,
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove mShakeListener.onShake();
</s> add if (currentTimestamp - mLastShakeTimestamp >= VISIBLE_TIME_RANGE_NS) {
mNumShakes++;
}
mLastShakeTimestamp = currentTimestamp;
if (mNumShakes >= mMinNumShakes) {
mNumShakes = 0;
mLastShakeTimestamp = 0;
mShakeListener.onShake();
}
}
if (currentTimestamp - mLastShakeTimestamp > SHAKING_WINDOW_NS) {
mNumShakes = 0;
mLastShakeTimestamp = 0; </s> remove YGNodeAlignItem(node, child) == YGAlignFlexEnd) {
</s> add ((YGNodeAlignItem(node, child) == YGAlignFlexEnd) ^ (node->style.flexWrap == YGWrapWrapReverse))) { </s> remove const float marginColumn) {
</s> add const float marginColumn,
const YGConfigRef config) { </s> remove const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
</s> add // We want to make sure we don't call measure with negative size
const float innerWidth = YGFloatIsUndefined(availableWidth)
? availableWidth
: fmaxf(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
const float innerHeight = YGFloatIsUndefined(availableHeight)
? availableHeight
: fmaxf(0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn); </s> remove YGNodeTrailingPosition(child, crossAxis, width);
</s> add YGNodeTrailingMargin(child, crossAxis, width) -
YGNodeTrailingPosition(child, crossAxis, isMainAxisRow ? height : width); </s> add // Root nodes flexShrink should always be 0
if (node->parent == NULL) {
return 0.0;
} | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep replace keep keep replace keep keep keep keep | <mask> // lead to unwanted text truncation.
<mask> const bool hasMeasure = node->measure != NULL;
<mask>
<mask> node->layout.position[YGEdgeLeft] =
<mask> YGRoundValueToPixelGrid(nodeLeft, pointScaleFactor, false, hasMeasure);
<mask> node->layout.position[YGEdgeTop] =
<mask> YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, hasMeasure);
<mask>
<mask> node->layout.dimensions[YGDimensionWidth] =
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, textRounding); </s> remove YGRoundValueToPixelGrid(absoluteNodeRight, pointScaleFactor, hasMeasure, false) -
YGRoundValueToPixelGrid(absoluteNodeLeft, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(absoluteNodeRight, pointScaleFactor, textRounding, false) -
YGRoundValueToPixelGrid(absoluteNodeLeft, pointScaleFactor, false, textRounding); </s> remove YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, hasMeasure, false) -
YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, textRounding, false) -
YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, textRounding); </s> add bool useRoundedComparison = config != NULL && config->pointScaleFactor != 0;
const float effectiveWidth = useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false) : width;
const float effectiveHeight = useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false) : height;
const float effectiveLastWidth = useRoundedComparison ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false) : lastWidth;
const float effectiveLastHeight = useRoundedComparison ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false) : lastHeight; </s> add .nodeType = YGNodeTypeDefault, | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep replace keep keep replace replace keep keep | <mask> node->layout.position[YGEdgeLeft] =
<mask> YGRoundValueToPixelGrid(nodeLeft, pointScaleFactor, false, hasMeasure);
<mask> node->layout.position[YGEdgeTop] =
<mask> YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, hasMeasure);
<mask>
<mask> node->layout.dimensions[YGDimensionWidth] =
<mask> YGRoundValueToPixelGrid(absoluteNodeRight, pointScaleFactor, hasMeasure, false) -
<mask> YGRoundValueToPixelGrid(absoluteNodeLeft, pointScaleFactor, false, hasMeasure);
<mask> node->layout.dimensions[YGDimensionHeight] =
<mask> YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, hasMeasure, false) -
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove YGRoundValueToPixelGrid(nodeLeft, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(nodeLeft, pointScaleFactor, false, textRounding); </s> remove YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, hasMeasure, false) -
YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, textRounding, false) -
YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, textRounding); </s> remove const bool hasMeasure = node->measure != NULL;
</s> add const bool textRounding = node->nodeType == YGNodeTypeText; </s> add bool useRoundedComparison = config != NULL && config->pointScaleFactor != 0;
const float effectiveWidth = useRoundedComparison ? YGRoundValueToPixelGrid(width, config->pointScaleFactor, false, false) : width;
const float effectiveHeight = useRoundedComparison ? YGRoundValueToPixelGrid(height, config->pointScaleFactor, false, false) : height;
const float effectiveLastWidth = useRoundedComparison ? YGRoundValueToPixelGrid(lastWidth, config->pointScaleFactor, false, false) : lastWidth;
const float effectiveLastHeight = useRoundedComparison ? YGRoundValueToPixelGrid(lastHeight, config->pointScaleFactor, false, false) : lastHeight; </s> remove config->pointScaleFactor = 1.0f / pixelsInPoint;
}
}
static float YGRoundValueToPixelGrid(const float value,
const float pointScaleFactor,
const bool forceCeil,
const bool forceFloor) {
float fractial = fmodf(value, pointScaleFactor);
if (YGFloatsEqual(fractial, 0)) {
// Still remove fractial as fractial could be extremely small.
return value - fractial;
}
if (forceCeil) {
return value - fractial + pointScaleFactor;
} else if (forceFloor) {
return value - fractial;
} else {
return value - fractial + (fractial >= pointScaleFactor / 2.0f ? pointScaleFactor : 0);
</s> add config->pointScaleFactor = pixelsInPoint; | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace replace keep keep keep keep keep | <mask> node->layout.dimensions[YGDimensionWidth] =
<mask> YGRoundValueToPixelGrid(absoluteNodeRight, pointScaleFactor, hasMeasure, false) -
<mask> YGRoundValueToPixelGrid(absoluteNodeLeft, pointScaleFactor, false, hasMeasure);
<mask> node->layout.dimensions[YGDimensionHeight] =
<mask> YGRoundValueToPixelGrid(absoluteNodeBottom, pointScaleFactor, hasMeasure, false) -
<mask> YGRoundValueToPixelGrid(absoluteNodeTop, pointScaleFactor, false, hasMeasure);
<mask>
<mask> const uint32_t childCount = YGNodeListCount(node->children);
<mask> for (uint32_t i = 0; i < childCount; i++) {
<mask> YGRoundToPixelGrid(YGNodeGetChild(node, i), pointScaleFactor, absoluteNodeLeft, absoluteNodeTop);
<mask> }
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove YGRoundValueToPixelGrid(absoluteNodeRight, pointScaleFactor, hasMeasure, false) -
YGRoundValueToPixelGrid(absoluteNodeLeft, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(absoluteNodeRight, pointScaleFactor, textRounding, false) -
YGRoundValueToPixelGrid(absoluteNodeLeft, pointScaleFactor, false, textRounding); </s> remove YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(nodeTop, pointScaleFactor, false, textRounding); </s> remove YGRoundValueToPixelGrid(nodeLeft, pointScaleFactor, false, hasMeasure);
</s> add YGRoundValueToPixelGrid(nodeLeft, pointScaleFactor, false, textRounding); </s> remove const bool hasMeasure = node->measure != NULL;
</s> add const bool textRounding = node->nodeType == YGNodeTypeText; </s> remove float totalFlexBasis = 0;
</s> add float totalOuterFlexBasis = 0; </s> remove if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_MS) {
</s> add if (currentTimestamp - mTimestamps[index] < VISIBLE_TIME_RANGE_NS) { | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.c |
keep keep keep keep replace keep keep keep keep keep | <mask> const float lastHeight,
<mask> const float lastComputedWidth,
<mask> const float lastComputedHeight,
<mask> const float marginRow,
<mask> const float marginColumn);
<mask>
<mask> WIN_EXPORT void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode);
<mask>
<mask> #define YG_NODE_PROPERTY(type, name, paramName) \
<mask> WIN_EXPORT void YGNodeSet##name(const YGNodeRef node, type paramName); \
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> remove const float marginColumn) {
</s> add const float marginColumn,
const YGConfigRef config) { </s> remove #define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \
type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) { \
YGAssertWithNode(node, edge < YGEdgeEnd, "Cannot get layout properties of multi-edge shorthands"); \
\
if (edge == YGEdgeLeft) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeEnd]; \
} else { \
return node->layout.instanceName[YGEdgeStart]; \
} \
} \
\
if (edge == YGEdgeRight) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeStart]; \
} else { \
return node->layout.instanceName[YGEdgeEnd]; \
} \
} \
\
return node->layout.instanceName[edge]; \
</s> add #define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \
type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) { \
YGAssertWithNode(node, \
edge < YGEdgeEnd, \
"Cannot get layout properties of multi-edge shorthands"); \
\
if (edge == YGEdgeLeft) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeEnd]; \
} else { \
return node->layout.instanceName[YGEdgeStart]; \
} \
} \
\
if (edge == YGEdgeRight) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeStart]; \
} else { \
return node->layout.instanceName[YGEdgeEnd]; \
} \
} \
\
return node->layout.instanceName[edge]; \ </s> remove YGPrintNumberIfNotUndefined(node, str, YGComputedEdgeValue(edges, YGEdgeLeft, &YGValueUndefined));
</s> add YGPrintNumberIfNotUndefined(node, str, YGComputedEdgeValue(edges, edge, &YGValueUndefined)); </s> remove config->pointScaleFactor = 1.0f / pixelsInPoint;
}
}
static float YGRoundValueToPixelGrid(const float value,
const float pointScaleFactor,
const bool forceCeil,
const bool forceFloor) {
float fractial = fmodf(value, pointScaleFactor);
if (YGFloatsEqual(fractial, 0)) {
// Still remove fractial as fractial could be extremely small.
return value - fractial;
}
if (forceCeil) {
return value - fractial + pointScaleFactor;
} else if (forceFloor) {
return value - fractial;
} else {
return value - fractial + (fractial >= pointScaleFactor / 2.0f ? pointScaleFactor : 0);
</s> add config->pointScaleFactor = pixelsInPoint; </s> add #define YGNodeTypeCount 2
typedef YG_ENUM_BEGIN(YGNodeType) {
YGNodeTypeDefault,
YGNodeTypeText,
} YG_ENUM_END(YGNodeType);
WIN_EXPORT const char *YGNodeTypeToString(const YGNodeType value);
</s> remove !YGFloatIsUndefined(baseline),
"Expect custom baseline function to not return NaN");
</s> add !YGFloatIsUndefined(baseline),
"Expect custom baseline function to not return NaN"); | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.h |
keep add keep keep keep keep keep keep | <mask> YG_NODE_PROPERTY(YGPrintFunc, PrintFunc, printFunc);
<mask> YG_NODE_PROPERTY(bool, HasNewLayout, hasNewLayout);
<mask>
<mask> YG_NODE_STYLE_PROPERTY(YGDirection, Direction, direction);
<mask> YG_NODE_STYLE_PROPERTY(YGFlexDirection, FlexDirection, flexDirection);
<mask> YG_NODE_STYLE_PROPERTY(YGJustify, JustifyContent, justifyContent);
<mask> YG_NODE_STYLE_PROPERTY(YGAlign, AlignContent, alignContent);
<mask> YG_NODE_STYLE_PROPERTY(YGAlign, AlignItems, alignItems);
</s> Update RN Android with SDK 19
fbshipit-source-id: fcb472a571 </s> add YG_NODE_PROPERTY_IMPL(YGNodeType, NodeType, nodeType, nodeType); </s> remove #define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \
type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) { \
YGAssertWithNode(node, edge < YGEdgeEnd, "Cannot get layout properties of multi-edge shorthands"); \
\
if (edge == YGEdgeLeft) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeEnd]; \
} else { \
return node->layout.instanceName[YGEdgeStart]; \
} \
} \
\
if (edge == YGEdgeRight) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeStart]; \
} else { \
return node->layout.instanceName[YGEdgeEnd]; \
} \
} \
\
return node->layout.instanceName[edge]; \
</s> add #define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \
type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) { \
YGAssertWithNode(node, \
edge < YGEdgeEnd, \
"Cannot get layout properties of multi-edge shorthands"); \
\
if (edge == YGEdgeLeft) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeEnd]; \
} else { \
return node->layout.instanceName[YGEdgeStart]; \
} \
} \
\
if (edge == YGEdgeRight) { \
if (node->layout.direction == YGDirectionRTL) { \
return node->layout.instanceName[YGEdgeStart]; \
} else { \
return node->layout.instanceName[YGEdgeEnd]; \
} \
} \
\
return node->layout.instanceName[edge]; \ </s> remove import android.util.Base64;
</s> add import javax.annotation.Nullable; </s> remove import okhttp3.RequestBody;
</s> add </s> remove import okhttp3.ResponseBody;
import okhttp3.ws.WebSocket;
import okhttp3.ws.WebSocketCall;
import okhttp3.ws.WebSocketListener;
import java.net.URISyntaxException;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import java.util.concurrent.TimeUnit;
import okio.Buffer;
</s> add import okhttp3.WebSocket;
import okhttp3.WebSocketListener; </s> remove WebSocketCall.create(client, builder.build()).enqueue(new WebSocketListener() {
</s> add client.newWebSocket(builder.build(), new WebSocketListener() { | https://github.com/expo/expo/commit/7b58f4ab024999b96bc75072438f9d9cdc0bc7d2 | android/ReactCommon/yoga/yoga/Yoga.h |
keep replace keep keep keep keep keep | <mask> import { PermissionResponse, PermissionType, PermissionMap, PermissionStatus, PermissionExpiration, PermissionInfo } from './Permissions.types';
<mask> export { usePermissions } from './PermissionsHooks';
<mask> export { PermissionStatus, PermissionResponse, PermissionExpiration, PermissionMap, PermissionInfo, PermissionType, };
<mask> export declare const CAMERA = "camera";
<mask> export declare const CAMERA_ROLL = "cameraRoll";
<mask> export declare const AUDIO_RECORDING = "audioRecording";
<mask> export declare const LOCATION = "location";
</s> [permissions] Remove require cycle (#9219)
* Remove require cycle introduced in #8788
* Update CHANGELOG.md </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse, askAsync, getAsync } from './Permissions';
</s> add import { askAsync, getAsync } from './Permissions';
import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove import { PermissionType, PermissionResponse } from './Permissions';
</s> add import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove "main": "build/Permissions.js",
"types": "build/Permissions.d.ts",
</s> add "main": "build/index.js",
"types": "build/index.d.ts", | https://github.com/expo/expo/commit/81f829023dd0a113e4e9bcdb5fd3987577e87fbb | packages/expo-permissions/build/Permissions.d.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Platform } from 'react-native';
<mask> import { coalesceExpirations, coalesceStatuses, coalesceCanAskAgain, coalesceGranted, } from './CoalescedPermissions';
<mask> import Permissions from './ExpoPermissions';
<mask> import { PermissionStatus, } from './Permissions.types';
<mask> export { usePermissions } from './PermissionsHooks';
<mask> export { PermissionStatus, };
<mask> export const CAMERA = 'camera';
<mask> export const CAMERA_ROLL = 'cameraRoll';
<mask> export const AUDIO_RECORDING = 'audioRecording';
<mask> export const LOCATION = 'location';
</s> [permissions] Remove require cycle (#9219)
* Remove require cycle introduced in #8788
* Update CHANGELOG.md </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse, askAsync, getAsync } from './Permissions';
</s> add import { askAsync, getAsync } from './Permissions';
import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse } from './Permissions';
</s> add import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove "main": "build/Permissions.js",
"types": "build/Permissions.d.ts",
</s> add "main": "build/index.js",
"types": "build/index.d.ts", | https://github.com/expo/expo/commit/81f829023dd0a113e4e9bcdb5fd3987577e87fbb | packages/expo-permissions/build/Permissions.js |
replace keep keep keep keep keep | <mask> import { PermissionType, PermissionResponse } from './Permissions';
<mask> /**
<mask> * Get or ask permission for protected functionality within the app.
<mask> * It returns the permission response after fetching or asking it.
<mask> * The hook fetches the permissions when rendered, by default.
<mask> * To ask the user permission, use the `askPermission` callback or `ask` option.
</s> [permissions] Remove require cycle (#9219)
* Remove require cycle introduced in #8788
* Update CHANGELOG.md </s> remove import { PermissionType, PermissionResponse, askAsync, getAsync } from './Permissions';
</s> add import { askAsync, getAsync } from './Permissions';
import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove "main": "build/Permissions.js",
"types": "build/Permissions.d.ts",
</s> add "main": "build/index.js",
"types": "build/index.d.ts", | https://github.com/expo/expo/commit/81f829023dd0a113e4e9bcdb5fd3987577e87fbb | packages/expo-permissions/build/PermissionsHooks.d.ts |
keep keep keep keep replace replace keep keep keep keep keep | <mask> {
<mask> "name": "expo-permissions",
<mask> "version": "9.0.1",
<mask> "description": "Allows you prompt for various permissions to access device sensors, personal data, etc.",
<mask> "main": "build/Permissions.js",
<mask> "types": "build/Permissions.d.ts",
<mask> "sideEffects": false,
<mask> "scripts": {
<mask> "build": "expo-module build",
<mask> "clean": "expo-module clean",
<mask> "lint": "expo-module lint",
</s> [permissions] Remove require cycle (#9219)
* Remove require cycle introduced in #8788
* Update CHANGELOG.md </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse, askAsync, getAsync } from './Permissions';
</s> add import { askAsync, getAsync } from './Permissions';
import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse } from './Permissions';
</s> add import { PermissionResponse, PermissionType } from './Permissions.types'; | https://github.com/expo/expo/commit/81f829023dd0a113e4e9bcdb5fd3987577e87fbb | packages/expo-permissions/package.json |
keep keep keep keep replace replace keep keep keep keep keep | <mask> PermissionExpiration,
<mask> PermissionInfo,
<mask> } from './Permissions.types';
<mask>
<mask> export { usePermissions } from './PermissionsHooks';
<mask>
<mask> export {
<mask> PermissionStatus,
<mask> PermissionResponse,
<mask> PermissionExpiration,
<mask> PermissionMap,
</s> [permissions] Remove require cycle (#9219)
* Remove require cycle introduced in #8788
* Update CHANGELOG.md </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse, askAsync, getAsync } from './Permissions';
</s> add import { askAsync, getAsync } from './Permissions';
import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove import { PermissionType, PermissionResponse } from './Permissions';
</s> add import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove "main": "build/Permissions.js",
"types": "build/Permissions.d.ts",
</s> add "main": "build/index.js",
"types": "build/index.d.ts", | https://github.com/expo/expo/commit/81f829023dd0a113e4e9bcdb5fd3987577e87fbb | packages/expo-permissions/src/Permissions.ts |
keep keep replace keep keep keep keep keep | <mask> import { useCallback, useEffect, useState } from 'react';
<mask>
<mask> import { PermissionType, PermissionResponse, askAsync, getAsync } from './Permissions';
<mask>
<mask> /**
<mask> * Get or ask permission for protected functionality within the app.
<mask> * It returns the permission response after fetching or asking it.
<mask> * The hook fetches the permissions when rendered, by default.
</s> [permissions] Remove require cycle (#9219)
* Remove require cycle introduced in #8788
* Update CHANGELOG.md </s> remove import { PermissionType, PermissionResponse } from './Permissions';
</s> add import { PermissionResponse, PermissionType } from './Permissions.types'; </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove export { usePermissions } from './PermissionsHooks';
</s> add </s> remove "main": "build/Permissions.js",
"types": "build/Permissions.d.ts",
</s> add "main": "build/index.js",
"types": "build/index.d.ts", | https://github.com/expo/expo/commit/81f829023dd0a113e4e9bcdb5fd3987577e87fbb | packages/expo-permissions/src/PermissionsHooks.ts |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> What is the difference between Exponent and React Native?
<mask> ---------------------------------------------------------
<mask>
<mask> Exponent is kind of like Rails for React Native. Lots of things are setup for you, and so its quicker to get started
<mask> and on the right path.
<mask>
<mask> With Exponent, you don't need Xcode or Android Studio. You just write JavaScript using whatever text editor you are
<mask> comfortable with (Atom, vim, emacs, Sublime, VS Code, whatever you like). You can run XDE (our desktop software) on
<mask> Mac, Windows, and Linux.
</s> [Docs] Fix up some grammar </s> remove Exponent is kind of like Rails for React Native. Lots of things are setup for you, and so its quicker to get started
</s> add Exponent is kind of like Rails for React Native. Lots of things are set up for you, and so it's quicker to get started </s> remove have to setup APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it
</s> add have to set up APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it </s> remove have to setup APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it
</s> add have to set up APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it </s> remove This can take a long time to get setup properly yourself, but you should be able to get it working in 10 minutes or
</s> add This can take a long time to get set up properly yourself, but you should be able to get it working in 10 minutes or </s> remove This can take a long time to get setup properly yourself, but you should be able to get it working in 10 minutes or
</s> add This can take a long time to get set up properly yourself, but you should be able to get it working in 10 minutes or | https://github.com/expo/expo/commit/835a061f3d8f70a6ca55e86cce6c61c0d39e8c55 | docs/versions/unversioned/introduction/faq.rst |
keep keep keep replace keep keep keep keep replace keep keep keep | <mask> * **Push Notifications**
<mask>
<mask> Push notifications work right out of the box across both iOS and Android, using a single, unified API. You don't
<mask> have to setup APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it
<mask> can be right now
<mask>
<mask> * **Facebook Login**
<mask>
<mask> This can take a long time to get setup properly yourself, but you should be able to get it working in 10 minutes or
<mask> less on Exponent.
<mask>
<mask> * **Instant Updating**
</s> [Docs] Fix up some grammar </s> remove have to setup APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it
</s> add have to set up APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it </s> remove This can take a long time to get setup properly yourself, but you should be able to get it working in 10 minutes or
</s> add This can take a long time to get set up properly yourself, but you should be able to get it working in 10 minutes or </s> remove Exponent is kind of like Rails for React Native. Lots of things are setup for you, and so its quicker to get started
</s> add Exponent is kind of like Rails for React Native. Lots of things are set up for you, and so it's quicker to get started </s> remove Exponent is kind of like Rails for React Native. Lots of things are setup for you, and so its quicker to get started
</s> add Exponent is kind of like Rails for React Native. Lots of things are set up for you, and so it's quicker to get started | https://github.com/expo/expo/commit/835a061f3d8f70a6ca55e86cce6c61c0d39e8c55 | docs/versions/unversioned/introduction/faq.rst |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> What is the difference between Exponent and React Native?
<mask> ---------------------------------------------------------
<mask>
<mask> Exponent is kind of like Rails for React Native. Lots of things are setup for you, and so its quicker to get started
<mask> and on the right path.
<mask>
<mask> With Exponent, you don't need Xcode or Android Studio. You just write JavaScript using whatever text editor you are
<mask> comfortable with (Atom, vim, emacs, Sublime, VS Code, whatever you like). You can run XDE (our desktop software) on
<mask> Mac, Windows, and Linux.
</s> [Docs] Fix up some grammar | https://github.com/expo/expo/commit/835a061f3d8f70a6ca55e86cce6c61c0d39e8c55 | docs/versions/v10.0.0/introduction/faq.rst |
keep keep keep replace keep keep keep keep replace keep | <mask> * **Push Notifications**
<mask>
<mask> Push notifications work right out of the box across both iOS and Android, using a single, unified API. You don't
<mask> have to setup APNS and GCM/FCM or configure ZeroPush or anything like that. We think we've made this as easy as it
<mask> can be right now
<mask>
<mask> * **Facebook Login**
<mask>
<mask> This can take a long time to get setup properly yourself, but you should be able to get it working in 10 minutes or
<mask> less on Exponent.
</s> [Docs] Fix up some grammar | https://github.com/expo/expo/commit/835a061f3d8f70a6ca55e86cce6c61c0d39e8c55 | docs/versions/v10.0.0/introduction/faq.rst |
replace replace keep keep keep keep keep | <mask> import { createStackNavigator } from 'react-navigation';
<mask>
<mask> import AppAuth from '../screens/AppAuthScreen';
<mask> import AuthSession from '../screens/AuthSessionScreen';
<mask> import BackgroundFetch from '../screens/BackgroundFetchScreen';
<mask> import Branch from '../screens/BranchScreen';
<mask> import Calendars from '../screens/CalendarsScreen';
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import {
Alert,
ListView,
PixelRatio,
Platform,
StyleSheet,
Text,
TouchableHighlight,
View,
} from 'react-native';
</s> add import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native'; </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/ExpoApisStackNavigator.js |
keep keep add keep keep keep keep keep | <mask> import Util from '../screens/UtilScreen';
<mask> import ViewShot from '../screens/ViewShotScreen';
<mask> import WebBrowser from '../screens/WebBrowserScreen';
<mask> import StackConfig from './StackConfig';
<mask>
<mask> const ExpoApisStackNavigator = createStackNavigator(
<mask> {
<mask> ExpoApis,
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove
</s> add import { Platform } from 'react-native'; </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/ExpoApisStackNavigator.js |
replace replace keep keep keep keep keep | <mask> import { createStackNavigator } from 'react-navigation';
<mask>
<mask> import AdMob from '../screens/AdMobScreen';
<mask> import BarCodeScanner from '../screens/BarCodeScannerScreen';
<mask> import BlurView from '../screens/BlurViewScreen';
<mask> import Camera from '../screens/Camera/CameraScreen';
<mask> import ExpoComponents from '../screens/ExpoComponentsScreen';
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import {
Alert,
ListView,
PixelRatio,
Platform,
StyleSheet,
Text,
TouchableHighlight,
View,
} from 'react-native';
</s> add import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native'; </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/ExpoComponentsStackNavigator.js |
keep keep keep add keep keep keep keep keep | <mask> import Screens from '../screens/Screens';
<mask> import SVGExample from '../screens/SVG/SVGExampleScreen';
<mask> import SVG from '../screens/SVG/SVGScreen';
<mask> import Video from '../screens/VideoScreen';
<mask> import StackConfig from './StackConfig';
<mask>
<mask> const ExpoComponentsStackNavigator = createStackNavigator(
<mask> {
<mask> ExpoComponents,
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove
</s> add import { Platform } from 'react-native'; | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/ExpoComponentsStackNavigator.js |
keep keep keep add keep keep keep keep keep keep | <mask> default: createBottomTabNavigator,
<mask> android: createMaterialBottomTabNavigator,
<mask> });
<mask>
<mask> const MainTabNavigator = createTabNavigator(
<mask> {
<mask> ExpoApis: ExpoApisStackNavigator,
<mask> ExpoComponents: ExpoComponentsStackNavigator,
<mask> ReactNativeCore: ReactNativeCoreStackNavigator,
<mask> },
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> add MainTabNavigator.path = '';
MainTabNavigator.navigationOptions = {
title: 'Native Component List',
};
</s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> remove return [
'AdMob',
'BarCodeScanner',
'BlurView',
'Camera',
'FacebookAds',
'GestureHandlerList',
'GestureHandlerPinch',
'GestureHandlerSwipeable',
'ImagePreview',
'Gif',
'GL',
'LinearGradient',
'Lottie',
'Maps',
'Screens',
'SVG',
'Video',
];
</s> add return Platform.select({
web: [
'AdMob',
'BlurView',
'Camera',
'ImagePreview',
'Gif',
'GL',
'LinearGradient',
'Lottie',
'Maps',
'SVG',
'Video',
],
default: [
'AdMob',
'BarCodeScanner',
'BlurView',
'Camera',
'FacebookAds',
'GestureHandlerList',
'GestureHandlerPinch',
'GestureHandlerSwipeable',
'ImagePreview',
'Gif',
'GL',
'LinearGradient',
'Lottie',
'Maps',
'Screens',
'SVG',
'Video',
],
}); </s> add import createStackNavigator from './createStackNavigator'; | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/MainTabNavigator.js |
keep keep keep add keep | <mask> },
<mask> }
<mask> );
<mask>
<mask> export default MainTabNavigator;
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} </s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add </s> remove
</s> add import { Platform } from 'react-native'; </s> add static path = '';
</s> add static path = '';
| https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/MainTabNavigator.js |
replace replace keep keep keep keep keep | <mask> import { createStackNavigator } from 'react-navigation';
<mask>
<mask> import BasicMaskExample from '../screens/BasicMaskScreen';
<mask> import GLMaskExample from '../screens/MaskGLScreen';
<mask> import ReactNativeCore from '../screens/ReactNativeCoreScreen';
<mask> import StackConfig from './StackConfig';
<mask>
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import {
Alert,
ListView,
PixelRatio,
Platform,
StyleSheet,
Text,
TouchableHighlight,
View,
} from 'react-native';
</s> add import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native'; | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/ReactNativeCoreStackNavigator.js |
keep add keep keep keep keep | <mask> import GLMaskExample from '../screens/MaskGLScreen';
<mask> import ReactNativeCore from '../screens/ReactNativeCoreScreen';
<mask> import StackConfig from './StackConfig';
<mask>
<mask> const ReactNativeCoreStackNavigator = createStackNavigator(
<mask> {
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> add import createStackNavigator from './createStackNavigator'; </s> add import createStackNavigator from './createStackNavigator'; </s> remove
</s> add import { Platform } from 'react-native'; </s> add import { withNavigation } from 'react-navigation'; </s> remove import { createStackNavigator } from 'react-navigation';
</s> add | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/navigation/ReactNativeCoreStackNavigator.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> this.setState({ permissionsGranted: status === 'granted' });
<mask> }
<mask>
<mask> componentDidMount() {
<mask> FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
<mask> console.log(e, 'Directory exists');
<mask> });
<mask> }
<mask>
<mask> getRatios = async () => {
<mask> const ratios = await this.camera.getSupportedRatios();
<mask> return ratios;
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> add ExpoApisStackNavigator.path = '';
ExpoApisStackNavigator.navigationOptions = {
title: 'Expo API',
};
ExpoComponentsStackNavigator.path = '';
ExpoComponentsStackNavigator.navigationOptions = {
title: 'Expo Components',
};
ReactNativeCoreStackNavigator.path = '';
ReactNativeCoreStackNavigator.navigationOptions = {
title: 'React Native Core',
};
</s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} </s> add import { withNavigation } from 'react-navigation'; </s> remove this._notificationSubscription = Notifications.addListener(this._handleNotification);
</s> add if (Platform.OS !== 'web') {
this._notificationSubscription = Notifications.addListener(this._handleNotification);
} | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/Camera/CameraScreen.js |
keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> import React from 'react';
<mask> import {
<mask> Alert,
<mask> ListView,
<mask> PixelRatio,
<mask> Platform,
<mask> StyleSheet,
<mask> Text,
<mask> TouchableHighlight,
<mask> View,
<mask> } from 'react-native';
<mask>
<mask> import { Entypo } from '@expo/vector-icons';
<mask> import ExpoAPIIcon from '../components/ExpoAPIIcon';
<mask> import { ScrollView, withNavigation } from 'react-navigation';
<mask>
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add import { withNavigation } from 'react-navigation'; </s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add </s> remove
</s> add import { Platform } from 'react-native'; </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ComponentListScreen.js |
keep keep keep add keep keep keep keep keep keep | <mask> import React from 'react';
<mask> import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native';
<mask>
<mask> import { Entypo } from '@expo/vector-icons';
<mask> import ExpoAPIIcon from '../components/ExpoAPIIcon';
<mask>
<mask> class ComponentListScreen extends React.Component {
<mask> _renderExampleSection = ({ item: exampleName }) => {
<mask> return (
<mask> <TouchableHighlight
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove import {
Alert,
ListView,
PixelRatio,
Platform,
StyleSheet,
Text,
TouchableHighlight,
View,
} from 'react-native';
</s> add import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native'; </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add </s> remove
</s> add import { Platform } from 'react-native'; </s> remove import { createStackNavigator } from 'react-navigation';
</s> add </s> remove import { createStackNavigator } from 'react-navigation';
</s> add | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ComponentListScreen.js |
keep replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep | <mask> import ExpoAPIIcon from '../components/ExpoAPIIcon';
<mask> import { ScrollView, withNavigation } from 'react-navigation';
<mask>
<mask> @withNavigation
<mask> export default class ComponentListScreen extends React.Component {
<mask> state = {
<mask> dataSource: new ListView.DataSource({
<mask> rowHasChanged: () => false,
<mask> sectionHeaderHasChanged: () => false,
<mask> }),
<mask> };
<mask>
<mask> componentWillMount() {
<mask> const { tabName } = this.props;
<mask> }
<mask>
<mask> componentDidMount() {
<mask> let dataSource = this.state.dataSource.cloneWithRowsAndSections(
<mask> this.props.apis.reduce((sections, name) => {
<mask> sections[name] = [() => this._renderExampleSection(name)];
<mask> return sections;
<mask> }, {})
<mask> );
<mask>
<mask> this.setState({ dataSource });
<mask> }
<mask>
<mask> _renderExampleSection = exampleName => {
<mask> return (
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add import { withNavigation } from 'react-navigation'; </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> remove
</s> add import { Platform } from 'react-native'; </s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> remove import {
Alert,
ListView,
PixelRatio,
Platform,
StyleSheet,
Text,
TouchableHighlight,
View,
} from 'react-native';
</s> add import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native'; | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ComponentListScreen.js |
keep keep keep keep replace keep keep keep keep keep | <mask> };
<mask>
<mask> render() {
<mask> return (
<mask> <ListView
<mask> ref={view => {
<mask> this._listView = view;
<mask> }}
<mask> stickySectionHeadersEnabled
<mask> removeClippedSubviews={false}
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} </s> remove st
</s> add </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> add static path = '';
</s> add import { withNavigation } from 'react-navigation'; </s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ComponentListScreen.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> removeClippedSubviews={false}
<mask> keyboardShouldPersistTaps="handled"
<mask> keyboardDismissMode="on-drag"
<mask> contentContainerStyle={{ backgroundColor: '#fff' }}
<mask> renderScrollComponent={props => <ScrollView {...props} />}
<mask> dataSource={this.state.dataSource}
<mask> renderRow={this._renderRow}
<mask> />
<mask> );
<mask> }
<mask>
<mask> _scrollToTop = () => {
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove <ListView
</s> add <FlatList </s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove st
</s> add </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> add MainTabNavigator.path = '';
MainTabNavigator.navigationOptions = {
title: 'Native Component List',
};
| https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ComponentListScreen.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask>
<mask> _scrollToTop = () => {
<mask> this._listView.scrollTo({ x: 0, y: 0 });
<mask> };
<mask>
<mask> _renderRow = renderRowFn => {
<mask> return <View>{renderRowFn && renderRowFn()}</View>;
<mask> };
<mask> }
<mask>
<mask> const styles = StyleSheet.create({
<mask> container: {
<mask> flex: 1,
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} </s> remove this._notificationSubscription = Notifications.addListener(this._handleNotification);
</s> add if (Platform.OS !== 'web') {
this._notificationSubscription = Notifications.addListener(this._handleNotification);
} </s> add ExpoApisStackNavigator.path = '';
ExpoApisStackNavigator.navigationOptions = {
title: 'Expo API',
};
ExpoComponentsStackNavigator.path = '';
ExpoComponentsStackNavigator.navigationOptions = {
title: 'Expo Components',
};
ReactNativeCoreStackNavigator.path = '';
ReactNativeCoreStackNavigator.navigationOptions = {
title: 'React Native Core',
};
</s> remove <ListView
</s> add <FlatList | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ComponentListScreen.js |
keep add keep keep keep keep keep | <mask>
<mask> export default class ExpoApisScreen extends React.Component {
<mask> static navigationOptions = {
<mask> title: 'APIs in Expo SDK',
<mask> };
<mask>
<mask> componentWillMount() {
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add static path = '';
</s> remove this._notificationSubscription = Notifications.addListener(this._handleNotification);
</s> add if (Platform.OS !== 'web') {
this._notificationSubscription = Notifications.addListener(this._handleNotification);
} </s> add static path = '';
</s> remove
</s> add import { Platform } from 'react-native'; </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ExpoApisScreen.js |
keep keep keep keep replace keep keep keep keep keep | <mask> title: 'APIs in Expo SDK',
<mask> };
<mask>
<mask> componentWillMount() {
<mask> this._notificationSubscription = Notifications.addListener(this._handleNotification);
<mask> }
<mask>
<mask> componentWillUnmount() {
<mask> this._notificationSubscription && this._notificationSubscription.remove();
<mask> }
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add static path = '';
</s> add static path = '';
</s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> add MainTabNavigator.path = '';
MainTabNavigator.navigationOptions = {
title: 'Native Component List',
};
</s> add ExpoApisStackNavigator.path = '';
ExpoApisStackNavigator.navigationOptions = {
title: 'Expo API',
};
ExpoComponentsStackNavigator.path = '';
ExpoComponentsStackNavigator.navigationOptions = {
title: 'Expo Components',
};
ReactNativeCoreStackNavigator.path = '';
ReactNativeCoreStackNavigator.navigationOptions = {
title: 'React Native Core',
};
| https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ExpoApisScreen.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep | <mask> return <ComponentListScreen apis={this._getApis()} tabName="ExpoApis" />;
<mask> }
<mask>
<mask> _getApis = () => {
<mask> return [
<mask> 'AppAuth',
<mask> 'AuthSession',
<mask> 'BackgroundFetch',
<mask> 'Branch',
<mask> 'Calendars',
<mask> 'Constants',
<mask> 'Contacts',
<mask> 'DocumentPicker',
<mask> 'FacebookLogin',
<mask> 'FileSystem',
<mask> 'Font',
<mask> 'Geocoding',
<mask> 'Google',
<mask> 'GoogleSignIn',
<mask> 'Haptic',
<mask> 'ImagePicker',
<mask> 'ImageManipulator',
<mask> 'IntentLauncher',
<mask> 'KeepAwake',
<mask> 'LocalAuthentication',
<mask> 'Localization',
<mask> 'Location',
<mask> 'MailComposer',
<mask> 'MediaLibrary',
<mask> 'Notification',
<mask> 'Pedometer',
<mask> 'Permissions',
<mask> 'Print',
<mask> 'MediaLibrary',
<mask> 'ScreenOrientation',
<mask> 'Sensor',
<mask> 'SecureStore',
<mask> 'SMS',
<mask> 'StoreReview',
<mask> 'TaskManager',
<mask> 'TextToSpeech',
<mask> 'Util',
<mask> 'WebBrowser',
<mask> 'ViewShot',
<mask> ];
<mask> };
<mask> }
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove return [
'AdMob',
'BarCodeScanner',
'BlurView',
'Camera',
'FacebookAds',
'GestureHandlerList',
'GestureHandlerPinch',
'GestureHandlerSwipeable',
'ImagePreview',
'Gif',
'GL',
'LinearGradient',
'Lottie',
'Maps',
'Screens',
'SVG',
'Video',
];
</s> add return Platform.select({
web: [
'AdMob',
'BlurView',
'Camera',
'ImagePreview',
'Gif',
'GL',
'LinearGradient',
'Lottie',
'Maps',
'SVG',
'Video',
],
default: [
'AdMob',
'BarCodeScanner',
'BlurView',
'Camera',
'FacebookAds',
'GestureHandlerList',
'GestureHandlerPinch',
'GestureHandlerSwipeable',
'ImagePreview',
'Gif',
'GL',
'LinearGradient',
'Lottie',
'Maps',
'Screens',
'SVG',
'Video',
],
}); </s> add static path = '';
</s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ExpoApisScreen.js |
keep replace keep keep keep keep keep | <mask> import React from 'react';
<mask>
<mask> import ComponentListScreen from './ComponentListScreen';
<mask> import { Layout } from '../constants';
<mask>
<mask> export default class ExpoComponentsScreen extends React.Component {
<mask> static navigationOptions = {
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add static path = '';
</s> add import { withNavigation } from 'react-navigation'; </s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add </s> add static path = '';
</s> remove import {
Alert,
ListView,
PixelRatio,
Platform,
StyleSheet,
Text,
TouchableHighlight,
View,
} from 'react-native';
</s> add import { FlatList, PixelRatio, StyleSheet, Text, TouchableHighlight, View } from 'react-native'; </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ExpoComponentsScreen.js |
keep keep add keep keep keep keep keep keep | <mask> import { Layout } from '../constants';
<mask>
<mask> export default class ExpoComponentsScreen extends React.Component {
<mask> static navigationOptions = {
<mask> title: Layout.isSmallDevice ? 'Expo SDK Components' : 'Components in Expo SDK',
<mask> };
<mask>
<mask> render() {
<mask> return <ComponentListScreen apis={this._getApis()} tabName="ExpoComponents" />;
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove
</s> add import { Platform } from 'react-native'; </s> add static path = '';
</s> add static path = '';
</s> remove this._notificationSubscription = Notifications.addListener(this._handleNotification);
</s> add if (Platform.OS !== 'web') {
this._notificationSubscription = Notifications.addListener(this._handleNotification);
} </s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ExpoComponentsScreen.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep | <mask> return <ComponentListScreen apis={this._getApis()} tabName="ExpoComponents" />;
<mask> }
<mask>
<mask> _getApis = () => {
<mask> return [
<mask> 'AdMob',
<mask> 'BarCodeScanner',
<mask> 'BlurView',
<mask> 'Camera',
<mask> 'FacebookAds',
<mask> 'GestureHandlerList',
<mask> 'GestureHandlerPinch',
<mask> 'GestureHandlerSwipeable',
<mask> 'ImagePreview',
<mask> 'Gif',
<mask> 'GL',
<mask> 'LinearGradient',
<mask> 'Lottie',
<mask> 'Maps',
<mask> 'Screens',
<mask> 'SVG',
<mask> 'Video',
<mask> ];
<mask> };
<mask> }
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add static path = '';
</s> remove return [
'AppAuth',
'AuthSession',
'BackgroundFetch',
'Branch',
'Calendars',
'Constants',
'Contacts',
'DocumentPicker',
'FacebookLogin',
'FileSystem',
'Font',
'Geocoding',
'Google',
'GoogleSignIn',
'Haptic',
'ImagePicker',
'ImageManipulator',
'IntentLauncher',
'KeepAwake',
'LocalAuthentication',
'Localization',
'Location',
'MailComposer',
'MediaLibrary',
'Notification',
'Pedometer',
'Permissions',
'Print',
'MediaLibrary',
'ScreenOrientation',
'Sensor',
'SecureStore',
'SMS',
'StoreReview',
'TaskManager',
'TextToSpeech',
'Util',
'WebBrowser',
'ViewShot',
];
</s> add return Platform.select({
web: [
'AuthSession',
'Constants',
'DocumentPicker',
'FileSystem',
'Font',
'Geocoding',
'Google',
'GoogleSignIn',
'ImageManipulator',
'Localization',
'Location',
'MailComposer',
'Notification',
'Permissions',
'Print',
'ScreenOrientation',
'Sensor',
'SMS',
'TextToSpeech',
'Util',
],
default: [
'AppAuth',
'AuthSession',
'BackgroundFetch',
'Branch',
'Calendars',
'Constants',
'Contacts',
'DocumentPicker',
'FacebookLogin',
'FileSystem',
'Font',
'Geocoding',
'Google',
'GoogleSignIn',
'Haptic',
'ImagePicker',
'ImageManipulator',
'IntentLauncher',
'KeepAwake',
'LocalAuthentication',
'Localization',
'Location',
'MailComposer',
'Notification',
'Pedometer',
'Permissions',
'Print',
'MediaLibrary',
'ScreenOrientation',
'Sensor',
'SecureStore',
'SMS',
'StoreReview',
'TextToSpeech',
'Util',
'WebBrowser',
'ViewShot',
],
}); </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove
_renderRow = renderRowFn => {
return <View>{renderRowFn && renderRowFn()}</View>;
};
</s> add </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ExpoComponentsScreen.js |
keep keep add keep keep keep keep keep | <mask> import ModalExample from './ModalExample';
<mask>
<mask> export default class ReactNativeCoreScreen extends React.Component {
<mask> static navigationOptions = {
<mask> title: 'React Native Core',
<mask> };
<mask>
<mask> state = {
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> add static path = '';
</s> add static path = '';
</s> remove
</s> add import { Platform } from 'react-native'; </s> add ExpoApisStackNavigator.path = '';
ExpoApisStackNavigator.navigationOptions = {
title: 'Expo API',
};
ExpoComponentsStackNavigator.path = '';
ExpoComponentsStackNavigator.navigationOptions = {
title: 'Expo Components',
};
ReactNativeCoreStackNavigator.path = '';
ReactNativeCoreStackNavigator.navigationOptions = {
title: 'React Native Core',
};
</s> remove import { ScrollView, withNavigation } from 'react-navigation';
</s> add </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { | https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ReactNativeCoreScreen.web.js |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> render() {
<mask> return (
<mask> <Picker
<mask> st
<mask> selectedValue={this.state.language}
<mask> onValueChange={lang => this.setState({ language: lang })}>
<mask> <Picker.Item label="Java" value="java" />
<mask> <Picker.Item label="JavaScript" value="js" />
<mask> <Picker.Item label="Objective C" value="objc" />
</s> [NCL] Web changes (#2915)
* [NCL] Using FlatList instead of list
* moved web nav
* made PIXI.js setup do nothing on the web
* added expo commands
* Moved Navigation
* updated navigation for web
* Create ExpoComponentsStackNavigator.web.js
* Update MainTabNavigator.js
* Create index.web.js
* Update ExpoApisScreen.js
* Update ReactNativeCoreScreen.web.js
* Update CameraScreen.js
* Updated which modules are shown on web </s> remove renderScrollComponent={props => <ScrollView {...props} />}
dataSource={this.state.dataSource}
renderRow={this._renderRow}
</s> add data={this.props.apis}
renderItem={this._renderExampleSection} </s> remove <ListView
</s> add <FlatList </s> remove @withNavigation
export default class ComponentListScreen extends React.Component {
state = {
dataSource: new ListView.DataSource({
rowHasChanged: () => false,
sectionHeaderHasChanged: () => false,
}),
};
componentWillMount() {
const { tabName } = this.props;
}
componentDidMount() {
let dataSource = this.state.dataSource.cloneWithRowsAndSections(
this.props.apis.reduce((sections, name) => {
sections[name] = [() => this._renderExampleSection(name)];
return sections;
}, {})
);
this.setState({ dataSource });
}
_renderExampleSection = exampleName => {
</s> add class ComponentListScreen extends React.Component {
_renderExampleSection = ({ item: exampleName }) => { </s> remove FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
</s> add try {
FileSystem.makeDirectoryAsync(FileSystem.documentDirectory + 'photos').catch(e => {
console.log(e, 'Directory exists');
});
} catch (error) {} </s> add import { withNavigation } from 'react-navigation'; </s> add static path = '';
| https://github.com/expo/expo/commit/8394eff539fc3ec0efb90836e00cd57bec08716c | apps/native-component-list/screens/ReactNativeCoreScreen.web.js |
add keep keep keep keep keep | <mask> import * as React from 'react';
<mask> import DocumentationPageContext from '~/components/DocumentationPageContext';
<mask>
<mask> export default class SnackEmbed extends React.Component {
<mask> static contextType = DocumentationPageContext;
<mask>
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> add import { SNACK_URL, getSnackFiles } from '../../common/snack';
</s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove _getSnackUrl = () => {
let label = this.props.label;
let templateId = this.props.templateId;
</s> add _getSnackUrl = templateId => {
const { label, defaultPlatform } = this.props;
const templateUrl = `${this._getExamplesPath()}/${templateId}.js`; </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); </s> remove script.src = 'https://snack.expo.io/embed.js';
</s> add script.src = `${this.props.snackId ? 'https://snack.expo.io' : SNACK_URL}/embed.js`; | https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackEmbed.js |
keep keep keep keep replace keep keep keep keep keep | <mask> var script = document.getElementById('snack');
<mask> // inject script if it hasn't been loaded by a previous page
<mask> if (!script) {
<mask> script = document.createElement('script');
<mask> script.src = 'https://snack.expo.io/embed.js';
<mask> script.async = true;
<mask> script.id = 'snack';
<mask>
<mask> document.body.appendChild(script);
<mask> script.addEventListener('load', () => {
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> remove _getSnackUrl = () => {
let label = this.props.label;
let templateId = this.props.templateId;
</s> add _getSnackUrl = templateId => {
const { label, defaultPlatform } = this.props;
const templateUrl = `${this._getExamplesPath()}/${templateId}.js`; </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); </s> remove if (this.contentRef.current) {
return this.contentRef.current.textContent;
} else {
return '';
}
</s> add return this.contentRef.current ? this.contentRef.current.textContent : ''; </s> add import { SNACK_URL, getSnackFiles } from '../../common/snack';
| https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackEmbed.js |
add keep keep keep keep keep keep | <mask> import * as React from 'react';
<mask> import DocumentationPageContext from '~/components/DocumentationPageContext';
<mask>
<mask> const DEFAULT_PLATFORM = 'android';
<mask> const LATEST_VERSION = `v${require('../../package.json').version}`;
<mask>
<mask> export default class SnackInline extends React.Component {
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> add import { SNACK_URL } from '../../common/snack';
</s> remove _getSnackUrl = () => {
let label = this.props.label;
let templateId = this.props.templateId;
</s> add _getSnackUrl = templateId => {
const { label, defaultPlatform } = this.props;
const templateUrl = `${this._getExamplesPath()}/${templateId}.js`; </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove script.src = 'https://snack.expo.io/embed.js';
</s> add script.src = `${this.props.snackId ? 'https://snack.expo.io' : SNACK_URL}/embed.js`; </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); | https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> // keep `unversioned` in for the selected docs version though. This is used to
<mask> // find the examples in the static dir, and we don't have a `latest` version
<mask> // there, but we do have `unversioned`.
<mask> _getSelectedDocsVersion = () => {
<mask> let { version } = this.context;
<mask> if (version === 'latest') {
<mask> return LATEST_VERSION;
<mask> }
<mask>
<mask> return version;
<mask> };
<mask>
<mask> // Get a SDK version that Snack will understand. `latest` and `unversioned`
<mask> // are meaningless to Snack so we filter those out and use `LATEST_VERSION` instead
<mask> _getSnackSdkVersion = () => {
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove script.src = 'https://snack.expo.io/embed.js';
</s> add script.src = `${this.props.snackId ? 'https://snack.expo.io' : SNACK_URL}/embed.js`; </s> remove _getSnackUrl = () => {
let label = this.props.label;
let templateId = this.props.templateId;
</s> add _getSnackUrl = templateId => {
const { label, defaultPlatform } = this.props;
const templateUrl = `${this._getExamplesPath()}/${templateId}.js`; </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); </s> remove if (this.contentRef.current) {
return this.contentRef.current.textContent;
} else {
return '';
}
</s> add return this.contentRef.current ? this.contentRef.current.textContent : ''; </s> add import { SNACK_URL } from '../../common/snack';
| https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep replace replace replace keep replace replace keep | <mask> return [...this.props.dependencies].join(',');
<mask> };
<mask>
<mask> _getSnackUrl = () => {
<mask> let label = this.props.label;
<mask> let templateId = this.props.templateId;
<mask>
<mask> let baseUrl =
<mask> `https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
<mask> encodeURIComponent(label) +
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> remove if (this.contentRef.current) {
return this.contentRef.current.textContent;
} else {
return '';
}
</s> add return this.contentRef.current ? this.contentRef.current.textContent : ''; </s> remove script.src = 'https://snack.expo.io/embed.js';
</s> add script.src = `${this.props.snackId ? 'https://snack.expo.io' : SNACK_URL}/embed.js`; </s> add import { SNACK_URL, getSnackFiles } from '../../common/snack';
| https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep replace replace replace replace replace keep keep keep keep | <mask> let baseUrl =
<mask> `https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
<mask> encodeURIComponent(label) +
<mask> `&sdkVersion=${this._getSnackSdkVersion()}` +
<mask> `&dependencies=${encodeURIComponent(this._getDependencies())}`;
<mask>
<mask> if (templateId) {
<mask> let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
<mask> return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
<mask> } else {
<mask> return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
<mask> }
<mask> };
<mask>
<mask> _getCode = () => {
<mask> if (this.contentRef.current) {
<mask> return this.contentRef.current.textContent;
<mask> } else {
<mask> return '';
<mask> }
<mask> };
<mask>
<mask> render() {
<mask> if (this.props.templateId) {
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove _getSnackUrl = () => {
let label = this.props.label;
let templateId = this.props.templateId;
</s> add _getSnackUrl = templateId => {
const { label, defaultPlatform } = this.props;
const templateUrl = `${this._getExamplesPath()}/${templateId}.js`; </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> add import { SNACK_URL, getSnackFiles } from '../../common/snack';
</s> add import { SNACK_URL } from '../../common/snack';
| https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep keep replace keep keep keep keep keep | <mask> return (
<mask> <div>
<mask> <div ref={this.contentRef}>{this.props.children}</div>
<mask> {this.state.showLink ? (
<mask> <a className="snack-inline-example-button" href={this._getSnackUrl()} target="_blank">
<mask> Try this example on Snack <OpenIcon />
<mask> </a>
<mask> ) : null}
<mask> </div>
<mask> );
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove <input type="hidden" name="code" value={this._getCode()} />
</s> add <input
type="hidden"
name="files"
value={JSON.stringify(getSnackFiles(this._getCode(), this.props.files))}
/> </s> remove <form ref={this.formRef} action="https://snack.expo.io" method="POST" target="_blank">
</s> add <form ref={this.formRef} action={SNACK_URL} method="POST" target="_blank"> </s> remove if (this.contentRef.current) {
return this.contentRef.current.textContent;
} else {
return '';
}
</s> add return this.contentRef.current ? this.contentRef.current.textContent : ''; </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; | https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <div>
<mask> <div ref={this.contentRef}>{this.props.children}</div>
<mask>
<mask> {/* TODO: this should be a POST request, need to change Snack to support it though */}
<mask> <form ref={this.formRef} action="https://snack.expo.io" method="POST" target="_blank">
<mask> <input
<mask> type="hidden"
<mask> name="platform"
<mask> value={this.props.defaultPlatform || DEFAULT_PLATFORM}
<mask> />
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove <a className="snack-inline-example-button" href={this._getSnackUrl()} target="_blank">
</s> add <a
className="snack-inline-example-button"
href={this._getSnackUrl(this.props.templateId)}
target="_blank"> </s> remove <input type="hidden" name="code" value={this._getCode()} />
</s> add <input
type="hidden"
name="files"
value={JSON.stringify(getSnackFiles(this._getCode(), this.props.files))}
/> </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> remove script.src = 'https://snack.expo.io/embed.js';
</s> add script.src = `${this.props.snackId ? 'https://snack.expo.io' : SNACK_URL}/embed.js`; </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); | https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep keep replace keep keep keep keep keep | <mask> />
<mask> <input type="hidden" name="name" value={this.props.label || 'Example'} />
<mask> <input type="hidden" name="dependencies" value={this._getDependencies()} />
<mask> <input type="hidden" name="sdkVersion" value={this._getSnackSdkVersion()} />
<mask> <input type="hidden" name="code" value={this._getCode()} />
<mask>
<mask> <button className="snack-inline-example-button">
<mask> Try this example on Snack <OpenIcon />
<mask> </button>
<mask> </form>
</s> [docs] Support for snack assets (#9249)
* [docs] Add support for snack assets
* [docs] Use snack-assets in custom font docs
* [docs] Update inline snack to `assets` prop
* rename prop back to files </s> remove <form ref={this.formRef} action="https://snack.expo.io" method="POST" target="_blank">
</s> add <form ref={this.formRef} action={SNACK_URL} method="POST" target="_blank"> </s> remove <a className="snack-inline-example-button" href={this._getSnackUrl()} target="_blank">
</s> add <a
className="snack-inline-example-button"
href={this._getSnackUrl(this.props.templateId)}
target="_blank"> </s> remove let baseUrl =
`https://snack.expo.io?platform=${this.props.defaultPlatform || DEFAULT_PLATFORM}&name=` +
</s> add // TODO: find a better way to pass in the source-url, as this
// clutters the snack-url; and this doesn't support assets
return (
`${SNACK_URL}?platform=${defaultPlatform || DEFAULT_PLATFORM}&name=` + </s> remove let { version } = this.context;
if (version === 'latest') {
return LATEST_VERSION;
}
return version;
</s> add const { version } = this.context;
return version === 'latest' ? LATEST_VERSION : version; </s> remove `&dependencies=${encodeURIComponent(this._getDependencies())}`;
if (templateId) {
let templateUrl = `${this._getExamplesPath()}/${templateId}.js`;
return `${baseUrl}&sourceUrl=${encodeURIComponent(templateUrl)}`;
} else {
return `${baseUrl}&code=${encodeURIComponent(this._getCode())}`;
}
</s> add `&dependencies=${encodeURIComponent(this._getDependencies())}` +
`&sourceUrl=${encodeURIComponent(templateUrl)}`
); </s> remove _getSnackUrl = () => {
let label = this.props.label;
let templateId = this.props.templateId;
</s> add _getSnackUrl = templateId => {
const { label, defaultPlatform } = this.props;
const templateUrl = `${this._getExamplesPath()}/${templateId}.js`; | https://github.com/expo/expo/commit/864a0a6a450b392bf25f9857e705ef2b72c5ae89 | docs/components/plugins/SnackInline.js |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> android {
<mask> compileSdkVersion 24
<mask> buildToolsVersion '23.0.3'
<mask>
<mask> defaultConfig {
<mask> applicationId 'host.exp.exponent'
<mask> targetSdkVersion 24
<mask> // ADD VERSIONS HERE
</s> Upgrade build tools
fbshipit-source-id: 3b064be </s> remove buildToolsVersion "23.0.3"
</s> add buildToolsVersion "24.0.1" </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove compile 'com.android.support:recyclerview-v7:24.0.0'
</s> add compile 'com.android.support:recyclerview-v7:24.+' </s> remove ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,android-23,android-24
</s> add ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,build-tools-24.0.1,android-23,android-24 | https://github.com/expo/expo/commit/867efd25f6d9e71946d7c385e8ee7179876a6084 | android/app/build.gradle |
keep keep keep keep replace keep keep keep keep keep | <mask> compile(name: 'ReactAndroid-release-abi8_0_0', ext: 'aar')
<mask> compile(name: 'ReactAndroid-release-abi7_0_0', ext: 'aar')
<mask>
<mask> // Our dependencies
<mask> compile 'com.android.support:appcompat-v7:24.1.1'
<mask>
<mask> // Our dependencies from ExponentView
<mask> // DON'T ADD ANYTHING HERE THAT ISN'T IN EXPONENTVIEW. ONLY COPY THINGS FROM EXPONENTVIEW TO HERE.
<mask> compile 'com.android.support:appcompat-v7:24.1.1'
<mask> compile ('com.facebook.android:facebook-android-sdk:4.7.0') {
</s> Upgrade build tools
fbshipit-source-id: 3b064be </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove buildToolsVersion '23.0.3'
</s> add buildToolsVersion '24.0.1' </s> remove compile 'com.android.support:recyclerview-v7:24.0.0'
</s> add compile 'com.android.support:recyclerview-v7:24.+' </s> remove buildToolsVersion "23.0.3"
</s> add buildToolsVersion "24.0.1" </s> remove ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,android-23,android-24
</s> add ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,build-tools-24.0.1,android-23,android-24 | https://github.com/expo/expo/commit/867efd25f6d9e71946d7c385e8ee7179876a6084 | android/app/build.gradle |
keep keep keep keep replace keep keep keep keep keep | <mask> ENV PATH ${ANDROID_HOME}/tools:/usr/local/android-sdk-linux/build-tools/23.0.3/:$ANDROID_HOME/platform-tools:$PATH
<mask>
<mask> # Install Android SDK components
<mask> # License Id: android-sdk-license-ed0d0a5b
<mask> ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,android-23,android-24
<mask> # License Id: android-sdk-license-5be876d5
<mask> ENV GOOGLE_COMPONENTS extra-android-m2repository,extra-google-m2repository
<mask>
<mask> RUN echo y | android update sdk --no-ui --all --filter "${ANDROID_COMPONENTS}" ; \
<mask> echo y | android update sdk --no-ui --all --filter "${GOOGLE_COMPONENTS}"
</s> Upgrade build tools
fbshipit-source-id: 3b064be </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove compile 'com.android.support:recyclerview-v7:24.0.0'
</s> add compile 'com.android.support:recyclerview-v7:24.+' </s> remove buildToolsVersion "23.0.3"
</s> add buildToolsVersion "24.0.1" </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove buildToolsVersion '23.0.3'
</s> add buildToolsVersion '24.0.1' | https://github.com/expo/expo/commit/867efd25f6d9e71946d7c385e8ee7179876a6084 | android/docker/android-tools.Dockerfile |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask>
<mask> android {
<mask> compileSdkVersion 24
<mask> buildToolsVersion "23.0.3"
<mask>
<mask> defaultConfig {
<mask> minSdkVersion 19
<mask> targetSdkVersion 24
<mask> versionCode 1
</s> Upgrade build tools
fbshipit-source-id: 3b064be </s> remove buildToolsVersion '23.0.3'
</s> add buildToolsVersion '24.0.1' </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove compile 'com.android.support:recyclerview-v7:24.0.0'
</s> add compile 'com.android.support:recyclerview-v7:24.+' </s> remove ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,android-23,android-24
</s> add ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,build-tools-24.0.1,android-23,android-24 | https://github.com/expo/expo/commit/867efd25f6d9e71946d7c385e8ee7179876a6084 | android/exponentview/build.gradle |
keep keep keep keep replace keep keep keep keep keep | <mask> releaseCompile project(':ReactAndroid')
<mask>
<mask> // React native dependencies
<mask> // We use a different version of appcompat
<mask> compile 'com.android.support:recyclerview-v7:24.0.0'
<mask> compile 'com.facebook.fresco:fresco:0.11.0'
<mask> compile 'com.facebook.fresco:animated-gif:0.11.0'
<mask> compile 'com.facebook.fresco:animated-webp:0.11.0'
<mask> compile 'com.facebook.fresco:webpsupport:0.11.0'
<mask> compile 'com.facebook.fresco:webpsupport:0.11.0'
</s> Upgrade build tools
fbshipit-source-id: 3b064be </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove buildToolsVersion '23.0.3'
</s> add buildToolsVersion '24.0.1' </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove buildToolsVersion "23.0.3"
</s> add buildToolsVersion "24.0.1" </s> remove ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,android-23,android-24
</s> add ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,build-tools-24.0.1,android-23,android-24 | https://github.com/expo/expo/commit/867efd25f6d9e71946d7c385e8ee7179876a6084 | android/exponentview/build.gradle |
keep keep keep keep replace keep keep keep keep keep | <mask> compile 'com.squareup.okio:okio:1.8.0'
<mask> compile 'org.webkit:android-jsc:r174650'
<mask>
<mask> // Our dependencies
<mask> compile 'com.android.support:appcompat-v7:24.1.1'
<mask> compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
<mask> transitive = true;
<mask> }
<mask> compile ('com.facebook.android:facebook-android-sdk:4.7.0') {
<mask> exclude module: 'bolts-android'
</s> Upgrade build tools
fbshipit-source-id: 3b064be </s> remove compile 'com.android.support:appcompat-v7:24.1.1'
</s> add compile 'com.android.support:appcompat-v7:24.2.0' </s> remove buildToolsVersion '23.0.3'
</s> add buildToolsVersion '24.0.1' </s> remove buildToolsVersion "23.0.3"
</s> add buildToolsVersion "24.0.1" </s> remove compile 'com.android.support:recyclerview-v7:24.0.0'
</s> add compile 'com.android.support:recyclerview-v7:24.+' </s> remove ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,android-23,android-24
</s> add ENV ANDROID_COMPONENTS platform-tools,build-tools-23.0.1,build-tools-23.0.2,build-tools-23.0.3,build-tools-24.0.1,android-23,android-24 | https://github.com/expo/expo/commit/867efd25f6d9e71946d7c385e8ee7179876a6084 | android/exponentview/build.gradle |
keep keep keep replace replace keep keep keep keep keep | <mask> import { MetroDevServerOptions } from '@expo/dev-server';
<mask> import http from 'http';
<mask> import Metro from 'metro';
<mask> // import { Terminal } from 'metro-core';
<mask> // import { MetroTerminalReporter } from './MetroTerminalReporter';
<mask>
<mask> import { createDevServerMiddleware } from '../middleware/createDevServerMiddleware';
<mask> import { importExpoMetroConfigFromProject, importMetroFromProject } from './resolveFromProject';
<mask>
<mask> // From expo/dev-server but with ability to use custom logger.
</s> feat(cli): added custom metro terminal reporter to dev server (#16658)
* feat(cli): added custom metro terminal reporter to dev server
* docs(cli): improve doc blocks
* Update instantiateMetro.ts
* chore(cli): add support for `node:*` modules
* chore(cli): test loading indicator
* Update CHANGELOG.md </s> add import { MetroTerminalReporter } from './MetroTerminalReporter'; </s> remove // terminalReporter.update(event);
</s> add terminalReporter.update(event); </s> remove // const terminal = new Terminal(process.stdout);
// const terminalReporter = new MetroTerminalReporter(projectRoot, terminal);
</s> add const terminal = new Terminal(process.stdout);
const terminalReporter = new MetroTerminalReporter(projectRoot, terminal); | https://github.com/expo/expo/commit/871f77936428c6aec1c07ad7f88f20fed0d28fea | packages/expo/cli/start/server/metro/instantiateMetro.ts |
keep keep keep add keep keep keep keep keep keep | <mask> import Metro from 'metro';
<mask> import { Terminal } from 'metro-core';
<mask>
<mask> import { createDevServerMiddleware } from '../middleware/createDevServerMiddleware';
<mask> import { importExpoMetroConfigFromProject, importMetroFromProject } from './resolveFromProject';
<mask>
<mask> // From expo/dev-server but with ability to use custom logger.
<mask> type MessageSocket = {
<mask> broadcast: (method: string, params?: Record<string, any> | undefined) => void;
<mask> };
</s> feat(cli): added custom metro terminal reporter to dev server (#16658)
* feat(cli): added custom metro terminal reporter to dev server
* docs(cli): improve doc blocks
* Update instantiateMetro.ts
* chore(cli): add support for `node:*` modules
* chore(cli): test loading indicator
* Update CHANGELOG.md </s> remove // import { Terminal } from 'metro-core';
// import { MetroTerminalReporter } from './MetroTerminalReporter';
</s> add import { Terminal } from 'metro-core'; </s> remove // terminalReporter.update(event);
</s> add terminalReporter.update(event); </s> remove // const terminal = new Terminal(process.stdout);
// const terminalReporter = new MetroTerminalReporter(projectRoot, terminal);
</s> add const terminal = new Terminal(process.stdout);
const terminalReporter = new MetroTerminalReporter(projectRoot, terminal); | https://github.com/expo/expo/commit/871f77936428c6aec1c07ad7f88f20fed0d28fea | packages/expo/cli/start/server/metro/instantiateMetro.ts |
keep keep keep keep replace replace keep keep keep replace keep keep keep | <mask>
<mask> const Metro = importMetroFromProject(projectRoot);
<mask> const ExpoMetroConfig = importExpoMetroConfigFromProject(projectRoot);
<mask>
<mask> // const terminal = new Terminal(process.stdout);
<mask> // const terminalReporter = new MetroTerminalReporter(projectRoot, terminal);
<mask>
<mask> const reporter = {
<mask> update(event: any) {
<mask> // terminalReporter.update(event);
<mask> if (reportEvent) {
<mask> reportEvent(event);
<mask> }
</s> feat(cli): added custom metro terminal reporter to dev server (#16658)
* feat(cli): added custom metro terminal reporter to dev server
* docs(cli): improve doc blocks
* Update instantiateMetro.ts
* chore(cli): add support for `node:*` modules
* chore(cli): test loading indicator
* Update CHANGELOG.md </s> add import { MetroTerminalReporter } from './MetroTerminalReporter'; </s> remove // import { Terminal } from 'metro-core';
// import { MetroTerminalReporter } from './MetroTerminalReporter';
</s> add import { Terminal } from 'metro-core'; | https://github.com/expo/expo/commit/871f77936428c6aec1c07ad7f88f20fed0d28fea | packages/expo/cli/start/server/metro/instantiateMetro.ts |
keep keep keep add keep | <mask> api 'com.google.android.gms:play-services-vision:19.0.0'
<mask> api 'com.google.zxing:core:3.3.3'
<mask>
<mask> implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
<mask> }
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> add barCodeScannerTaskLock = false
} catch (e: ScopeCancellationException) {
Log.w("BarCodeScanner", e.message ?: "", e) </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} </s> remove BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
</s> add barCodeScannerAsyncTask(innerCamera, data) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/build.gradle |
keep keep keep keep replace keep keep keep keep keep | <mask> import kotlin.math.roundToInt
<mask>
<mask> class BarCodeScannerView(
<mask> private val viewContext: Context,
<mask> private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
<mask> ) : ViewGroup(viewContext) {
<mask> private val orientationListener = object : OrientationEventListener(
<mask> viewContext,
<mask> SensorManager.SENSOR_DELAY_NORMAL
<mask> ) {
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> add private val coroutineScope = CoroutineScope(Dispatchers.Default) </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> add import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.cancel
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) </s> remove barCodeScannerTaskLock = false
return null
</s> add | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerView.kt |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> fun setCameraType(cameraType: Int) {
<mask> type = cameraType
<mask> if (!::viewFinder.isInitialized) {
<mask> viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
<mask> addView(viewFinder)
<mask> } else {
<mask> viewFinder.setCameraType(cameraType)
<mask> ExpoBarCodeScanner.instance.adjustPreviewLayout(cameraType)
<mask> }
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} </s> remove BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
</s> add barCodeScannerAsyncTask(innerCamera, data) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> add barCodeScannerTaskLock = false
} catch (e: ScopeCancellationException) {
Log.w("BarCodeScanner", e.message ?: "", e) | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerView.kt |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> import android.content.Context
<mask> import android.graphics.SurfaceTexture
<mask> import android.hardware.Camera
<mask> import android.hardware.Camera.PreviewCallback
<mask> import android.os.AsyncTask
<mask> import android.os.Handler
<mask> import android.os.Looper
<mask> import android.view.TextureView
<mask> import android.view.TextureView.SurfaceTextureListener
<mask> import expo.modules.core.ModuleRegistryDelegate
<mask> import expo.modules.interfaces.barcodescanner.BarCodeScannerInterface
<mask> import expo.modules.interfaces.barcodescanner.BarCodeScannerProviderInterface
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> add import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.cancel
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext </s> remove private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
</s> add private val moduleRegistryDelegate: ModuleRegistryDelegate </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> add barCodeScannerTaskLock = false
} catch (e: ScopeCancellationException) {
Log.w("BarCodeScanner", e.message ?: "", e) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep add keep keep keep keep | <mask> import expo.modules.core.ModuleRegistryDelegate
<mask> import expo.modules.interfaces.barcodescanner.BarCodeScannerInterface
<mask> import expo.modules.interfaces.barcodescanner.BarCodeScannerProviderInterface
<mask> import expo.modules.interfaces.barcodescanner.BarCodeScannerSettings
<mask>
<mask> internal class BarCodeScannerViewFinder(
<mask> context: Context,
<mask> private var cameraType: Int,
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove import android.os.AsyncTask
import android.os.Handler
import android.os.Looper
</s> add import android.util.Log </s> remove private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
</s> add private val moduleRegistryDelegate: ModuleRegistryDelegate </s> add private val coroutineScope = CoroutineScope(Dispatchers.Default) </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> remove barCodeScannerTaskLock = false
return null
</s> add | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep add keep keep keep keep keep | <mask> private var barCodeScannerView: BarCodeScannerView,
<mask> private val moduleRegistryDelegate: ModuleRegistryDelegate
<mask> ) : TextureView(context), SurfaceTextureListener, PreviewCallback {
<mask> private var finderSurfaceTexture: SurfaceTexture? = null
<mask>
<mask> private inline fun <reified T> moduleRegistry() =
<mask> moduleRegistryDelegate.getFromModuleRegistry<T>()
<mask>
<mask> @Volatile
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
</s> add private val moduleRegistryDelegate: ModuleRegistryDelegate </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> add import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.cancel
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep add keep keep keep keep keep keep | <mask>
<mask> override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
<mask> finderSurfaceTexture = null
<mask> stopCamera()
<mask> return true
<mask> }
<mask>
<mask> override fun onSurfaceTextureUpdated(surface: SurfaceTexture) {
<mask> finderSurfaceTexture = surface
<mask> }
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
</s> add barCodeScannerAsyncTask(innerCamera, data) </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> add barCodeScannerTaskLock = false
} catch (e: ScopeCancellationException) {
Log.w("BarCodeScanner", e.message ?: "", e) | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> override fun onPreviewFrame(data: ByteArray, innerCamera: Camera) {
<mask> if (!barCodeScannerTaskLock) {
<mask> barCodeScannerTaskLock = true
<mask> BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
<mask> }
<mask> }
<mask>
<mask> fun setBarCodeScannerSettings(settings: BarCodeScannerSettings?) {
<mask> barCodeScanner.setSettings(settings)
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) </s> add barCodeScannerTaskLock = false
} catch (e: ScopeCancellationException) {
Log.w("BarCodeScanner", e.message ?: "", e) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep | <mask> fun setBarCodeScannerSettings(settings: BarCodeScannerSettings?) {
<mask> barCodeScanner.setSettings(settings)
<mask> }
<mask>
<mask> private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
<mask> init {
<mask> this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
<mask> }
<mask>
<mask> override fun doInBackground(vararg params: Void?): Void? {
<mask> if (isCancelled) {
<mask> return null
<mask> }
<mask>
<mask> // setting PreviewCallback does not really have an effect - this method is called anyway so we
<mask> // need to check if camera changing is in progress or not
<mask> if (!isChanging && camera != null) {
<mask> val size = camera.parameters.previewSize
<mask> val width = size.width
<mask> val height = size.height
<mask> val properRotation = ExpoBarCodeScanner.instance.rotation
<mask> val result = barCodeScanner.scan(
<mask> mImageData, width,
<mask> height, properRotation
<mask> )
<mask> if (result != null) {
<mask> Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
<mask> }
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> remove BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
</s> add barCodeScannerAsyncTask(innerCamera, data) </s> remove private val moduleRegistryDelegate: ModuleRegistryDelegate = ModuleRegistryDelegate()
</s> add private val moduleRegistryDelegate: ModuleRegistryDelegate </s> add private val coroutineScope = CoroutineScope(Dispatchers.Default) </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep add keep keep keep keep | <mask> }
<mask> }
<mask> }
<mask> }
<mask> }
<mask> }
<mask>
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove barCodeScannerTaskLock = false
return null
</s> add </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} </s> remove BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
</s> add barCodeScannerAsyncTask(innerCamera, data) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) </s> add implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1") | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep keep replace replace keep keep keep keep keep | <mask> if (result != null) {
<mask> Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
<mask> }
<mask> }
<mask> barCodeScannerTaskLock = false
<mask> return null
<mask> }
<mask> }
<mask>
<mask> companion object {
<mask> // Concurrency lock for barcode scanner to avoid flooding the runtime
</s> [barcode-scanner][Android] Rewrite from `AsyncTask` to Kotlin coroutines (#14029) </s> remove // setting PreviewCallback does not really have an effect - this method is called anyway so we
// need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
Handler(Looper.getMainLooper()).post { barCodeScannerView.onBarCodeScanned(result) }
</s> add // setting PreviewCallback does not really have an effect - this method is called anyway
// so we need to check if camera changing is in progress or not
if (!isChanging && camera != null) {
val size = camera.parameters.previewSize
val width = size.width
val height = size.height
val properRotation = ExpoBarCodeScanner.instance.rotation
val result = barCodeScanner.scan(
mImageData, width,
height, properRotation
)
if (result != null) {
withContext(Dispatchers.Main) {
launch {
barCodeScannerView.onBarCodeScanned(result)
}
}
} </s> remove private inner class BarCodeScannerAsyncTask(private val camera: Camera?, private val mImageData: ByteArray, barCodeScannerView: BarCodeScannerView) : AsyncTask<Void?, Void?, Void?>() {
init {
this@BarCodeScannerViewFinder.barCodeScannerView = barCodeScannerView
}
override fun doInBackground(vararg params: Void?): Void? {
if (isCancelled) {
return null
}
</s> add private fun scanForBarcodes(camera: Camera?, mImageData: ByteArray) {
coroutineScope.launch {
try {
if (!coroutineScope.isActive) {
return@launch
} </s> add barCodeScannerTaskLock = false
} catch (e: ScopeCancellationException) {
Log.w("BarCodeScanner", e.message ?: "", e) </s> add try {
coroutineScope.cancel(ScopeCancellationException())
} catch (e: Exception) {
Log.w("ScannerViewFinder", e.message ?: "", e)
} </s> remove BarCodeScannerAsyncTask(innerCamera, data, barCodeScannerView).execute()
</s> add barCodeScannerAsyncTask(innerCamera, data) </s> remove viewFinder = BarCodeScannerViewFinder(viewContext, cameraType, this, moduleRegistryDelegate)
</s> add viewFinder = BarCodeScannerViewFinder(
viewContext,
cameraType,
this,
moduleRegistryDelegate
) | https://github.com/expo/expo/commit/8826da3d8047affea3fedf2dc766a4ac1668098f | packages/expo-barcode-scanner/android/src/main/java/expo/modules/barcodescanner/BarCodeScannerViewFinder.kt |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> {/* prettier-ignore */}
<mask> {/* ## TypeScript
<mask>
<mask> > Available since SDK 49.
<mask>
<mask> Expo's Metro config has experimental support for the `compilerOptions.paths` and `compilerOptions.baseUrl` fields in the project's `tsconfig.json` (or `jsconfig.json`) file. This enables absolute imports and aliases in the project. Learn more in the [TypeScript guide](/guides/typescript).
<mask>
<mask> These feature requires additional setup in bare projects. See the [versioned Metro setup guide](/versions/latest/config/metro#bare-workflow-setup) for more information.
<mask>
</s> [docs] Update SDK availability text for consistency </s> remove > Since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Since SDK 49
</s> add > Available in SDK 49 and higher. | https://github.com/expo/expo/commit/8933bebde368adde616adede8e2a32a2a75d9435 | docs/pages/guides/customizing-metro.mdx |
keep keep keep keep replace keep keep | <mask> These feature requires additional setup in bare projects. See the [versioned Metro setup guide](/versions/latest/config/metro#bare-workflow-setup) for more information.
<mask>
<mask> ## CSS
<mask>
<mask> > Since SDK 49.
<mask>
<mask> See the versioned [CSS guide](/versions/latest/config/metro#css) for more information. \*/}
</s> [docs] Update SDK availability text for consistency </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Since SDK 49
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. | https://github.com/expo/expo/commit/8933bebde368adde616adede8e2a32a2a75d9435 | docs/pages/guides/customizing-metro.mdx |
keep keep keep keep replace keep keep keep keep keep | <mask> {/*
<mask>
<mask> ## Path Aliases
<mask>
<mask> > Available since SDK 49.
<mask>
<mask> SDK 49 projects will need to enable this feature in the project's **app.json**:
<mask>
<mask> ```json app.json
<mask> {
</s> [docs] Update SDK availability text for consistency </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Since SDK 49
</s> add > Available in SDK 49 and higher. | https://github.com/expo/expo/commit/8933bebde368adde616adede8e2a32a2a75d9435 | docs/pages/guides/typescript.mdx |
keep keep keep keep replace keep keep keep keep keep | <mask> - This feature requires additional setup in bare projects. See the [versioned Metro setup guide](/versions/latest/config/metro#bare-workflow-setup) for more information.
<mask>
<mask> ## Absolute Imports
<mask>
<mask> > Available since SDK 49.
<mask>
<mask> SDK 49 projects will need to enable this feature in the project's **app.json**:
<mask>
<mask> ```json app.json
<mask> {
</s> [docs] Update SDK availability text for consistency </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Since SDK 49
</s> add > Available in SDK 49 and higher. | https://github.com/expo/expo/commit/8933bebde368adde616adede8e2a32a2a75d9435 | docs/pages/guides/typescript.mdx |
keep keep keep keep replace keep keep keep keep keep | <mask> {/* TODO: Usage in EAS */}
<mask>
<mask> ## CSS
<mask>
<mask> > Since SDK 49
<mask>
<mask> > **info** CSS support is under development and currently only works on web.
<mask>
<mask> Expo supports CSS in your project. You can import CSS files from any component. CSS Modules are also supported. To enable CSS, configure your `metro.config.js` as follows, setting `isCSSEnabled` to `true`:
<mask>
</s> [docs] Update SDK availability text for consistency </s> remove > Since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. </s> remove > Available since SDK 49.
</s> add > Available in SDK 49 and higher. | https://github.com/expo/expo/commit/8933bebde368adde616adede8e2a32a2a75d9435 | docs/pages/versions/unversioned/config/metro.mdx |
keep add keep keep keep keep | <mask> api 'host.exp.exponent:expo-barcode-scanner:2.0.0'
<mask> api 'host.exp.exponent:expo-blur:1.0.0'
<mask> api 'host.exp.exponent:expo-camera-interface:2.0.0'
<mask> api 'host.exp.exponent:expo-camera:2.0.0'
<mask> api 'host.exp.exponent:expo-contacts:2.0.0'
<mask> api 'host.exp.exponent:expo-facebook:1.0.0'
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add api project(':expo-brightness') </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/app/build.gradle |
keep keep keep add keep keep keep keep keep keep | <mask> import expo.modules.av.AVPackage;
<mask> import expo.modules.backgroundfetch.BackgroundFetchPackage;
<mask> import expo.modules.barcodescanner.BarCodeScannerPackage;
<mask> import expo.modules.blurview.BlurViewPackage;
<mask> import expo.modules.camera.CameraPackage;
<mask> import expo.modules.constants.ConstantsPackage;
<mask> import expo.modules.contacts.ContactsPackage;
<mask> import expo.modules.documentpicker.DocumentPickerPackage;
<mask> import expo.modules.facebook.FacebookPackage;
<mask> import expo.modules.facedetector.FaceDetectorPackage;
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add import expo.modules.brightness.BrightnessPackage; </s> remove import versioned.host.exp.exponent.modules.api.BrightnessModule;
</s> add </s> remove import * as Brightness from './Brightness';
</s> add import * as Brightness from 'expo-brightness'; </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/app/src/main/java/host/exp/exponent/MainApplication.java |
keep add keep keep keep keep | <mask> new BarCodeScannerPackage(),
<mask> new BlurViewPackage(),
<mask> new CameraPackage(),
<mask> new ConstantsPackage(),
<mask> new ContactsPackage(),
<mask> new DocumentPickerPackage(),
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add new BrightnessPackage(), </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add api project(':expo-brightness') </s> add import expo.modules.brightness.BrightnessPackage; | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/app/src/main/java/host/exp/exponent/MainApplication.java |
keep keep keep add keep keep keep keep keep keep | <mask> api project(':expo-background-fetch')
<mask> api project(':expo-barcode-scanner')
<mask> api project(':expo-barcode-scanner-interface')
<mask> api project(':expo-blur')
<mask> api project(':expo-camera')
<mask> api project(':expo-camera-interface')
<mask> api project(':expo-contacts')
<mask> api project(':expo-facebook')
<mask> api project(':expo-face-detector')
<mask> api project(':expo-file-system')
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add api 'host.exp.exponent:expo-brightness:1.0.0' </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/expoview/build.gradle |
keep keep keep add keep keep keep keep | <mask> import expo.modules.av.AVPackage;
<mask> import expo.modules.backgroundfetch.BackgroundFetchPackage;
<mask> import expo.modules.barcodescanner.BarCodeScannerPackage;
<mask> import expo.modules.blurview.BlurViewPackage;
<mask> import expo.modules.camera.CameraPackage;
<mask> import expo.modules.constants.ConstantsPackage;
<mask> import expo.modules.contacts.ContactsPackage;
<mask> import expo.modules.documentpicker.DocumentPickerPackage;
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add import expo.modules.brightness.BrightnessPackage; </s> remove import versioned.host.exp.exponent.modules.api.BrightnessModule;
</s> add </s> remove import * as Brightness from './Brightness';
</s> add import * as Brightness from 'expo-brightness'; </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/expoview/src/main/java/versioned/host/exp/exponent/ExperiencePackagePicker.java |
keep add keep keep keep keep | <mask> new BarCodeScannerPackage(),
<mask> new BlurViewPackage(),
<mask> new CameraPackage(),
<mask> new ConstantsPackage(),
<mask> new ContactsPackage(),
<mask> new DocumentPickerPackage(),
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/expoview/src/main/java/versioned/host/exp/exponent/ExperiencePackagePicker.java |
keep keep keep keep replace keep keep keep keep keep | <mask> import host.exp.exponent.analytics.EXL;
<mask> import host.exp.exponent.kernel.ExperienceId;
<mask> import host.exp.exponent.kernel.ExponentKernelModuleProvider;
<mask> import host.exp.exponent.utils.ScopedContext;
<mask> import versioned.host.exp.exponent.modules.api.BrightnessModule;
<mask> import versioned.host.exp.exponent.modules.api.CalendarModule;
<mask> import versioned.host.exp.exponent.modules.api.ErrorRecoveryModule;
<mask> import versioned.host.exp.exponent.modules.api.ImageManipulatorModule;
<mask> import versioned.host.exp.exponent.modules.api.IntentLauncherModule;
<mask> import versioned.host.exp.exponent.modules.api.KeyboardModule;
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add import expo.modules.brightness.BrightnessPackage; </s> add import expo.modules.brightness.BrightnessPackage; </s> remove import * as Brightness from './Brightness';
</s> add import * as Brightness from 'expo-brightness'; </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java |
keep keep keep keep replace keep keep keep keep keep | <mask> nativeModules.add(new RNBranchModule(reactContext));
<mask> nativeModules.add(new ErrorRecoveryModule(reactContext, experienceId));
<mask> nativeModules.add(new IntentLauncherModule(reactContext));
<mask> nativeModules.add(new ScreenOrientationModule(reactContext));
<mask> nativeModules.add(new BrightnessModule(reactContext));
<mask> nativeModules.add(new RNGestureHandlerModule(reactContext));
<mask> nativeModules.add(new RNAWSCognitoModule(reactContext));
<mask> nativeModules.add(new CalendarModule(reactContext, experienceId));
<mask> nativeModules.add(new ReanimatedModule(reactContext));
<mask> nativeModules.add(new SplashScreenModule(reactContext, experienceId));
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add api project(':expo-brightness') </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java |
keep add keep keep keep keep | <mask> 'expo-barcode-scanner-interface',
<mask> 'expo-blur',
<mask> 'expo-camera',
<mask> 'expo-camera-interface',
<mask> 'expo-constants',
<mask> 'expo-constants-interface',
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add api project(':expo-brightness') </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | android/settings.gradle |
keep keep keep keep replace keep keep keep keep keep | <mask> B5FABDF620DD926E00642528 /* EXFileDownloaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FABDF520DD926E00642528 /* EXFileDownloaderTests.m */; };
<mask> B5FABDF820DD942A00642528 /* EXAppLoaderRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FABDF720DD942A00642528 /* EXAppLoaderRequestTests.m */; };
<mask> B5FB745B1FF6DADB001C764B /* EXAnimationViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB72E31FF6DADB001C764B /* EXAnimationViewManager.m */; };
<mask> B5FB745C1FF6DADB001C764B /* EXContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB72E51FF6DADB001C764B /* EXContainerView.m */; };
<mask> B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73771FF6DADB001C764B /* EXBrightness.m */; };
<mask> B5FB74A11FF6DADC001C764B /* EXConstantsBinding.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73791FF6DADB001C764B /* EXConstantsBinding.m */; };
<mask> B5FB74A51FF6DADC001C764B /* EXErrorRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73811FF6DADB001C764B /* EXErrorRecovery.m */; };
<mask> B5FB74AA1FF6DADC001C764B /* EXImageManipulator.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB738B1FF6DADB001C764B /* EXImageManipulator.m */; };
<mask> B5FB74AC1FF6DADC001C764B /* EXImageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB738F1FF6DADB001C764B /* EXImageUtils.m */; };
<mask> B5FB74B01FF6DADC001C764B /* EXScreenOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73971FF6DADB001C764B /* EXScreenOrientation.m */; };
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXBrightness.h; sourceTree = "<group>"; };
B5FB73771FF6DADB001C764B /* EXBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXBrightness.m; sourceTree = "<group>"; };
</s> add </s> remove B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */,
</s> add </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */,
B5FB73771FF6DADB001C764B /* EXBrightness.m */,
</s> add </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> add new BrightnessPackage(), </s> add import expo.modules.brightness.BrightnessPackage; | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | ios/Exponent.xcodeproj/project.pbxproj |
keep keep keep keep replace replace keep keep keep keep keep | <mask> B5FB72E21FF6DADB001C764B /* EXAnimationViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXAnimationViewManager.h; sourceTree = "<group>"; };
<mask> B5FB72E31FF6DADB001C764B /* EXAnimationViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXAnimationViewManager.m; sourceTree = "<group>"; };
<mask> B5FB72E41FF6DADB001C764B /* EXContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXContainerView.h; sourceTree = "<group>"; };
<mask> B5FB72E51FF6DADB001C764B /* EXContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXContainerView.m; sourceTree = "<group>"; };
<mask> B5FB73761FF6DADB001C764B /* EXBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXBrightness.h; sourceTree = "<group>"; };
<mask> B5FB73771FF6DADB001C764B /* EXBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXBrightness.m; sourceTree = "<group>"; };
<mask> B5FB73781FF6DADB001C764B /* EXConstantsBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXConstantsBinding.h; sourceTree = "<group>"; };
<mask> B5FB73791FF6DADB001C764B /* EXConstantsBinding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXConstantsBinding.m; sourceTree = "<group>"; };
<mask> B5FB73801FF6DADB001C764B /* EXErrorRecovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXErrorRecovery.h; sourceTree = "<group>"; };
<mask> B5FB73811FF6DADB001C764B /* EXErrorRecovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXErrorRecovery.m; sourceTree = "<group>"; };
<mask> B5FB738A1FF6DADB001C764B /* EXImageManipulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXImageManipulator.h; sourceTree = "<group>"; };
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> remove B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73771FF6DADB001C764B /* EXBrightness.m */; };
</s> add </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */,
B5FB73771FF6DADB001C764B /* EXBrightness.m */,
</s> add </s> remove B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */,
</s> add </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> add new BrightnessPackage(), </s> add import expo.modules.brightness.BrightnessPackage; | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | ios/Exponent.xcodeproj/project.pbxproj |
keep keep keep keep replace replace keep keep keep keep keep | <mask> BB5BD2FA20AEFCB4007E02FC /* Reanimated */,
<mask> 07E26F2B1FFFFB55004667A1 /* Calendar */,
<mask> BB36BC5C2135C98D00AFFD58 /* Screens */,
<mask> B5FB728D1FF6DADB001C764B /* Components */,
<mask> B5FB73761FF6DADB001C764B /* EXBrightness.h */,
<mask> B5FB73771FF6DADB001C764B /* EXBrightness.m */,
<mask> B5FB73801FF6DADB001C764B /* EXErrorRecovery.h */,
<mask> B5FB73811FF6DADB001C764B /* EXErrorRecovery.m */,
<mask> CD99394E2040C1AA0087C883 /* EXHaptic.h */,
<mask> CD99394F2040C1AA0087C883 /* EXHaptic.m */,
<mask> CDBF79F820868287009B25D6 /* EXStoreReview.h */,
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> remove B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */,
</s> add </s> remove B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73771FF6DADB001C764B /* EXBrightness.m */; };
</s> add </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXBrightness.h; sourceTree = "<group>"; };
B5FB73771FF6DADB001C764B /* EXBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXBrightness.m; sourceTree = "<group>"; };
</s> add </s> remove import * as Brightness from './Brightness';
</s> add import * as Brightness from 'expo-brightness'; </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> add new BrightnessPackage(), | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | ios/Exponent.xcodeproj/project.pbxproj |
keep keep keep keep replace keep keep keep keep keep | <mask> 3159BB9C21806E76002D2A81 /* RNSVGLineManager.m in Sources */,
<mask> B5AC39D61E95B17300540AA7 /* EXErrorRecoveryManager.m in Sources */,
<mask> 78343625205B8C5F00DD28C3 /* AIRMapCallout.m in Sources */,
<mask> 3159BB3421806E24002D2A81 /* RNSVGRect.m in Sources */,
<mask> B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */,
<mask> 2519CCFC216B292600FA7C80 /* EXUserNotificationCenter.m in Sources */,
<mask> B58F125C20B73455003E13F1 /* EXEnvironment.m in Sources */,
<mask> 3159BB2621806E0C002D2A81 /* RNSVGClipPath.m in Sources */,
<mask> 3C3C339520E24EC0000F8B92 /* EXSplashScreen.m in Sources */,
<mask> B5AC39AF1E95A90B00540AA7 /* EXVersions.m in Sources */,
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> remove B5FB74A01FF6DADC001C764B /* EXBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB73771FF6DADB001C764B /* EXBrightness.m */; };
</s> add </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */,
B5FB73771FF6DADB001C764B /* EXBrightness.m */,
</s> add </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXBrightness.h; sourceTree = "<group>"; };
B5FB73771FF6DADB001C764B /* EXBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXBrightness.m; sourceTree = "<group>"; };
</s> add </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> add new BrightnessPackage(), </s> add import expo.modules.brightness.BrightnessPackage; | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | ios/Exponent.xcodeproj/project.pbxproj |
keep add keep keep keep keep keep | <mask> "expo-barcode-scanner-interface": "~2.0.0",
<mask> "expo-blur": "~1.0.0",
<mask> "expo-camera": "~2.0.0",
<mask> "expo-camera-interface": "~2.0.0",
<mask> "expo-constants": "~2.0.0",
<mask> "expo-constants-interface": "~2.0.0",
<mask> "expo-contacts": "~2.0.0",
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove nativeModules.add(new BrightnessModule(reactContext));
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add api project(':expo-brightness') </s> add import expo.modules.brightness.BrightnessPackage; | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | packages/expo/package.json |
keep keep keep keep replace keep keep keep keep keep | <mask> import * as SecureStore from 'expo-secure-store';
<mask> import { Audio, Video } from 'expo-av';
<mask> import { BlurView, VibrancyView } from 'expo-blur';
<mask> import * as AR from './AR';
<mask> import * as Brightness from './Brightness';
<mask> import * as Calendar from './Calendar';
<mask> import * as FileSystem from 'expo-file-system';
<mask> import * as Google from './Google/Google';
<mask> import * as Haptic from './Haptic/Haptic';
<mask> import * as ImageManipulator from './ImageManipulator/ImageManipulator';
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add import expo.modules.brightness.BrightnessPackage; </s> remove import versioned.host.exp.exponent.modules.api.BrightnessModule;
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> remove ExpoBrightness: {
getBrightnessAsync: { type: 'function', functionType: 'promise' },
getSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
getSystemBrightnessModeAsync: { type: 'function', functionType: 'promise' },
isUsingSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
setBrightnessAsync: { type: 'function', functionType: 'promise' },
setSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
setSystemBrightnessModeAsync: { type: 'function', functionType: 'promise' },
useSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
},
</s> add </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove B5FB73761FF6DADB001C764B /* EXBrightness.h */,
B5FB73771FF6DADB001C764B /* EXBrightness.m */,
</s> add | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | packages/expo/src/Expo.ts |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> AIRMapOverlayManager: {},
<mask> AIRMapPolygonManager: {},
<mask> AIRMapPolylineManager: {},
<mask> AIRMapUrlTileManager: {},
<mask> ExpoBrightness: {
<mask> getBrightnessAsync: { type: 'function', functionType: 'promise' },
<mask> getSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
<mask> getSystemBrightnessModeAsync: { type: 'function', functionType: 'promise' },
<mask> isUsingSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
<mask> setBrightnessAsync: { type: 'function', functionType: 'promise' },
<mask> setSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
<mask> setSystemBrightnessModeAsync: { type: 'function', functionType: 'promise' },
<mask> useSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
<mask> },
<mask> ExpoNativeModuleIntrospection: {
<mask> getNativeModuleNamesAsync: { type: 'function', functionType: 'promise' },
<mask> introspectNativeModuleAsync: { type: 'function', functionType: 'promise' },
<mask> },
<mask> ExpoNativeModuleProxy: {
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> add ExpoBrightness: [
{ key: 0, argumentsCount: 0, name: 'setSystemBrightnessAsync' },
{ key: 1, argumentsCount: 0, name: 'getSystemBrightnessAsync' },
{ key: 2, argumentsCount: 0, name: 'getSystemBrightnessModeAsync' },
{ key: 3, argumentsCount: 0, name: 'useSystemBrightnessAsync' },
{ key: 4, argumentsCount: 0, name: 'isUsingSystemBrightnessAsync' },
{ key: 5, argumentsCount: 1, name: 'setBrightnessAsync' },
{ key: 6, argumentsCount: 0, name: 'getBrightnessAsync' },
{ key: 7, argumentsCount: 0, name: 'setSystemBrightnessModeAsync' },
], </s> remove import * as Brightness from './Brightness';
</s> add import * as Brightness from 'expo-brightness'; </s> remove import versioned.host.exp.exponent.modules.api.BrightnessModule;
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add api project(':expo-brightness') | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | packages/jest-expo/src/preset/expoModules.js |
keep keep keep add keep keep keep keep keep keep | <mask> ExpoBarometer: [
<mask> { key: 0, argumentsCount: 0, name: 'isAvailableAsync' },
<mask> { key: 1, argumentsCount: 1, name: 'setUpdateInterval' },
<mask> ],
<mask> ExpoContacts: [
<mask> { key: 0, argumentsCount: 0, name: 'getDefaultContainerIdentifierAsync' },
<mask> { key: 1, argumentsCount: 2, name: 'addExistingGroupToContainerAsync' },
<mask> { key: 2, argumentsCount: 2, name: 'createGroupAsync' },
<mask> { key: 3, argumentsCount: 2, name: 'addContactAsync' },
<mask> { key: 4, argumentsCount: 1, name: 'removeGroupAsync' },
</s> [expo-brightness] Extract Brightness to a universal module (#3375)
* [expo-brightness] Generate module from template
* [expo-brightness] Move iOS code to expo-brightness
* [expo-brightness] Move TS code to expo-brightness
* [jest-expo] Update mocks
* [expo-brightness] Move Android code to expo-brightness </s> remove ExpoBrightness: {
getBrightnessAsync: { type: 'function', functionType: 'promise' },
getSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
getSystemBrightnessModeAsync: { type: 'function', functionType: 'promise' },
isUsingSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
setBrightnessAsync: { type: 'function', functionType: 'promise' },
setSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
setSystemBrightnessModeAsync: { type: 'function', functionType: 'promise' },
useSystemBrightnessAsync: { type: 'function', functionType: 'promise' },
},
</s> add </s> remove import * as Brightness from './Brightness';
</s> add import * as Brightness from 'expo-brightness'; </s> remove import versioned.host.exp.exponent.modules.api.BrightnessModule;
</s> add </s> add import expo.modules.brightness.BrightnessPackage; </s> add new BrightnessPackage(), </s> add api project(':expo-brightness') | https://github.com/expo/expo/commit/896dc22339904e0928ad867b676d2b6f15e3c2c1 | packages/jest-expo/src/preset/expoModules.js |