Merge branch 'master' into ASVideoNode

Author: lappp9

AsyncDisplayKit.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
   spec.name         = 'AsyncDisplayKit'
-  spec.version      = '1.9.4'
+  spec.version      = '1.9.5'
   spec.license      =  { :type => 'BSD' }
   spec.homepage     = 'http://asyncdisplaykit.org'
   spec.authors      = { 'Scott Goodson' => 'scottgoodson@gmail.com', 'Ryan Nystrom' => 'rnystrom@fb.com' }
   spec.summary      = 'Smooth asynchronous user interfaces for iOS apps.'
-  spec.source       = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.4' }
+  spec.source       = { :git => 'https://github.com/facebook/AsyncDisplayKit.git', :tag => '1.9.5' }
 
   spec.documentation_url = 'http://asyncdisplaykit.org/appledoc/'
 

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -40,7 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme

@@ -9,12 +9,6 @@
 #import <AsyncDisplayKit/ASTextNode.h>
 #import <AsyncDisplayKit/ASImageNode.h>
 
-typedef enum : NSUInteger {
-  ASButtonStateNormal,
-  ASButtonStateHighlighted,
-  ASButtonStateDisabled,
-} ASButtonState;
-
 @interface ASButtonNode : ASControlNode
 
 @property (nonatomic, readonly) ASTextNode *titleNode;
@@ -43,10 +37,10 @@ typedef enum : NSUInteger {
 @property (nonatomic, assign) ASVerticalAlignment contentVerticalAlignment;
 
 
-- (NSAttributedString *)attributedTitleForState:(ASButtonState)state;
-- (void)setAttributedTitle:(NSAttributedString *)title forState:(ASButtonState)state;
+- (NSAttributedString *)attributedTitleForState:(ASControlState)state;
+- (void)setAttributedTitle:(NSAttributedString *)title forState:(ASControlState)state;
 
-- (UIImage *)imageForState:(ASButtonState)state;
-- (void)setImage:(UIImage *)image forState:(ASButtonState)state;
+- (UIImage *)imageForState:(ASControlState)state;
+- (void)setImage:(UIImage *)image forState:(ASControlState)state;
 
 @end

AsyncDisplayKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -17,10 +17,12 @@ @interface ASButtonNode ()
 
   NSAttributedString *_normalAttributedTitle;
   NSAttributedString *_highlightedAttributedTitle;
+  NSAttributedString *_selectedAttributedTitle;
   NSAttributedString *_disabledAttributedTitle;
 
   UIImage *_normalImage;
   UIImage *_highlightedImage;
+  UIImage *_selectedImage;
   UIImage *_disabledImage;
 }
 
@@ -45,14 +47,27 @@ - (instancetype)init
 
     [self addSubnode:_titleNode];
     [self addSubnode:_imageNode];
-    
-    [self addTarget:self action:@selector(controlEventUpdated:) forControlEvents:ASControlNodeEventAllEvents];
   }
   return self;
 }
 
-- (void)controlEventUpdated:(ASControlNode *)node
+- (void)setEnabled:(BOOL)enabled
+{
+  [super setEnabled:enabled];
+  [self updateImage];
+  [self updateTitle];
+}
+
+- (void)setHighlighted:(BOOL)highlighted
 {
+  [super setHighlighted:highlighted];
+  [self updateImage];
+  [self updateTitle];
+}
+
+- (void)setSelected:(BOOL)selected
+{
+  [super setSelected:selected];
   [self updateImage];
   [self updateTitle];
 }
@@ -66,6 +81,8 @@ - (void)updateImage
     newImage = _disabledImage;
   } else if (self.highlighted && _highlightedImage) {
     newImage = _highlightedImage;
+  } else if (self.selected && _selectedImage) {
+    newImage = _selectedImage;
   } else {
     newImage = _normalImage;
   }
@@ -84,6 +101,8 @@ - (void)updateTitle
     newTitle = _disabledAttributedTitle;
   } else if (self.highlighted && _highlightedAttributedTitle) {
     newTitle = _highlightedAttributedTitle;
+  } else if (self.selected && _selectedAttributedTitle) {
+    newTitle = _selectedAttributedTitle;
   } else {
     newTitle = _normalAttributedTitle;
   }
