Commit Graph

2936 Commits

Author SHA1 Message Date
Hannah Troisi
52d58992da [ASVideoNode] Change superclass to ASNetworkImageNode so that it can be its own placeholder (#1710)
* [ASVideoNode] Change superclass to ASNetworkImageNode so that ASVideoNode can be its own placeholder
- remove _placeholderImageNode property of ASVideoNode (use self.image now instead)
- move layoutSpecThatFits: code to calculateSizeThatFits: & layout: methods as ASImageNode uses calculateSizeThatFits:

* [ASVideoNode] Tweaks to the definition of the delegate protocols to integrate with ASNetworkImageNode (superclass)
2016-06-05 18:18:52 -07:00
appleguy
4804f429b9 Revert "[ASCollectionView] Add a "Null Object" for a layout inspector if custom layout is given but no layout inspector" (#1713) 2016-06-04 22:49:10 -07:00
Scott Goodson
5289b1e11e [ASCellNode] Restore new enum values that should have been part of the last commit, but were lost by rebasing. 2016-06-04 22:21:00 -07:00
appleguy
87575b78ee [ASCellNode] Adding support for scroll view begin / end drag to VisibilityEvent changes. 2016-06-04 22:14:08 -07:00
Scott Goodson
783011bc0e [ASVideoNode] Added a couple comments for clarity and to identify future improvement areas. 2016-06-04 21:38:05 -07:00
appleguy
8801b61707 Merge pull request #1438 from Adlai-Holler/AvoidMutatingSublayersAgain
[ASDisplayNode] Copy Sublayers in recursivelyTriggerDisplayForLayer to Avoid NSFastEnumerationMutation Exception
2016-06-04 21:36:05 -07:00
appleguy
c9b448bc95 Merge pull request #1674 from maicki/RefactorASCollectionViewLayoutInspectingUsage
[ASCollectionView] Add a "Null Object" for a layout inspector if custom layout is given but no layout inspector
2016-06-04 21:30:48 -07:00
appleguy
6069d30d84 Merge pull request #1711 from maicki/DisableDisplayLayerTest
Disable _ASDisplayLayer transaction test due to occasional failures on build server hardware
2016-06-04 21:27:11 -07:00
Michael Schneider
750d57d964 Disable _ASDisplayLayer test 2016-06-04 20:05:41 -07:00
appleguy
e01a9b3918 Merge pull request #1707 from maicki/FixPlaceholderNotAppearing
[ASDisplayNode] Fix placeholder image is not appearing if size of node changed after initial placement
2016-06-04 16:48:24 -07:00
Michael Schneider
76dbc1f5e6 Fix typo 2016-06-04 16:19:14 -07:00
appleguy
735a8d5088 Merge pull request #1709 from maicki/TextKitTruncationFixFollowUp
Change visibleSizeRange to return a range with 0 location and length
2016-06-04 15:44:57 -07:00
Michael Schneider
a914e3c428 Change visibleSizeRange to return a range with 0 location and length 2016-06-04 15:40:07 -07:00
Michael Schneider
4f493c4ad3 Fix placeholder image is not appearing if size of node changed after initial placement 2016-06-04 15:04:52 -07:00
appleguy
e3801cf581 Merge pull request #1667 from maicki/SmallASDataControllerImprovements
[ASDataController] Small improvements
2016-06-04 14:16:43 -07:00
Michael Schneider
00d9372ee4 Add a "Null Object" for a layout inspector if no no flow layout is given
The purpose of the ASCollectionViewCustomLayoutInspector is to provide a default implementation if given a custom layout, but no layout inspector.
2016-06-04 13:58:23 -07:00
Michael Schneider
6945555d60 Sort in ascending order before removing nodes and restore FIXME 2016-06-04 13:56:10 -07:00
Michael Schneider
6566b7adb7 Use asdk_inverseCompare: to reverse sort the array of index path's to delete 2016-06-04 13:56:10 -07:00
Michael Schneider
3e4b5e9e82 Sort index paths or rows in descendant order for deletion 2016-06-04 13:56:10 -07:00
Michael Schneider
45ff5634fe Use NSFastEnumeration for enumerating though eyes of completedNodes 2016-06-04 13:56:10 -07:00
Michael Schneider
f72261bd10 Remove comment and use sorted array for reloading data 2016-06-04 13:56:10 -07:00
appleguy
50ca58f7e0 Merge pull request #1706 from maicki/FixASTextKitRendererCrashIfNoVisibleRange
[ASTextKitRenderer] Fix crash truncating a string of an ASTextNode with a zero size
2016-06-04 00:55:45 -07:00
appleguy
2e384a32e1 Merge pull request #1673 from maicki/AddAutomaticMeasureBeforeLayout
[ASDisplayNode] Add automatic measure before layout
2016-06-04 00:36:18 -07:00
appleguy
b8618d3151 Merge pull request #1705 from maicki/FixBuildScriptXcprettyFormatter
[Build] Skip using xcpretty-travis-formatter if it is not installed
2016-06-03 22:21:56 -07:00
appleguy
e5eed560e1 Merge pull request #1693 from rcancro/traitUpdate
[ASTraitCollection] Bug fixing/LayoutSpec propagation
2016-06-03 22:01:13 -07:00
appleguy
2bb3e00340 Merge pull request #1708 from hannahmbanana/Initialize
[ASDisplayNode] Add assertion to +initialize warning developers who override and do not call super.
2016-06-03 21:12:23 -07:00
Hannah Troisi
c9ac554889 [ASDisplayNode] Add assertion to +initialize warning developers who override and do not call super.
If a developer makes this error, it would prevent calls to key lifecycle methods, such as -layoutSpecThatFits:.
Although the superclasses of ASDisplayNode do not implement +initialize, a super call is added here for consistency.
2016-06-03 20:18:12 -07:00
Hannah Troisi
44c860bfe2 Merge remote-tracking branch 'facebook/master' 2016-06-03 19:42:50 -07:00
Michael Schneider
691749d098 Address comments 2016-06-03 14:18:49 -07:00
ricky
13a35c5f2f more comments
* allow nil for setChild/children
* moved examples out of examples/
2016-06-03 13:59:59 -07:00
Michael Schneider
ecd7727ceb Update Videos example to leverage automatic measure: call before layout 2016-06-03 13:24:47 -07:00
Michael Schneider
b4d490848f Add measure: call for nodes without host on themselves if developer does not
Normally measure will be called before layout occurs. If this doesn't happen, nothing is going to call it at all.  An experimenting developer probably added a node to the hierarchy directly. We simply call measureWithSizeRange: using a size range equal to whatever bounds were provided to that element. This make initial experimentation using layoutSpecs much easier. Furthermore added logging if no size is given for the node before layout occurs.
2016-06-03 13:24:47 -07:00
ricky
01dbc86778 First pass of comments
* make variable naming reflect ASEnvironmentTraitCollection vs ASTraitCollection
* move trait propagation to cell allocation instead of via a nested block
* move trait propagation when setting a displaynode's supernode instead of when adding a subnode
* fixed misspelling of "colection"
2016-06-03 09:59:24 -07:00
Michael Schneider
19bb6519ed Fix crash truncating a string of a node with a zero size
The crash happens in the placeholderImage of ASTextNode. The node is not visible in the time it try to get the `placeholderImage` and so the `visibleRange` has count 0 and a crash happens while accessing the first object of an empty array.
2016-06-03 09:53:59 -07:00
Michael Schneider
0d925c7a82 Fix build script error if running locally and xcpretty-travis-formatter is not installed 2016-06-03 09:24:35 -07:00
ricky
501fed16aa nil out displayContext when we get a new one
Summary: Don't set the new one in the subnodes yet as this will cause ASEnvironmentTraitCollectionIsEqualToASEnvironmentTraitCollection to return NO if only the displayContext changed.

Reviewers: garrett, levi, rmalik

Reviewed By: garrett, levi, rmalik

Subscribers: rmalik

Differential Revision: https://phabricator.pinadmin.com/D94320
2016-06-02 10:33:32 -07:00
appleguy
86deec4033 Merge pull request #1665 from hannahmbanana/master
[AsyncDisplayKit+Debug.h] Move hitTestDebug code out of ASControlNode and into debug file
2016-06-01 11:15:44 +07:00
appleguy
2358c54d7f Merge pull request #1700 from 1nput0utput/ASPINRemoteImageDownloaderChanllengeBlock
[ASPINRemoteImageDownloader] Allows setting authentication challenge …
2016-06-01 11:14:01 +07:00
appleguy
8508d1d63f Merge pull request #1702 from maicki/FixSocialAppPostNodeDivider
[Example] Fix disappearing of social app example divider
2016-06-01 11:13:24 +07:00
appleguy
34815f2447 Merge pull request #1704 from maicki/FixASEditableTextNodeMeasurement
[ASEditableTextNode] Fix measurement of ASEditableTextNode
2016-06-01 11:10:47 +07:00
Michael Schneider
e84f9f27c2 Fix measurement of ASEditableTextNode
- Add ability to measure the ASEditableTextNode based on the content now by calling measure:
- ASEditableTextNode considers preferredFrameSize now
- Fix crash if ASEditableTextNode is included in a horizontal stack
- Add tests for ASEditableTextNode
2016-05-31 16:29:40 -07:00
ricky
b66b519bd6 assert that child is not nil
Summary:

Test Plan:

Reviewers:

Subscribers:

JIRA Issue(s):

Service(s):
2016-05-31 10:29:46 -07:00
Rajinder Ramgarhia
1b7d68f63f [ASPINRemoteImageDownloader] Allows setting authentication challenge block 2016-05-31 10:06:54 -04:00
Michael Schneider
521786cf64 Fix disappearing of social app example divider
UITableViewCell traverses through all its descendant views and adjusts their background color accordingly either to [UIColor clearColor], although potentially it could use the same color as the selection highlight itself. After selection, the same trick is performed again in reverse, putting all the backgrounds back as they used to be. But in our case, we don't want to have the background color disappearing so we reset it after highlighting or selection is done.
2016-05-30 15:02:59 -07:00
appleguy
89f4653cc9 Merge pull request #1696 from maicki/FixImageNodeOpaqueBackground
[ASImageNode] Fix image sometimes appearing with black background or completely disappearing in ASImageNode
2016-05-28 22:56:16 +07:00
appleguy
a7c1ecb858 Merge pull request #1671 from Eke/ASVideoPlayerNode
ASVideoPlayerNode initial version
2016-05-28 14:24:33 +07:00
rcancro
cf2d9aef5c fix crash when setting layoutSpec's child to nil 2016-05-26 15:44:21 -07:00
Michael Schneider
73ce8c148a Add comment for setting the backgroundColor in ASImageNode 2016-05-26 10:01:12 -07:00
Erekle
4f40f3c12f Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
2016-05-26 12:15:23 +04:00
ricky
096f20c8d5 update sample app 2016-05-25 13:34:43 -07:00