mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the hex color from 0x00000000 format to #00000000

This commit is contained in:
DreamPiggy 2018-02-20 01:37:30 +08:00
parent aea81791ec
commit 3e3ec8d513
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDWebImage/UIImage+Transform.h
View File

@ -31,7 +31,7 @@ typedef NS_OPTIONS(NSUInteger, SDRectCorner) {
@interface UIColor (Additions)
/**
Convenience way to get hex string from color. The output should always be 32-bit hex string like `0x00000000`
Convenience way to get hex string from color. The output should always be 32-bit hex string like `#00000000`.
*/
@property (nonatomic, copy, readonly, nonnull) NSString *sd_hexString;

2
SDWebImage/UIImage+Transform.m
View File

@ -150,7 +150,7 @@ static CGRect SDCGRectFitWithScaleMode(CGRect rect, CGSize size, SDImageScaleMod
uint hex = ((uint)alpha << 24) | ((uint)red << 16) | ((uint)green << 8) | ((uint)blue);
return [NSString stringWithFormat:@"0x%08x", hex];
return [NSString stringWithFormat:@"#%08x", hex];
}
@end

6
Tests/Tests/SDCategoriesTests.m
View File

@ -81,7 +81,7 @@
UIImage *croppedImage = [self.testImage sd_croppedImageWithRect:rect];
expect(CGSizeEqualToSize(croppedImage.size, CGSizeMake(200, 200))).beTruthy();
UIColor *startColor = [croppedImage sd_colorAtPoint:CGPointZero];
expect([startColor.sd_hexString isEqualToString:@"0x00000000"]).beTruthy();
expect([startColor.sd_hexString isEqualToString:[UIColor clearColor].sd_hexString]).beTruthy();
}
- (void)test07UIImageTransformRoundedCorner {
@ -96,7 +96,7 @@
UIImage *roundedCornerImage = [self.testImage sd_roundedCornerImageWithRadius:radius corners:corners borderWidth:borderWidth borderColor:borderCoder];
expect(CGSizeEqualToSize(roundedCornerImage.size, CGSizeMake(300, 300))).beTruthy();
UIColor *startColor = [roundedCornerImage sd_colorAtPoint:CGPointZero];
expect([startColor.sd_hexString isEqualToString:@"0x00000000"]).beTruthy();
expect([startColor.sd_hexString isEqualToString:[UIColor clearColor].sd_hexString]).beTruthy();
// Check the left center pixel, should be border :)
UIColor *checkBorderColor = [roundedCornerImage sd_colorAtPoint:CGPointMake(1, 150)];
expect([checkBorderColor.sd_hexString isEqualToString:borderCoder.sd_hexString]).beTruthy();
@ -127,7 +127,7 @@
expect(CGSizeEqualToSize(tintedImage.size, self.testImage.size)).beTruthy();
// Check center color, should keep clear
UIColor *centerColor = [tintedImage sd_colorAtPoint:CGPointMake(150, 150)];
expect([centerColor.sd_hexString isEqualToString:@"0x00000000"]);
expect([centerColor.sd_hexString isEqualToString:[UIColor clearColor].sd_hexString]);
// Check left color, should be tinted
UIColor *leftColor = [tintedImage sd_colorAtPoint:CGPointMake(80, 150)];
expect([leftColor.sd_hexString isEqualToString:tintColor.sd_hexString]);