32 Commits

Author SHA1 Message Date
appleguy
465abb1ded [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)
* [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses)

With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.

After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.

* [License] Update all Texture source files to be pure Apache 2.

* Changelog entry for Apache 2 license update.

* Revert "[License] Update all Texture source files to be pure Apache 2."

This reverts commit ffa0fbbba9717d871dd16c4b07539f2f8208fc2b.

* [License] Update all Texture source files to be pure Apache 2, maintaining copyrights.

* [License] Update CONTRIBUTING, README, Podspec & Dangerfile.
2018-08-28 07:39:18 -07:00
Adlai Holler
7424b6d7f7 Update examples to use UIControlState (#3013) 2017-02-10 13:35:15 -08:00
David Robles
db45b5d814 Update sample video project to allow for testing video’s placeholder image isn’t prematurely cleared. 2016-11-17 10:35:47 -08:00
Michael Schneider
d6e5e27c39 [Layout] Add helper properties for setting sizes via CGSize and ASRelativeSize (#2324)
* Remove set layout style size helper

* Update API to set and get a CGSize / ASRelativeSize from an ASLayoutElementStyle

- Expose ASRelativeSize type
- Add new helper properties to set a size / relative size to ASLayoutElementStyle
- Don't expose the size in ASLayoutElementStyle anymore and move into ASLayoutElementStylePrivate

* Update examples

* Update comments for size helpers
2016-10-04 12:35:45 -04:00
Hannah Troisi
87595c7d3b [Layout API] Rename ASStaticLayoutSpec to ASAbsoluteLayoutSpec (#2288)
* Rename static to absolute

* Fix examples, rename ASAbsoluteLayoutSpec class method

* rename +staticLayoutSpecWithChildren to +absoluteLayoutSpecWithChildren

* address Michael's comments
2016-09-28 13:05:31 -04:00
Michael Schneider
416d8f92e1 [Layout] Add delegate to ASLayoutableStyle for property changes (#2283)
* Add delegate to ASLayoutableStyle for property changes

* Moving ASLayoutableStyle delegate to readonly

* Add ASLayoutableStyleTests

* Fix property stirngs

* Fix video example

* Address comments of Adlai
2016-09-27 16:50:36 -04:00
appleguy
fc09badf94 Update build script to run against iOS 10 to fix Jenkins (#2305)
* Update build script to run against iOS 10 to fix Jenkins

* Update Swift example project with iOS 10 build fixes.

* Fix Videos example app to use new style API for layout properties.

* Update Frameworks smoke test to newer Swift language settings.
2016-09-26 18:46:22 -07:00
Michael Schneider
8897614f0e [Layout] Layout API based on content area (#2110)
* Initial commit for adding a size constraint to ASLayoutable's

* Some more commits

* Fix sample projects in extra/

* Remove preferredFrameSize test of ASEditableTextNode

* Remove preferredFrameSize from examples_extra

* Add deprecation warning to -[ASDisplayNode preferredFrameSize]

* Add deprecation warning to -[ASDisplayNode measureWithSizeRange:]

* Commit

* Commit

* Remove ASRelativeSizeRange

* Make ASRelativeSize private

* Adjust examples

* Improve setting of -[ASLayoutable size] with points or fractions

* Add ASWrapperLayoutSpec

* Improve creation of ASRelativeDimension

* Add `preferredFrameSize` back and add deprecated logging

* Add `layoutSpecBlock` setter and getter and add locking for it

* Add better documentation and fix macros to create ASRelativeDimension

* Create new ASSizeRangeMake with just a CGSize as parameter

* Update Kitten and Social App Layout example

* Add layoutThatFits: and deprecate measure:

* Rename ASRelativeDimension to ASDimension

* Fix examples for ASDimension renaming

* Remove fancy height and width setter

* Fix ASDimension helper

* Rename -[ASLayout layoutableObject] to -[ASLayout layoutable]

* Update layout related methods and more clearer documentation around how to use it

* Deprecate old ASLayout class constructors

* Don't unnecessary recalculate layout if constrained or parent size did not change

* Use shared pointer for ASDisplayNodeLayout

* Fix rebase conflicts

* Add documentation and move implementation in mm file of ASDisplayNodeLayout

* Fix test errors

* Rename ASSize to ASLayoutableSize

* Address comments

* Rename setSizeFromCGSize to setSizeWithCGSize

* Improve inline functions in ASDimension

* Fix rebase conflicts
2016-09-07 08:44:48 -07:00
Michael Schneider
359785ac92 [ASDisplayNode] Add automatic measurement before layout (#1725)
* Add automatic measurement before layout

* Remove code not needed or addressed in a different PR

* Adjust comments and rename __layoutSublayouts to __layoutSubnodes

* Check before setting up a placeholder layer if the node should have a placeholder
2016-07-14 21:51:40 -07: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
Levi McCallum
20523821f9 Revert "Merge pull request #1673 from maicki/AddAutomaticMeasureBeforeLayout"
This reverts commit 2e384a32e15d34ea8f963dbc4e44aaa297ca019b, reversing
changes made to b8618d3151d9714d24ccfd935b92a99b774442f1.
2016-06-06 13:12:10 -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
Erekle
49b2726632 fixed old examples 2016-05-20 12:21:57 +04: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
82cc6f49f2 coding style fixes 2016-05-05 01:49:52 +04: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
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
a95300e145 Merged master into AVPlayerItem-construction 2016-03-14 13:21:42 +00:00
Michael Schneider
9291372c7f Show status bar in examples 2016-03-02 06:53:55 -08:00
Gareth Reese
6318db45c8 Updated the Videos sample app to cover the API changes 2016-03-01 13:06:29 +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
83f9be256b fixed drawing for default play button 2016-01-28 01:35:08 -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
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