Commit Graph
5091 Commits
Author SHA1 Message Date
Erekle e30584d215 ASDefaultPlaybackButton 2016-05-14 16:41:32 +04:00
Erekle b3360a5daf Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-14 12:26:01 +04:00
appleguy 4cfe3f750a Merge pull request #1661 from maicki/MatchSubarrayContextsNodesCreation
[ASDataController] Match creation of subarrays for nodes and contexts in ASDataController
2016-05-13 23:47:41 -07:00
appleguy 50bdaa2442 Merge pull request #1658 from henish/ascollectionview_mutation_during_enumeration
[Sample] Resolve mutation during enumeration issue
2016-05-13 16:21:46 -07:00
Max Gu 9eb9336351 Merge remote-tracking branch 'upstream/master' 2016-05-13 14:42:04 -07:00
Michael Schneider eee2262262 Match creation of subarrays for nodes and contexts in ASDataController 2016-05-13 22:51:40 +02:00
Henish Shah 41a53887d7 [Sample] Resolve mutation during enumeration issue
- Mutating a dictionary using -enumerateKeysAndObjectsUsingBlock:
  can have unintended consequences.
- Using a copy of the keys to iterate over the values inside the
  dictionary instead.
2016-05-13 16:14:19 -04:00
appleguy 60b71a604c Merge pull request #1660 from maicki/FixWrongConstrainedSize
Fix passing wrong constrained size to nodes
2016-05-13 13:06:29 -07:00
Michael Schneider 33b76bbce0 Use calloc’d array for subarray of contexts 2016-05-13 21:38:25 +02:00
Michael Schneider 7d902d98c9 Fix passing wrong constrained size to nodes
In _layoutNodesFromContexts:ofKind:completion: we pass the full array of contexts to _layoutNodes:fromContexts:atIndexesOfRange:ofKind: but for nodes we pass a subarray of nodes instead based on the batchCount. As batchRange we always start from 0 to batchCount. We now use the same indexes that we use to create the subarray of nodes to get a subarray of contexts that we pass to _layoutNodes:fromContexts:atIndexesOfRange:ofKind:.
2016-05-13 21:06:16 +02:00
Henish Shah 8e38e225c8 [Sample] Resolve mutation during enumeration issue
- Mutating a dictionary using -enumerateKeysAndObjectsUsingBlock:
  can have unintended consequences.
- Using a copy of the keys to iterate over the values inside the
  dictionary instead.
2016-05-13 11:51:01 -04:00
Erekle 3e45f41710 ASVideoNode property proxy 2016-05-13 18:43:24 +04:00
appleguy 0bef0d09e7 Merge pull request #1653 from garrettmoon/visibility
[ASViewController] Add visibility depth management
2016-05-12 22:42:27 -07:00
Max Gu c8a759e3f4 Merge remote-tracking branch 'upstream/master' 2016-05-12 16:03:36 -07:00
Max Gu 88efa56097 Revert "Adding scrollViewWillBeginDragging and scrollViewDidEndDragging callbac to ASCellNode instances"
This reverts commit 1fba62da0e.
2016-05-12 16:02:38 -07:00
Max Gu 5805bdb239 Merge 2016-05-12 15:53:09 -07:00
Erekle 658d376d7b ASVideoNode public methods proxy 2016-05-13 02:14:12 +04:00
appleguy 38b07612d9 Merge pull request #1655 from rcancro/lockFix
[ASEnvironment] Remove unneeded locking on environmentState
2016-05-12 15:09:29 -07:00
Erekle db95771b33 enable/disable controls 2016-05-13 01:49:46 +04:00
Garrett Moon 72d7b57abb Don't add zero for readability 2016-05-12 14:44:54 -07:00
Garrett Moon 7901a985e3 Now that this is included by a C++ file, it needs the weird C extern thing. 2016-05-12 14:21:01 -07:00
Erekle 98c451118b removed play button
* Removed play button from ASVideoNode
* Removed play button tests
* added some checks in ASVideoPlayerNode
* added new delegate method for time formats
2016-05-13 00:46:55 +04:00
Garrett Moon 4c78fb3846 Add setVisibilityDepth setter. 2016-05-12 13:42:05 -07:00
Garrett Moon 5a9ef8a6f7 Fix build 2016-05-12 13:42:05 -07:00
Garrett Moon e296cad8ee Add support for visibility depth
Summary:
This adds support for the concept of visibility depth.

