ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename setPlaceholderImage to setVideoPlaceholderImage in order to prevent super class setter conflict

Browse Source
This commit is contained in:
Eric Jensen
2016-04-18 22:30:32 -07:00
parent a2b03d6e90
commit 6a4bc3fd5b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AsyncDisplayKit/ASVideoNode.mm
View File

@@ -170,7 +170,7 @@ static NSString * const kStatus = @"status";
ASPerformBlockOnMainThread(^{
// Ensure the asset hasn't changed since the image request was made
if (ASAssetIsEqual(weakSelf.asset, asset)) {
[weakSelf setPlaceholderImage:image];
[weakSelf setVideoPlaceholderImage:image];
}
});
}];
@@ -201,7 +201,7 @@ static NSString * const kStatus = @"status";
});
}
- (void)setPlaceholderImage:(UIImage *)image
- (void)setVideoPlaceholderImage:(UIImage *)image
{
ASDN::MutexLocker l(_videoLock);

8
AsyncDisplayKitTests/ASVideoNodeTests.m
View File

@@ -31,7 +31,7 @@
@property (atomic, readwrite) AVPlayer *player;
@property (atomic, readwrite) BOOL shouldBePlaying;
- (void)setPlaceholderImage:(UIImage *)image;
- (void)setVideoPlaceholderImage:(UIImage *)image;
@end
@@ -330,7 +330,7 @@
- (void)testSettingVideoGravityChangesPlaceholderContentMode
{
[_videoNode setPlaceholderImage:[[UIImage alloc] init]];
[_videoNode setVideoPlaceholderImage:[[UIImage alloc] init]];
XCTAssertEqual(UIViewContentModeScaleAspectFit, _videoNode.placeholderImageNode.contentMode);
_videoNode.gravity = AVLayerVideoGravityResize;
@@ -363,7 +363,7 @@
UIImage *firstImage = [[UIImage alloc] init];
_videoNode.asset = _firstAsset;
[_videoNode setPlaceholderImage:firstImage];
[_videoNode setVideoPlaceholderImage:firstImage];
XCTAssertEqual(firstImage, _videoNode.placeholderImageNode.image);
_videoNode.asset = _secondAsset;
@@ -374,7 +374,7 @@
{
_videoNode.asset = _firstAsset;
[_videoNode fetchData];
[_videoNode setPlaceholderImage:[[UIImage alloc] init]];
[_videoNode setVideoPlaceholderImage:[[UIImage alloc] init]];
XCTAssertNotNil(_videoNode.player);
XCTAssertNotNil(_videoNode.currentItem);
XCTAssertNotNil(_videoNode.placeholderImageNode.image);