@@ -126,70 +145,96 @@ - (void)setLaysOutHorizontally:(BOOL)laysOutHorizontally
   [self setNeedsLayout];
 }
 
-- (NSAttributedString *)attributedTitleForState:(ASButtonState)state
+- (NSAttributedString *)attributedTitleForState:(ASControlState)state
 {
   ASDN::MutexLocker l(_propertyLock);
   switch (state) {
-    case ASButtonStateNormal:
+    case ASControlStateNormal:
       return _normalAttributedTitle;
 
-    case ASButtonStateHighlighted:
+    case ASControlStateHighlighted:
       return _highlightedAttributedTitle;
 
-    case ASButtonStateDisabled:
+    case ASControlStateSelected:
+      return _selectedAttributedTitle;
+      
+    case ASControlStateDisabled:
       return _disabledAttributedTitle;
+          
+    default:
+      return _normalAttributedTitle;
   }
 }
 
-- (void)setAttributedTitle:(NSAttributedString *)title forState:(ASButtonState)state
+- (void)setAttributedTitle:(NSAttributedString *)title forState:(ASControlState)state
 {
   ASDN::MutexLocker l(_propertyLock);
   switch (state) {
-    case ASButtonStateNormal:
+    case ASControlStateNormal:
       _normalAttributedTitle = [title copy];
       break;
 
-    case ASButtonStateHighlighted:
+    case ASControlStateHighlighted:
       _highlightedAttributedTitle = [title copy];
       break;
 
-    case ASButtonStateDisabled:
+    case ASControlStateSelected:
+      _selectedAttributedTitle = [title copy];
+      break;
+      
+    case ASControlStateDisabled:
       _disabledAttributedTitle = [title copy];
       break;
+      
+    default:
+      break;
   }
   [self updateTitle];
 }
 
-- (UIImage *)imageForState:(ASButtonState)state
+- (UIImage *)imageForState:(ASControlState)state
 {
   ASDN::MutexLocker l(_propertyLock);
   switch (state) {
-    case ASButtonStateNormal:
+    case ASControlStateNormal:
       return _normalImage;
 
-    case ASButtonStateHighlighted:
+    case ASControlStateHighlighted:
       return _highlightedImage;
 
-    case ASButtonStateDisabled:
+    case ASControlStateSelected:
+      return _selectedImage;
+      
+    case ASControlStateDisabled:
       return _disabledImage;
+      
+    default:
+      return _normalImage;
   }
 }
 
-- (void)setImage:(UIImage *)image forState:(ASButtonState)state
+- (void)setImage:(UIImage *)image forState:(ASControlState)state
 {
   ASDN::MutexLocker l(_propertyLock);
   switch (state) {
-    case ASButtonStateNormal:
+    case ASControlStateNormal:
       _normalImage = image;
       break;
 
-    case ASButtonStateHighlighted:
+    case ASControlStateHighlighted:
       _highlightedImage = image;
       break;
 
-    case ASButtonStateDisabled:
+    case ASControlStateSelected:
+      _selectedImage = image;
+      break;
+      
+    case ASControlStateDisabled:
       _disabledImage = image;
       break;
+      
+    default:
+      break;
   }
   [self updateImage];
 }

AsyncDisplayKit/ASButtonNode.h

@@ -63,13 +63,6 @@ - (instancetype)initWithViewControllerBlock:(ASDisplayNodeViewControllerBlock)vi
   return self;
 }
 
