1400 Commits

Author SHA1 Message Date
Levi McCallum
cd78bcce99 Convert naming of hash helpers to AS namespace 2015-11-30 06:53:50 -08:00
Levi McCallum
2cf4b22c96 Include correct TextKit headers 2015-11-30 06:46:53 -08:00
Levi McCallum
c1f4456fd5 Use composed attributed truncation string for underlying drawing text 2015-11-30 06:44:53 -08:00
Levi McCallum
a8e6aebe9c Remove public header exposure of text kit internals 2015-11-30 06:44:53 -08:00
Levi McCallum
397e5b15e9 Fix tabbing on initializer 2015-11-30 06:44:53 -08:00
Levi McCallum
a0c05ebffc Rename CK classes to AS classes 2015-11-30 06:44:53 -08:00
Levi McCallum
de66819286 Implement functioning isTruncated API on ASTextNode 2015-11-30 06:41:41 -08:00
Levi McCallum
74435fb584 Convert ASTextNode to support CKTextKitRenderer 2015-11-30 06:41:41 -08:00
Levi McCallum
275fd3eddd Include missing hash helpers implementation 2015-11-30 06:41:40 -08:00
Levi McCallum
bae3e3b63d Add latest ComponentKit text kit renderer into project 2015-11-30 06:41:40 -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
appleguy
171160564a Merge pull request #895 from Adlai-Holler/Cleanup894
Cleanup PR 894
2015-11-29 22:01:04 -08:00
Levi McCallum
24cb1d5cb0 Fix broken build 2015-11-29 21:49:34 -08:00
appleguy
d132416d90 Merge pull request #848 from nguyenhuy/JustifyContentSpaceBetweenAndAround
Implement "space between" and "space around" justify content options for stack layout
2015-11-29 21:46:42 -08:00
Levi McCallum
c801965f94 Zero out constrained size value by default 2015-11-29 21:28:59 -08:00
Adlai Holler
fca8614c18 Scope like a boss 2015-11-29 21:22:37 -08:00
Adlai Holler
50b318b117 Lock and unlock manually when doing early return 2015-11-29 17:49:11 -08:00
Adlai Holler
e481782ccb ASMultiplexImageNode: only copy image identifiers once 2015-11-29 17:43:09 -08:00
Adlai Holler
7d3cf56b17 ASMultiplexImageNode: fix bad behaviors with imageIdentifiers property 2015-11-29 17:33:00 -08:00
Adlai Holler
46eca61dbf ASMultiplexImageNode: replace spin lock with mutex 2015-11-29 17:31:57 -08:00
Adlai Holler
dfc7c0cc0e Image nodes call fetchData when image source is updated while in fetch range 2015-11-29 17:29:44 -08:00
Scott Goodson
254f55b758 Add locking for ASInterfaceState. Misc. cleanup. 2015-11-29 14:57:43 -08:00
Levi McCallum
59ff876b67 Ensure that nil message doesn't cause invalid scalar value 2015-11-29 13:51:15 -08:00
Scott Goodson
936730d46b ASInterfaceStateVisible is now being driven by a new ASRangeHandlerVisible. 2015-11-29 13:24:42 -08:00
Scott Goodson
1ed22866b1 Working implementation of ASInterfaceState for Display and FetchData behaviors. 2015-11-28 22:48:30 -08:00
Scott Goodson
943cae7eb9 Placeholder implementation of -setInterfaceState:. 2015-11-28 18:22:03 -08:00
Scott Goodson
ff0e94b4e1 Introduce ASInterfaceState on ASDisplayNode.
Later, this will be added to ASViewController.  Right now it is not hooked up to drive anything.
It will become the codepath that drives calls like -fetchData and -clearContents.
2015-11-28 18:22:03 -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
37334273dd Merge pull request #873 from nguyenhuy/AlignmentWrapper
[ASLayoutSpec] Implement horizontal and vertical alignments
2015-11-28 16:24:48 -08:00
Levi McCallum
36d24950e0 Add custom collection view layout example project 2015-11-27 18:58:44 -08:00
Adlai Holler
d273cda2b0 Remove unneeded _block specifier 2015-11-26 10:46:26 -08:00
Adlai Holler
41ecaa7bb2 _ASHierarchyChangeSet: add section change mapping methods, fix section exclusions 2015-11-26 10:42:35 -08:00
Adlai Holler
4bfdd82568 _ASHierarchyChangeSet: Exclude item-level changes that are redundant with section-level changes 2015-11-25 17:18:58 -08:00
Adlai Holler
b5e19a24a9 Consistency 2015-11-24 18:48:07 -08:00
Adlai Holler
2d633f118b Fix it better 2015-11-24 18:44:10 -08:00
Adlai Holler
6b3f0ada12 Fix table view change coalescing bug 2015-11-24 18:10:59 -08:00
Adlai Holler
628bb7eb3a Revert minor deletion 2015-11-24 16:43:40 -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
Huy Nguyen
0077c3eec6 Implement horizontal and vertical alignments for stack layout 2015-11-24 20:57:19 +02:00
Alexey Glushkov
c501e46b5d removed wrong conditions in _needInvalidateRenderer 2015-11-24 11:35:20 +03:00
Alexey Glushkov
01a2fd90d4 removed displaySize method, added condition to skip _invalidateRendererIfNeeded if there are no view and no layer 2015-11-24 11:12:36 +03:00
Alexey Glushkov
e859f9a870 fixed brace style 2015-11-24 10:10:34 +03:00
Alexey Glushkov
38ded30da9 add layer backed text node support for the fix 2015-11-24 10:01:02 +03:00
appleguy
50a52e7112 Merge pull request #878 from Adlai-Holler/ImageIdentifierEquality
Use ASObjectIsEqual When Comparing Identifiers in ASMultiplexImageNode
2015-11-23 21:27:05 -08:00
appleguy
15f718ddc9 Merge pull request #868 from levi/levi/remove-deprecated
Clean up syntax and organization of ASRangeController
2015-11-23 21:24:58 -08:00
Adlai Holler
97e42da172 Merge branch 'master' into ImageIdentifierEquality
Conflicts:
	AsyncDisplayKit/ASMultiplexImageNode.mm
2015-11-23 18:36:02 -08:00
Adlai Holler
1ff0d7f648 Intentionally don't cancel image downloads in ASMultiplexImageNode.clearContents 2015-11-23 15:24:11 -08:00
Adlai Holler
2771ce875e Everyone gets an ASObjectIsEqual!! 2015-11-23 13:08:56 -08:00
Adlai Holler
93e5f905e8 Always use _setDownloadIdentifier: 2015-11-23 13:04:43 -08:00
Adlai Holler
7449809743 ASMultiplexImageNode: Use ASObjectIsEqual when comparing identifiers. 2015-11-23 13:00:35 -08:00