Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[iOS] Rename the backgroundColor property name. #2951

Merged
merged 1 commit into from
Oct 4, 2019
Merged

[iOS] Rename the backgroundColor property name. #2951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate);
/**
* View
*/
UIColor *_backgroundColor;
UIColor *_styleBackgroundColor;
NSString *_backgroundImage;
NSString *_clipRadius;
WXClipType _clipToBounds;
Expand Down Expand Up @@ -178,7 +178,7 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate);
/**
DO NOT use "_backgroundColor" directly. The same reason as '_transform'.
*/
@property (atomic, strong) UIColor* backgroundColor;
@property (atomic, strong) UIColor* styleBackgroundColor;

///--------------------------------------
/// @name Package Internal Methods
Expand Down
10 changes: 5 additions & 5 deletions ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ - (WXDisplayBlock)_compositeDisplayBlock
- (void)_collectCompositingDisplayBlocks:(NSMutableArray *)displayBlocks context:(CGContextRef)context isCancelled:(BOOL(^)(void))isCancelled
{
// TODO: compositingChild has no chance to applyPropertiesToView, need update here?
UIColor *backgroundColor = self.backgroundColor;
UIColor *backgroundColor = self.styleBackgroundColor;
BOOL clipsToBounds = _clipToBounds;
CGRect frame = self.calculatedFrame;
CGRect bounds = CGRectMake(0, 0, frame.size.width, frame.size.height);
Expand Down Expand Up @@ -349,8 +349,8 @@ - (void)_drawBorderWithContext:(CGContextRef)context size:(CGSize)size

CGContextSetAlpha(context, _opacity);
// fill background color
if (self.backgroundColor && CGColorGetAlpha(self.backgroundColor.CGColor) > 0) {
CGContextSetFillColorWithColor(context, self.backgroundColor.CGColor);
if (self.styleBackgroundColor && CGColorGetAlpha(self.styleBackgroundColor.CGColor) > 0) {
CGContextSetFillColorWithColor(context, self.styleBackgroundColor.CGColor);
UIBezierPath *bezierPath = [UIBezierPath wx_bezierPathWithRoundedRect:rect topLeft:topLeft topRight:topRight bottomLeft:bottomLeft bottomRight:bottomRight];
[bezierPath fill];
WXPerformBlockOnMainThread(^{
Expand Down Expand Up @@ -594,7 +594,7 @@ - (void)_handleBorders:(NSDictionary *)styles isUpdating:(BOOL)updating
_layer.borderWidth = _borderTopWidth;
_layer.borderColor = _borderTopColor.CGColor;
if ((_transition.transitionOptions & WXTransitionOptionsBackgroundColor) != WXTransitionOptionsBackgroundColor ) {
_layer.backgroundColor = self.backgroundColor.CGColor;
_layer.backgroundColor = self.styleBackgroundColor.CGColor;
}
}
}
Expand All @@ -606,7 +606,7 @@ - (BOOL)_bitmapOpaqueWithSize:(CGSize)size
WXRoundedRect *borderRect = [[WXRoundedRect alloc] initWithRect:rect topLeft:_borderTopLeftRadius topRight:_borderTopRightRadius bottomLeft:_borderBottomLeftRadius bottomRight:_borderBottomRightRadius];
WXRadii *radii = borderRect.radii;
BOOL hasBorderRadius = [radii hasBorderRadius];
return (!hasBorderRadius) && _opacity == 1.0 && CGColorGetAlpha(self.backgroundColor.CGColor) == 1.0 && [self _needsDrawBorder];
return (!hasBorderRadius) && _opacity == 1.0 && CGColorGetAlpha(self.styleBackgroundColor.CGColor) == 1.0 && [self _needsDrawBorder];
}

- (CAShapeLayer *)drawBorderRadiusMaskLayer:(CGRect)rect
Expand Down
8 changes: 4 additions & 4 deletions ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ @implementation WXComponent
}

@synthesize transform = _transform;
@synthesize backgroundColor = _backgroundColor;
@synthesize styleBackgroundColor = _styleBackgroundColor;

#pragma mark Life Cycle

Expand Down Expand Up @@ -392,7 +392,7 @@ - (UIView *)view
_layer.borderWidth = _borderTopWidth;
[self _resetNativeBorderRadius];
_layer.opacity = _opacity;
_view.backgroundColor = self.backgroundColor;
_view.backgroundColor = self.styleBackgroundColor;
}

if (_backgroundImage) {
Expand Down Expand Up @@ -858,8 +858,8 @@ - (void)setGradientLayer
UIColor * endColor = (UIColor*)linearGradient[@"endColor"];
CAGradientLayer * gradientLayer = [WXUtility gradientLayerFromColors:@[startColor, endColor] locations:nil frame:strongSelf.view.bounds gradientType:(WXGradientType)[linearGradient[@"gradientType"] integerValue]];
if (gradientLayer) {
strongSelf.backgroundColor = [UIColor colorWithPatternImage:[strongSelf imageFromLayer:gradientLayer]];
strongSelf.view.backgroundColor = strongSelf.backgroundColor;
strongSelf.styleBackgroundColor = [UIColor colorWithPatternImage:[strongSelf imageFromLayer:gradientLayer]];
strongSelf.view.backgroundColor = strongSelf.styleBackgroundColor;
[strongSelf setNeedsDisplay];
}
}
Expand Down
8 changes: 4 additions & 4 deletions ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ - (void)viewDidUnload

- (void)_initViewPropertyWithStyles:(NSDictionary *)styles
{
self.backgroundColor = styles[@"backgroundColor"] ? [WXConvert UIColor:styles[@"backgroundColor"]] : [UIColor clearColor];
self.styleBackgroundColor = styles[@"backgroundColor"] ? [WXConvert UIColor:styles[@"backgroundColor"]] : [UIColor clearColor];
_backgroundImage = styles[@"backgroundImage"] ? [WXConvert NSString:styles[@"backgroundImage"]]: nil;
_opacity = styles[@"opacity"] ? [WXConvert CGFloat:styles[@"opacity"]] : 1.0;
_clipToBounds = styles[@"overflow"] ? [WXConvert WXClipType:styles[@"overflow"]] : NO;
Expand All @@ -193,7 +193,7 @@ - (void)_transitionUpdateViewProperty:(NSDictionary *)styles
{
WX_CHECK_COMPONENT_TYPE(self.componentType)
if (styles[@"backgroundColor"]) {
self.backgroundColor = [WXConvert UIColor:styles[@"backgroundColor"]];
self.styleBackgroundColor = [WXConvert UIColor:styles[@"backgroundColor"]];
}
if (styles[@"opacity"]) {
_opacity = [WXConvert CGFloat:styles[@"opacity"]];
Expand All @@ -211,7 +211,7 @@ - (void)_updateViewStyles:(NSDictionary *)styles
}

if (styles[@"backgroundColor"]) {
self.backgroundColor = [WXConvert UIColor:styles[@"backgroundColor"]];
self.styleBackgroundColor = [WXConvert UIColor:styles[@"backgroundColor"]];
[self setNeedsDisplay];
}

Expand Down Expand Up @@ -307,7 +307,7 @@ - (void)resetBorder:(NSArray *)styles
- (void)_resetStyles:(NSArray *)styles
{
if (styles && [styles containsObject:@"backgroundColor"]) {
self.backgroundColor = [UIColor clearColor];
self.styleBackgroundColor = [UIColor clearColor];
[self setNeedsDisplay];
}
if (styles && [styles containsObject:@"boxShadow"]) {
Expand Down