Commit Graph

175 Commits

Author SHA1 Message Date
Luke Parham
d9559111a0 renamed nic cage sample, added redundancy for loading player in case its nil when visible, added video tests, disabled assert for new range controller 2016-01-14 02:39:36 -06:00
Luke Parham
579313f086 Merge branch 'master' into ASVideoNode 2016-01-13 12:22:55 -06:00
Scott Goodson
d45db5ac32 Disable creation of backing ASTable/CollectionNode for the *View varients (retain cycle). 2016-01-09 20:44:24 -08:00
Bin Liu
6a4c953443 fix build failure 2016-01-05 21:20:52 -08:00
Scott Goodson
25b6f29584 Introduce ASCollectionInternal file and create always-available ASCView -> ASCNode backpointer. 2016-01-01 23:36:00 -08:00
Scott Goodson
b273f358f5 [ASRangeController] Initial implementation of functional-style, ASInterfaceState-based range controller. 2016-01-01 00:48:44 -08:00
Scott Goodson
df9f433353 Prevent calling unsupported UICollectionViewDelegate methods (supplementary view appearance) 2015-12-31 00:21:20 -08:00
Scott Goodson
ffcddf36e2 Ensure that ASRangeController immediately removes any deleted nodes from its range state. 2015-12-30 22:42:11 -08:00
Scott Goodson
df3ce787f7 Ensure that the uncommon __unloadNode codepath does not unintentionally trigger node removal. 2015-12-29 23:11:33 -08:00
Scott Goodson
1870208153 [ASPagerNode] Ensure delegate property can be set before the view is loaded and is not overwritten. 2015-12-29 20:46:42 -08:00
Scott Goodson
690f90a899 Supplementary nodes must be added to the completed nodes after their measurement completes following individual section reloads. 2015-12-27 15:34:26 -08:00
Luke Parham
5fbf39644b merged upstream 2015-12-26 01:33:34 -06:00
Scott Goodson
882d4b336e Merge branch 'master' into pr/664 2015-12-25 14:32:41 -08:00
Scott Goodson
ca57059322 New ASDelegateProxy class to unify logic for Table & Collection forwarding. Fix dealloc-during-animation crash. 2015-12-23 20:01:52 -08:00
Scott Goodson
065625f246 Make ASCollectionView always create an ASCollectionNode. Add visibilityDidChange:, interfaceStateDidChange:fromState: 2015-12-22 21:46:46 -08:00
Luke Parham
6dc15ffd44 added delegate method for video did finish, moved layer creation to after view displays, rearranged spinner logic, added tests 2015-12-22 15:34:11 -06:00
Luke Parham
e318285089 merged master 2015-12-22 02:17:28 -06:00
Luke Parham
4602e4e9eb wip fixing pr comments 2015-12-22 02:15:25 -06:00
Adlai Holler
69767d558e Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
2015-12-22 00:28:21 -05:00
appleguy
af9f8dfea7 Merge pull request #931 from lappp9/cells-with-view-controllers
[ASCellNode] Support for wrapping UIViewControllers
2015-12-21 20:55:28 -08:00
Levi McCallum
53d2af6ca1 Move PagerNode setup into didLoad 2015-12-21 08:52:41 -06:00
Luke Parham
322caaeb6a wip after review 2015-12-21 01:24:46 -06:00
Luke Parham
002b3b3805 renamed example app 2015-12-18 19:40:12 -06:00
Luke Parham
616e9ffbcb fixed problem with fetchData problem and updated nic cage example 2015-12-18 03:41:53 -06:00
Luke Parham
a75871055f added video sample app with tableview and simple one with 3 video examples 2015-12-18 02:22:33 -06:00
Luke Parham
6cbc51dc61 cleaned up comments 2015-12-16 23:44:17 -06:00
Luke Parham
b5c1076921 wip, adding play button functionality 2015-12-16 23:02:39 -06:00
Levi McCallum
aea5a3318e Implement simple horizontal paging node 2015-12-16 17:53:21 -08:00
Luke Parham
17c985da38 commented some stuff out 2015-12-15 15:30:27 -06:00
Adlai Holler
7079a9cc79 Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
2015-12-13 10:05:03 -08:00
Luke Parham
eeb49859f0 view controller node is resized to match layoutspec for cells 2015-12-09 13:13:39 -06:00
Luke Parham
5e34f10b81 added sample app that initializes ASCollectionView cells using view controllers, wip though 2015-12-08 21:57:14 -06:00
Scott Goodson
88b36f58e7 Ensure an empty array is returned if visibleNodes is called before any nodes are complete. 2015-12-06 21:45:46 -08:00
Scott Goodson
a47a1b8c2a Bump podspec to 1.9.3. Remove Cocoapods-generated workspace files. 2015-12-06 20:32:21 -08:00
Adlai Holler
fdfe18873a Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h
2015-12-01 16:45:25 -08:00
Levi McCallum
af60009992 Update social app to use new text node API 2015-11-30 06:46:53 -08:00
appleguy
937b72b64a Merge pull request #879 from levi/levi/custom-layout-example
Add custom collection view layout example project
2015-11-29 22:14:31 -08:00
Scott Goodson
254f55b758 Add locking for ASInterfaceState. Misc. cleanup. 2015-11-29 14:57:43 -08:00
appleguy
bd4b8601ba Merge pull request #837 from levi/levi/cell-selection
Fix selection inconsistency in ASTableView/ASCollectionView cell implementation
2015-11-28 16:56:25 -08:00
appleguy
6ea01d66a4 Merge pull request #857 from nguyenhuy/ImproveSocialAppLayoutSample
Trigger a relayout once the media image of PostNode in SocialAppLayout is loaded
2015-11-28 16:01:14 -08:00
Levi McCallum
36d24950e0 Add custom collection view layout example project 2015-11-27 18:58:44 -08:00
Adlai Holler
dfc098fc20 Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASCollectionView.h
	AsyncDisplayKit/ASTableView.h
	AsyncDisplayKit/Details/ASLayoutController.h
	AsyncDisplayKit/Details/ASRangeController.h
2015-11-24 16:40:03 -08:00
Scott Goodson
18dffb41e8 Fix an issue that could cause the view / layer to be created early by -clearContents. 2015-11-19 17:10:06 -08:00
Adlai Holler
ecaabc8435 Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/Details/UIView+ASConvenience.h
2015-11-18 14:17:09 -08:00
Huy Nguyen
52c45cf5e3 Trigger a relayout once the media image of PostNode in SocialAppLayout is loaded 2015-11-17 18:09:16 +02:00
Scott Goodson
2a0b9c8e14 Substantially improve behavior of nested Table & Collection Nodes
This ensures memory cleanup happens correctly and introduces a new test project
to support developing new features while stressing tough use cases for correctness.
2015-11-14 15:25:35 -08:00
Adlai Holler
762be97a51 Merge branch 'master' into update-objc 2015-11-13 12:03:30 -08:00
Levi McCallum
2d93192b9f Fix selection behavior of ASTableView cells 2015-11-11 01:06:28 -08:00
Levi McCallum
e6b33dd062 Fix cell selection and highlighting in ASCollectionView 2015-11-11 01:05:51 -08:00
appleguy
b295eda4b1 Merge pull request #823 from vitalybaev/SocialAppExample
New example app -- a "social" feed similar to Facebook or Twitter
2015-11-08 18:53:22 -08:00