Commit Graph
462 Commits
Author SHA1 Message Date
Hannah Trosi 2317e17c53 Remove UIKit call from -init!1 2016-07-10 21:17:32 -07:00
Kiel Gillard 762e9832df Make ASViewController sample build and run. 2016-07-07 15:41:21 +10:00
Gareth Reese 9349abb737 Merge branch 'master' of https://github.com/facebook/AsyncDisplayKit into ASVideoNode-overwrittenplaceholder 2016-06-24 11:39:12 +01:00
Hannah Troisi d850057916 [Travis CI] move carthageBuildTest to examples_extra to avoid Travis error 2016-06-23 16:25:48 -07:00
Hannah Troisi 54e29d2236 [Carthage] fix travis build error (#1804)
* [Carthage] Add cartfile, update example

* [Carthage] fix travis build issue

* [Carthage] fix cartfile for travis build error

* capitalization fix
2016-06-22 23:22:42 -07:00
Hannah Troisi eb9e8167c3 [Carthage] Add cartfile, update Carthage example (#1796) 2016-06-22 15:37:31 -07:00
George A 83d610cd54 [ASMapNode] Toggle user interaction when liveMap changes (#1753)
[ASMapNode] Change map snapshot when updating it with a new region (#1754)
[ASMapNode] Commented out code that is causing inaccurate behavior
[ASMapNode] Added the ability to zoom in and show annotations, similar to showAnnotations:animated: of MKMapView.
Added a basic example for ASMapNode to try out the different changes
2016-06-21 16:13:55 +02:00
Gareth Reese 062bcf3631 [ASVideoNode] issue #1782 Placeholder images are replaced by a blank placeholder. Now checks the .URL property of the parent class as well as the .image to ensure that new placeholders aren't generated. 2016-06-21 07:51:58 +01:00
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
Michael Schneider 1f55ef8945 Improve PagerNode sample project 2016-06-09 15:46:08 -07:00
Levi McCallum 20523821f9 Revert "Merge pull request #1673 from maicki/AddAutomaticMeasureBeforeLayout"
This reverts commit 2e384a32e1, reversing
changes made to b8618d3151.
2016-06-06 13:12:10 -07:00
Levi McCallum c809609b01 Update pager example 2016-06-05 09:30:57 -07:00
Levi McCallum a0ebfb685a Fix example 2016-06-05 09:30:57 -07:00
Michael Schneider 691749d098 Address comments 2016-06-03 14:18:49 -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 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
Erekle 4ab0f1ec60 [ASVideoPlayerNode] fixes; Ability to add custom controls 2016-05-23 23:23:33 +04:00
Erekle 03f193c58b Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-22 13:49:36 +04:00
Erekle 49b2726632 fixed old examples 2016-05-20 12:21:57 +04:00
Jonas Schmid 94b88ad1ab Removed DevelopmentTeam setting in sample (#1682) 2016-05-19 13:20:37 -07:00
Erekle 100d2b4f26 moved spinner to ASVIdeoPlayerNode 2016-05-19 15:07:39 +04:00
Erekle 39e287f0d6 fixes suggested by levi 2016-05-18 00:45:40 +04:00
Erekle d9b84db614 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-17 23:34:20 +04:00
Erekle 8c8fc3dba0 Adding ASVideoPlayerNode 2016-05-17 11:08:53 -07:00
Scott Goodson d26b489529 [Examples] Move several simpler, single-purpose examples to extras to ensure Travis does not time out. 2016-05-17 10:52:43 -07:00
Erekle db95771b33 enable/disable controls 2016-05-13 01:49:46 +04: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
Erekle 441f9632cd ASVideoPlayer layout delegation 2016-05-12 01:29:54 +04:00
Erekle 58101feeee event better duration handling. time label attributes delegation 2016-05-11 23:22:17 +04:00
Erekle 9fe57ea583 ASVideoPlayerDelegate first steps 2016-05-11 21:55:53 +04: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
rcancro 92ed02fc60 fix indentation 2016-05-10 14:45:21 -07:00
rcancro 9d622c7eac changed DisplayTraits to TraitCollection 2016-05-10 14:45:03 -07:00
rcancro 223a5f04b1 fix build errors 2016-05-10 14:44:53 -07:00
rcancro f828d079fa added nsobject based ASDisplayTraits class 2016-05-10 14:44:43 -07:00
rcancro b4a6f87ca6 addressed some comments 2016-05-10 14:44:32 -07:00
rcancro 8bb4eba080 Initial attempt at implementing Display Traits
Initial attempt to get display traits working with ASEnvironment.

To get proper ASDisplayTraits support, you must use an ASViewController. The ASViewController implements UITraitCollection-related methods (`traitCollectionDidChange:`, `willTransitionToTraitCollection:withTransitionCoordinator:`, viewWillTransitionToSize:withTransitionCoordinator`) to update the internal ASDisplayTraits and propagate them to subnodes.

ASTableNode and ASCollectionNode don't actually have their cells as subnodes, so a little bit of trickery is involved (on `setEnvironment:` the table/collection node gets its data controllers completedNodes and propagates the new traits. see `ASDisplayTraitsCollectionTableSetEnvironmentState`). The data controller also passes the current display traits when creating new cells.

ASViewController also supports the ability to return a custom set of display traits. So if you have a modal dialog that should always be told it is in a compact size class, you can set the override block before displaying the VC.

A new example, called Display Traits, has been added. It shows how display traits can be used in a ASViewController with a normal ASDisplayNode as its root, as well as in ASViewControllers hosting table nodes and collection nodes. There is also an example of overriding the default display traits of a VC.

Please provide feedback!
2016-05-10 14:44:22 -07:00
Michael Schneider cac4ed5626 Move layout of ASVideoNode to layout specs
- This should fix adjusting a custom play button position
- Fix sample project use of ASVideoNode
2016-05-05 16:49:01 -07:00
Erekle e87fd7a998 first steps 2016-05-06 02:42:17 +04:00
appleguy 3ee6c88ae4 Merge pull request #1608 from Eke/master
[ASVideoNode] Several new delegate methods and ASVideoNodePlayerState to monitor and control playback
2016-05-04 20:33:23 -07:00
Erekle 82cc6f49f2 coding style fixes 2016-05-05 01:49:52 +04:00
Scott Goodson f505c17efe [Build / Cocoapods] Presumably-final fix to AnimatedGIF project configuration. 2016-05-03 21:06:14 -07:00
Scott Goodson 7acdf6ab37 [Build / Cocoapods] Fix AnimatedGIF Podfile to use Sample as the target name, which is the correct one. 2016-05-03 20:42:15 -07:00
Michael Schneider 23f0ded2bc Fix AnimatedGIF example Podfile 2016-05-03 20:38:11 -07:00
Erekle 2c2a73dc83 playbackBufferEmpty and spinner
added playbackBufferEmpty logic, moved spinner show/hide to separate
methods.
2016-04-29 20:49:14 +04:00
Erekle 399703dbb2 new delegate methods
Added new delegate methods; updated Videos example project
2016-04-29 12:59:15 +04:00
Michael Schneider 35de3051a7 Enable sharing for Sample target 2016-04-27 15:52:14 -07:00