ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-16 11:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move validation code to ASLayoutValidation and add validation flag

Browse Source
This commit is contained in:
Michael Schneider 2016-06-08 16:59:46 -07:00
parent f9e13545bf
commit 9ff7223b77
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -26,11 +26,11 @@
#import "ASEqualityHelpers.h" #import "ASEqualityHelpers.h"
#import "ASRunLoopQueue.h" #import "ASRunLoopQueue.h"
#import "ASEnvironmentInternal.h" #import "ASEnvironmentInternal.h"
#import "ASLayoutValidation.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayout.h" #import "ASLayout.h"
#import "ASLayoutSpec.h" #import "ASLayoutSpec.h"
#import "ASLayoutValidation.h"
#import "ASCellNode.h" #import "ASCellNode.h"
NSInteger const ASDefaultDrawingPriority = ASDefaultTransactionPriority; NSInteger const ASDefaultDrawingPriority = ASDefaultTransactionPriority;
@ -855,17 +855,6 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
_pendingLayoutTransition = nil; _pendingLayoutTransition = nil;
} }
#pragma mark - Layout Validation
- (void)validateLayout:(ASLayout *)layout
{
ASLayoutableValidation *validation = [[ASLayoutableValidation alloc] init];
[validation registerValidator:[[ASLayoutableStaticValidator alloc] init]];
[validation registerValidator:[[ASLayoutableStackValidator alloc] init]];
[validation validateLayout:layout];
}
#pragma mark - _ASTransitionContextCompletionDelegate #pragma mark - _ASTransitionContextCompletionDelegate
- (void)transitionContext:(_ASTransitionContext *)context didComplete:(BOOL)didComplete - (void)transitionContext:(_ASTransitionContext *)context didComplete:(BOOL)didComplete
@ -1920,8 +1909,8 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
if (isRootLayout) { if (isRootLayout) {
layout.position = CGPointZero; layout.position = CGPointZero;
layout = [ASLayout layoutWithLayoutableObject:self constrainedSizeRange:constrainedSize size:layout.size sublayouts:@[layout]]; layout = [ASLayout layoutWithLayoutableObject:self constrainedSizeRange:constrainedSize size:layout.size sublayouts:@[layout]];
#if DEBUG #if LAYOUT_VALIDATION
[self validateLayout:layout]; ASLayoutableValidateLayout(layout);
#endif #endif
} }
return [layout flattenedLayoutUsingPredicateBlock:^BOOL(ASLayout *evaluatedLayout) { return [layout flattenedLayoutUsingPredicateBlock:^BOOL(ASLayout *evaluatedLayout) {

9
AsyncDisplayKit/Layout/ASLayoutValidation.h
View File

@ -9,11 +9,17 @@
*/ */
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <AsyncDisplayKit/ASBaseDefines.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class ASLayout; @class ASLayout;
// Enable or disable automatic layout validation
#define LAYOUT_VALIDATION 0
extern void ASLayoutableValidateLayout(ASLayout *layout);
#pragma mark - ASLayoutableValidator #pragma mark - ASLayoutableValidator
@protocol ASLayoutableValidator <NSObject> @protocol ASLayoutableValidator <NSObject>
@ -45,6 +51,9 @@ typedef void (^ASLayoutableBlockValidatorBlock)(id layout);
@end @end
/*
* Not in use at the moment
*/
@interface ASLayoutablePreferredSizeValidator : NSObject<ASLayoutableValidator> @interface ASLayoutablePreferredSizeValidator : NSObject<ASLayoutableValidator>
@end @end

9
AsyncDisplayKit/Layout/ASLayoutValidation.mm
View File

@ -17,6 +17,15 @@
#import <queue> #import <queue>
#pragma mark - Layout Validation
void ASLayoutableValidateLayout(ASLayout *layout) {
ASLayoutableValidation *validation = [[ASLayoutableValidation alloc] init];
[validation registerValidator:[[ASLayoutableStaticValidator alloc] init]];
[validation registerValidator:[[ASLayoutableStackValidator alloc] init]];
[validation validateLayout:layout];
}
#pragma mark - Helpers #pragma mark - Helpers
static NSString *ASLayoutValidationWrappingAssertMessage(SEL selector, id obj, Class cl) { static NSString *ASLayoutValidationWrappingAssertMessage(SEL selector, id obj, Class cl) {