34 Commits

Author SHA1 Message Date
Hannah Troisi
c857e809f4 Clean up header comments (for consistent Facebook licensing info) (#1741)
[Licensing] Clean up header comments (for consistent Facebook licensing info)
2016-06-11 23:31:39 -07:00
Eric Jensen
5cc25686ff Correct documentation comment 2016-06-08 12:37:46 -07:00
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
Erekle
3d5385dad3 replaced deprecated methods 2016-05-19 13:40:09 +04:00
Erekle
053b14992c Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.h
#	AsyncDisplayKit/ASVideoNode.mm
2016-05-19 11:57:16 +04:00
Max Gu
90877847c2 Adding deprecated methods back 2016-05-18 14:05:08 -07:00
Max Gu
a93bc72e25 Updating and adding a few APIs for ASVideoNode 2016-05-18 08:40:58 -07:00
Max Gu
325e37020c Adding startup loading state in ASVideoNode 2016-05-17 15:31:30 -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
Erekle
e0074524c3 new ASVideoPlayerNodeDelegate methods. comments in header 2016-05-12 12:59:32 +04:00
Erekle
52b40f8004 ASVideoPlayerNodeControlType and fixes
* changed static string to ASVideoPlayerNodeControlType
* public property for duration
* public method for seek
* new _controlFlexGrowSpacerSpec; used to use flexible space in
controlbar. for example if user does not want to have scrubber, he can
replace it with flexible spacer and duration text node will be kept at
the right edge.
2016-05-10 23:57:47 +04:00
Erekle
716082d411 better duration handling. new ASVideoNode states 2016-05-10 22:48:32 +04:00
Erekle
c46547ac5f prototype
Added duration detection in ASVideoNode.
2016-05-06 21:41:54 +04:00
Erekle
34e6238391 _delegateFlags
added _delegateFlags like in ASCollectionView
2016-05-01 17:11:40 +04:00
Erekle
399703dbb2 new delegate methods
Added new delegate methods; updated Videos example project
2016-04-29 12:59:15 +04:00
Aaron Schubert
06d4573b14 [tvOS] Branch out tvOS specific code into it's own categories 2016-04-21 08:59:14 +01:00
Aaron Schubert
21abe8f899 Fix merge conflicts 2016-04-19 09:02:07 +01:00
Eric Jensen
651a6bb3e4 Add nullability annotations and documentation comments to ASVideoNode 2016-04-18 13:53:43 -07:00
Scott Goodson
11744b7f31 [ASVideoNode] Cleanup from recent diffs, standardizing on .asset rather than .url. 2016-04-17 20:12:37 -07:00
Gareth Reese
9e28e07925 ASVideoNode updates based on review comments in https://github.com/facebook/AsyncDisplayKit/pull/1323 2016-04-07 14:08:45 +01:00
Gareth Reese
c8a414be9b Merged branch 'master' into AVPlayerItem-construction 2016-04-06 15:22:10 +01:00
Hannah Troisi
f9a92366d3 [AsyncDisplayKit] Fix build so we can weak link AVFoundation
Unclear why the framework target required these seemingly unrelated changes to Collection
classes, but I modeled them after related files and it seems cleaner now (passes tests & framework target)
2016-03-19 17:54:02 -07:00
Gareth Reese
f9c8c043a1 First working version for HLS streams 2016-03-01 12:08:09 +00:00
Aaron Schubert
106b5f5d4a Update 2016-02-23 10:20:06 +00:00
Scott Goodson
0cf972d7ac [ASVideoNode] Remove beta warning in preparation for 1.9.7 launch. 2016-02-17 22:28:12 -08:00
Aaron Schubert
2588721cf0 Gate ASVideoNode for the time being 2016-02-05 14:37:51 +00:00
Luke Parham
2d1499ab4f added muting property and delegate callback to override video tapping 2016-01-29 09:27:48 -08:00
Luke Parham
3b38559c4d added ASDefaultPlayButton, but need to make drawing dynamic so its always a centered circle, also fixed video player preview layer stuff 2016-01-28 01:09:01 -08:00
Scott Goodson
2c5db2e335 Podfile bump to 1.9.6; minor preparations for release. 2016-01-23 13:05:27 -08:00
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
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
4602e4e9eb wip fixing pr comments 2015-12-22 02:15:25 -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
b5c1076921 wip, adding play button functionality 2015-12-16 23:02:39 -06:00