Visibility essentially defines the number of user actions it would
take a user to have a view controller visible. Knowing a view controllers
visibility depth allows view controllers to take action such as clearing
out memory that can be restored at a later date.

This patch also add two new view controller subclasses which adopt
the ASManagesChildVisibilityDepth protocol. Any view controller
that has child view controllers can adopt this protocol to indicate
to the child what they're visibility is. For example, ASNavigationController
will return a visibility depth of it's own visibilityDepth + 1 for
a view controller that would be revealed by tapping the back button.

Move common implementations to macros

Turn off visibility logging

Differential Revision: https://phabricator.pinadmin.com/D90395
2016-05-12 13:42:05 -07:00
Garrett Moon b7b8ad54fd Move common implementations to macros 2016-05-12 13:42:05 -07:00
Garrett Moon af7a2f09d7 Add support for visibility depth
This adds support for the concept of visibility depth.

Visibility essentially defines the number of user actions it would
take a user to have a view controller visible. Knowing a view controllers
visibility depth allows view controllers to take action such as clearing
out memory that can be restored at a later date.

This patch also add two new view controller subclasses which adopt
the ASManagesChildVisibilityDepth protocol. Any view controller
that has child view controllers can adopt this protocol to indicate
to the child what they're visibility is. For example, ASNavigationController
will return a visibility depth of it's own visibilityDepth + 1 for
a view controller that would be revealed by tapping the back button.
2016-05-12 13:42:05 -07:00
Garrett Moon b34e8d78de ASViewController.m -> ASViewController.mm upstream 2016-05-12 13:40:32 -07:00
rcancro 8e444092be [ASEnvironment] Remove unneeded locking on environmentState 2016-05-12 13:13:30 -07:00
Erekle ae5440ad11 updated example 2016-05-12 13:26:39 +04:00
Erekle d0345549f6 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
2016-05-12 13:05:24 +04:00
Erekle e0074524c3 new ASVideoPlayerNodeDelegate methods. comments in header 2016-05-12 12:59:32 +04:00
appleguy efc81f5a1c Merge pull request #1592 from rcancro/displayTraits
[ASViewController] Add support for ASTraitCollection
2016-05-11 21:19:55 -07:00
appleguy 9aba0fb19d Merge pull request #1652 from maicki/FixASVideoNodeSpinnerPosition
Fix position of loading spinner in ASVideoNode
2016-05-11 14:46:41 -07:00
Erekle 441f9632cd ASVideoPlayer layout delegation 2016-05-12 01:29:54 +04:00
rcancro cfa9dcda56 typo and comment 2016-05-11 14:08:06 -07:00
Erekle 58101feeee event better duration handling. time label attributes delegation 2016-05-11 23:22:17 +04:00
appleguy 94a9291b1c Merge pull request #1646 from levi/patch-14
Add Slack to Contributing file
2016-05-11 12:06:20 -07:00
appleguy 1ac3579141 Merge pull request #1647 from levi/patch-15
Add Slack to README
2016-05-11 12:06:02 -07:00
Michael Schneider 9b3ecd28a9 Fix position of loading spinner in ASVideoNode 2016-05-11 20:14:22 +02:00
Erekle 9fe57ea583 ASVideoPlayerDelegate first steps 2016-05-11 21:55:53 +04:00
Levi McCallum 11446f3bf5 Add auto inviter 2016-05-11 10:52:08 -07:00
Levi McCallum 490d51f45a Add auto inviter 2016-05-11 10:51:29 -07:00
rcancro 4b54144f55 Levi's comments 2016-05-11 10:21:11 -07:00
Erekle 975690744b Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-11 20:43:57 +04:00
Levi McCallum b84ccf00f4 Add Slack to README 2016-05-10 18:06:43 -07:00
Levi McCallum e99bbb0b1e Add Slack to Contributing file 2016-05-10 18:06:11 -07:00
appleguy 25feefeafb Merge pull request #1643 from levi/patch-14
[ASAsyncTransactionGroup] Create a new hash table on commit to prevent copy
2016-05-10 16:53:02 -07:00
appleguy 12d757a38d Merge pull request #1645 from rcancro/textCrash
Fixed a crash in ASTextNode that I made
2016-05-10 16:31:43 -07:00
rcancro ffde31a1b2 Fixed a crash in ASTextNode that I made
fixes a crash introduced by https://github.com/facebook/AsyncDisplayKit/pull/1637
2016-05-10 15:25:34 -07:00