fixed typo and added backwards compatibility for 'visibilityDidChange'

This commit is contained in:
Luke Parham
2016-06-06 02:02:23 -05:00
parent e510120031
commit fc5467b110
12 changed files with 39 additions and 31 deletions

View File

@@ -214,9 +214,9 @@
// To be overriden by subclasses
}
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
CGRect cellFrame = CGRectZero;
if (_scrollView) {

View File

@@ -173,9 +173,9 @@
}
#if ASRangeControllerLoggingEnabled
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
NSLog(@"%@ - visible: %d", self, isVisible);
}
#endif

View File

@@ -240,10 +240,17 @@ NS_ASSUME_NONNULL_BEGIN
*
* @discussion Subclasses may use this to monitor when they become visible.
*/
- (void)visibileStateDidChange:(BOOL)isVisible ASDISPLAYNODE_REQUIRES_SUPER;
- (void)visibilityDidChange:(BOOL)isVisible ASDISPLAYNODE_REQUIRES_SUPER;
/**
* @abstract Called whenever the the node has entered or left the display state.
* @abstract Called whenever the visiblity of the node changed.
*
* @discussion Subclasses may use this to monitor when they become visible.
*/
- (void)visibleStateDidChange:(BOOL)isVisible ASDISPLAYNODE_REQUIRES_SUPER;
/**
* @abstract Called whenever the the node has entered or exited the display state.
*
* @discussion Subclasses may use this to monitor when a node should be rendering its content.
*

View File

@@ -2173,9 +2173,14 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
});
}
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibilityDidChange:(BOOL)isVisible
{
// subclass override
// subclass override
}
- (void)visibleStateDidChange:(BOOL)isVisible
{
// subclass override
}
- (void)displayStateDidChange:(BOOL)inDisplayState
@@ -2282,11 +2287,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
}
}
if (nowDisplay) {
[self displayStateDidChange:YES];
} else {
[self displayStateDidChange:NO];
}
[self displayStateDidChange:nowDisplay];
}
// Became visible or invisible. When range-managed, this represents literal visibility - at least one pixel
@@ -2295,7 +2296,8 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
BOOL wasVisible = ASInterfaceStateIncludesVisible(oldState);
if (nowVisible != wasVisible) {
[self visibileStateDidChange:nowVisible];
[self visibleStateDidChange:nowVisible];
[self visibilityDidChange:nowVisible]; //TODO: remove once this method has been deprecated
}
[self interfaceStateDidChange:newState fromState:oldState];

View File

@@ -135,9 +135,9 @@
[self.animatedImage clearAnimatedImageCache];
}
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
ASDisplayNodeAssertMainThread();
if (isVisible) {

View File

@@ -295,11 +295,11 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
}
}
/* visibilityDidChange in ASNetworkImageNode has a very similar implementation. Changes here are likely necessary
/* visibileStateDidChange in ASNetworkImageNode has a very similar implementation. Changes here are likely necessary
in ASNetworkImageNode as well. */
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
if (_downloaderImplementsSetPriority) {
ASDN::MutexLocker l(_downloadIdentifierLock);

View File

@@ -278,11 +278,11 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
}
}
/* visibilityDidChange in ASMultiplexImageNode has a very similar implementation. Changes here are likely necessary
/* visibileStateDidChange in ASMultiplexImageNode has a very similar implementation. Changes here are likely necessary
in ASMultiplexImageNode as well. */
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
if (_downloaderImplementsSetPriority) {
_lock.lock();

View File

@@ -145,9 +145,9 @@
}
#if ASRangeControllerLoggingEnabled
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
NSLog(@"%@ - visible: %d", self, isVisible);
}
#endif

View File

@@ -382,9 +382,9 @@ static NSString * const kStatus = @"status";
}
}
- (void)visibileStateDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibileStateDidChange:isVisible];
[super visibleStateDidChange:isVisible];
ASDN::MutexLocker l(_videoLock);

View File

@@ -163,9 +163,9 @@ static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext;
}
}
- (void)visibilityDidChange:(BOOL)isVisible
- (void)visibleStateDidChange:(BOOL)isVisible
{
[super visibilityDidChange:isVisible];
[super visibleStateDidChange:isVisible];
ASDN::MutexLocker l(_videoPlayerLock);

View File

@@ -95,7 +95,7 @@ static UIApplicationState __ApplicationState = UIApplicationStateActive;
{
_scrollDirection = scrollDirection;
// Perform update immediately, so that cells receive a visibileStateDidChange: call before their first pixel is visible.
// Perform update immediately, so that cells receive a visibleStateDidChange: call before their first pixel is visible.
[self scheduleRangeUpdate];
}

View File

@@ -223,12 +223,11 @@
}];
_videoNode.playerNode.layer.frame = CGRectZero;
[_videoNode visibileStateDidChange:YES];
[_videoNode visibleStateDidChange:YES];
XCTAssertTrue(_videoNode.shouldBePlaying);
}
- (void)testVideoShouldPauseWhenItLeavesVisibleButShouldKnowPlayingShouldRestartLater
{
_videoNode.asset = _firstAsset;