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

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
This commit is contained in:
Adlai Holler
2015-12-22 00:28:21 -05:00
parent e202b18db9 d7492b331f
commit 69767d558e
103 changed files with 2968 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AsyncDisplayKit/ASDisplayNode.h
View File

@@ -24,6 +24,11 @@ NS_ASSUME_NONNULL_BEGIN
*/
typedef UIView * _Nonnull(^ASDisplayNodeViewBlock)();
/**
* UIView creation block. Used to create the backing view of a new display node.
*/
typedef UIViewController *(^ASDisplayNodeViewControllerBlock)();
/**
* CALayer creation block. Used to create the backing layer of a new display node.
*/
@@ -687,7 +692,6 @@ typedef NS_OPTIONS(NSUInteger, ASInterfaceState)
* @param node The node to be added.
*/
- (void)addSubnode:(ASDisplayNode *)node;
- (NSString *)name;
@end
/** CALayer(AsyncDisplayKit) defines convenience method for adding sub-ASDisplayNode to a CALayer. */
@@ -698,7 +702,6 @@ typedef NS_OPTIONS(NSUInteger, ASInterfaceState)
* @param node The node to be added.
*/
- (void)addSubnode:(ASDisplayNode *)node;
- (NSString *)name;
@end