-//- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-//{
-//  _viewControllerNode.frame = (CGRect){{0,0}, constrainedSize.max};
-//  NSLog(@"%f %f", constrainedSize.max.width, constrainedSize.max.height);
-//  return [super layoutSpecThatFits:constrainedSize];
-//}
-
 - (void)layout
 {
   [super layout];

AsyncDisplayKit/ASButtonNode.mm

@@ -7,7 +7,10 @@
 //
 
 #import "ASCollectionNode.h"
+#import "ASCollectionInternal.h"
 #import "ASDisplayNode+Subclasses.h"
+#import "ASRangeController.h"
+#include <vector>
 
 @interface _ASCollectionPendingState : NSObject
 @property (weak, nonatomic) id <ASCollectionDelegate>   delegate;
@@ -17,12 +20,39 @@ @interface _ASCollectionPendingState : NSObject
 @implementation _ASCollectionPendingState
 @end
 
-@interface ASCollectionNode ()
-@property (nonatomic) _ASCollectionPendingState *pendingState;
+#if 0  // This is not used yet, but will provide a way to avoid creating the view to set range values.
+@implementation _ASCollectionPendingState
+{
+  std::vector<ASRangeTuningParameters> _tuningParameters;
+}
+
+- (instancetype)init
+{
+  if (!(self = [super init])) {
+    return nil;
+  }
+  _tuningParameters = std::vector<ASRangeTuningParameters>(ASLayoutRangeTypeCount);
+  return self;
+}
+
+- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
+{
+  ASDisplayNodeAssert(rangeType < _tuningParameters.size(), @"Requesting a range that is OOB for the configured tuning parameters");
+  return _tuningParameters[rangeType];
+}
+
+- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
+{
+  ASDisplayNodeAssert(rangeType < _tuningParameters.size(), @"Requesting a range that is OOB for the configured tuning parameters");
+  ASDisplayNodeAssert(rangeType != ASLayoutRangeTypeVisible, @"Must not set Visible range tuning parameters (always 0, 0)");
+  _tuningParameters[rangeType] = tuningParameters;
+}
+
 @end
+#endif
 
-@interface ASCollectionView ()
-- (instancetype)_initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout;
+@interface ASCollectionNode ()
+@property (nonatomic) _ASCollectionPendingState *pendingState;
 @end
 
 @implementation ASCollectionNode
@@ -40,10 +70,22 @@ - (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
   return [self initWithFrame:CGRectZero collectionViewLayout:layout];
 }
 
+- (instancetype)_initWithCollectionView:(ASCollectionView *)collectionView
+{
+  ASDisplayNodeViewBlock collectionViewBlock = ^UIView *{ return collectionView; };
+  
+  if (self = [super initWithViewBlock:collectionViewBlock]) {
+    // ASCollectionView created directly by the app.  Trigger -loadView to set up collectionNode pointer.
+    __unused ASCollectionView *collectionView = [self view];
+    return self;
+  }
+  return nil;
+}
+
 - (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
 {
   ASDisplayNodeViewBlock collectionViewBlock = ^UIView *{
-    return [[ASCollectionView alloc] _initWithFrame:frame collectionViewLayout:layout];
+    return [[ASCollectionView alloc] _initWithFrame:frame collectionViewLayout:layout ownedByNode:YES];
   };
 
   if (self = [super initWithViewBlock:collectionViewBlock]) {
@@ -56,11 +98,12 @@ - (void)didLoad
 {
   [super didLoad];
 
+  ASCollectionView *view = self.view;
+  view.collectionNode    = self;
+  
   if (_pendingState) {
     _ASCollectionPendingState *pendingState = _pendingState;
-    self.pendingState = nil;
-    
-    ASCollectionView *view = self.view;
+    self.pendingState      = nil;
     view.asyncDelegate     = pendingState.delegate;
     view.asyncDataSource   = pendingState.dataSource;
   }
@@ -118,10 +161,13 @@ - (ASCollectionView *)view
   return (ASCollectionView *)[super view];
 }
 
+#if RangeControllerLoggingEnabled
 - (void)visibilityDidChange:(BOOL)isVisible
 {
-  
+  [super visibilityDidChange:isVisible];
+  NSLog(@"%@ - visible: %d", self, isVisible);
 }
+#endif
 
 - (void)clearContents
 {
@@ -139,12 +185,12 @@ - (void)clearFetchedData
 
 - (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
 {
-  return [self.view tuningParametersForRangeType:rangeType];
+  return [self.view.rangeController tuningParametersForRangeType:rangeType];
 }
 
 - (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
 {
-  return [self.view setTuningParameters:tuningParameters forRangeType:rangeType];
+  return [self.view.rangeController setTuningParameters:tuningParameters forRangeType:rangeType];
 }
 
 - (void)reloadDataWithCompletion:(void (^)())completion