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

[ASVideoNode] Change superclass to ASNetworkImageNode so that it can be its own placeholder (#1710)

Browse Source 
* [ASVideoNode] Change superclass to ASNetworkImageNode so that ASVideoNode can be its own placeholder
- remove _placeholderImageNode property of ASVideoNode (use self.image now instead)
- move layoutSpecThatFits: code to calculateSizeThatFits: & layout: methods as ASImageNode uses calculateSizeThatFits:

* [ASVideoNode] Tweaks to the definition of the delegate protocols to integrate with ASNetworkImageNode (superclass)
This commit is contained in:
Hannah Troisi
2016-06-05 18:18:52 -07:00
committed by appleguy
parent 4804f429b9
commit 52d58992da
4 changed files with 46 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AsyncDisplayKitTests/ASVideoNodeTests.m
View File

@@ -29,7 +29,6 @@
}
@property (atomic, readwrite) ASInterfaceState interfaceState;
@property (atomic, readonly) ASDisplayNode *spinner;
@property (atomic, readonly) ASImageNode *placeholderImageNode;
@property (atomic, readwrite) ASDisplayNode *playerNode;
@property (atomic, readwrite) AVPlayer *player;
@property (atomic, readwrite) BOOL shouldBePlaying;
@@ -355,16 +354,16 @@
- (void)testSettingVideoGravityChangesPlaceholderContentMode
{
[_videoNode setVideoPlaceholderImage:[[UIImage alloc] init]];
XCTAssertEqual(UIViewContentModeScaleAspectFit, _videoNode.placeholderImageNode.contentMode);
XCTAssertEqual(UIViewContentModeScaleAspectFit, _videoNode.contentMode);
_videoNode.gravity = AVLayerVideoGravityResize;
XCTAssertEqual(UIViewContentModeScaleToFill, _videoNode.placeholderImageNode.contentMode);
XCTAssertEqual(UIViewContentModeScaleToFill, _videoNode.contentMode);
_videoNode.gravity = AVLayerVideoGravityResizeAspect;
XCTAssertEqual(UIViewContentModeScaleAspectFit, _videoNode.placeholderImageNode.contentMode);
XCTAssertEqual(UIViewContentModeScaleAspectFit, _videoNode.contentMode);
_videoNode.gravity = AVLayerVideoGravityResizeAspectFill;
XCTAssertEqual(UIViewContentModeScaleAspectFill, _videoNode.placeholderImageNode.contentMode);
XCTAssertEqual(UIViewContentModeScaleAspectFill, _videoNode.contentMode);
}
- (void)testChangingAssetsChangesPlaceholderImage
@@ -373,10 +372,10 @@
_videoNode.asset = _firstAsset;
[_videoNode setVideoPlaceholderImage:firstImage];
XCTAssertEqual(firstImage, _videoNode.placeholderImageNode.image);
XCTAssertEqual(firstImage, _videoNode.image);
_videoNode.asset = _secondAsset;
XCTAssertNotEqual(firstImage, _videoNode.placeholderImageNode.image);
XCTAssertNotEqual(firstImage, _videoNode.image);
}
- (void)testClearingFetchedContentShouldClearAssetData
@@ -397,12 +396,12 @@
XCTAssertNotNil(_videoNode.player);
XCTAssertNotNil(_videoNode.currentItem);
XCTAssertNotNil(_videoNode.placeholderImageNode.image);
XCTAssertNotNil(_videoNode.image);
[_videoNode clearFetchedData];
XCTAssertNil(_videoNode.player);
XCTAssertNil(_videoNode.currentItem);
XCTAssertNil(_videoNode.placeholderImageNode.image);
XCTAssertNil(_videoNode.image);
}
@end