Commit Graph

25012 Commits

Author SHA1 Message Date
Peter
6b0454ccf5 Merge commit 'ec59c3161adb37d4b5b908019250dddce1c27d84'
# Conflicts:
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.h
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m
#	AsyncDisplayKit/Details/ASFlowLayoutController.h
#	AsyncDisplayKit/Details/ASFlowLayoutController.mm
2017-02-11 17:00:16 +03:00
overtake
05ad028aa3 - some fix 2017-02-11 16:24:39 +03:00
overtake
2b777fb353 no message 2017-02-11 16:07:31 +03:00
overtake
bbc3a67881 SupportPeerId
UsernameAvailability
GroupReturn and GroupLeft
2017-02-11 16:07:00 +03:00
Michael Schneider
ec59c3161a Fix creating derived data folder in build script if it does not exist 2017-02-10 17:01:37 -08:00
Benjamin Scholtysik (Reimold)
3aa05cfd94 Merge pull request #393 from bitstadium/feature/pl-crashreporter-12
Revert to PLCrashReporter 1.2 due to namespace collisions in PLCrashR…
2017-02-10 16:45:57 -08:00
Michael Schneider
3ec9e9eee3 Improve Build Script (#3014)
* Move derived data from ~ to ~/ASDKDerivedData

* Add example mode

* Some more improvements

* Some more improvements

* Some more improvements

* Improve cleaning derived data
2017-02-10 16:43:29 -08:00
Brandon Withrow
25a43a17ff Merge pull request #76 from airbnb/btw/cartUpdate
Fixed header issue with Carthage
2017-02-10 14:28:47 -08:00
Brandon Withrow
c0f5fbf164 Fixed header issue with Carthage 2017-02-10 14:25:58 -08:00
Adlai Holler
d7ce6b9a04 CatDealsCollectionView: Use the correct method name (#3015) 2017-02-10 13:35:29 -08:00
Adlai Holler
7424b6d7f7 Update examples to use UIControlState (#3013) 2017-02-10 13:35:15 -08:00
Michael Schneider
2dca7a0c8d [Debug] Remove not used code around visualizing layout specs (#2991)
* Remove not used code around visualizing layout specs

* This is sad to see but let’s remove the LayoutSpecPlayground for now
2017-02-10 13:09:09 -08:00
Brandon Withrow
0fb9063a91 Merge pull request #74 from pappy74/patch-1
Adds a missing header.
2017-02-10 11:32:13 -08:00
Michael Schneider
77f29a8b7b Fix CI that broke due to Yoga merge (#3012)
* Fix CI that broke due to Yoga merge

* Next round

* Add clean before building

* Try something else

* Some more burritos
2017-02-10 11:17:25 -08:00
Jason Persampieri
251a671bdd Adds a missing header.
This accidentally works in some dev environments, but fails in mine (don't ask) :)
2017-02-10 10:10:39 -08:00
Benjamin Scholtysik (Reimold)
f2cb7ae681 Revert to PLCrashReporter 1.2 due to namespace collisions in PLCrashReporter 1.3 2017-02-09 18:10:13 -08:00
appleguy
f91265757e [Yoga] Initial commit for supporting Yoga-powered layout calculation. (#2982)
* [Yoga + AsyncDisplayKit] Initial commit for supporting Yoga-powered layout calculation.

Because this results in ASLayout objects, it preserve support for automaticallyManagesSubnodes
as well as the animated transition system. More work remains to vet performance of the new mode,
and it will remain in +Beta for the forseeable future.

I'm not sure that this should ever be used as the primary ASDK layout system, but it should remain an
option for some apps to experiment with if they require an implementation that more strictly mirrors
W3C standard Flexbox.

* [Yoga] Improve usage of ASHierarchyState to ensure simultaneous yoga layouts can't happen.

* [Yoga] Strictly minimize the impact of the Yoga integration on existing code.

Created new file ASDisplayNode+Yoga.mm, reduced size and number of integration points in core code.

* [Yoga] Figured out how to further reduce ASDisplayNode.mm impact by allocating _yogaNode in property accessor, and changing all accesses to use the property.
2017-02-09 16:10:29 -08:00
Adlai Holler
5c8818d107 Route setDelegate: to setAsyncDelegate: (#3007)
* Make ASTableView/ASCollectionView delegate/dataSource unavailable, route setDelegate: to setAsyncDelegate:

* Remove deprecated method from example

* Drop down from unavailable to deprecated
2017-02-09 15:20:26 -08:00
Brandon Withrow
e7e462560f Update README.md 2017-02-09 15:10:12 -08:00
Brandon Withrow
03857b2405 Update README.md 2017-02-09 15:09:38 -08:00
Adlai Holler
e338098e4f Have ASVideoNode override its superclass's designated initializer (#3009) 2017-02-09 14:59:37 -08:00
Brandon Withrow
949f8dbfe9 Update README.md 2017-02-09 14:42:36 -08:00
Brandon Withrow
0be90de065 Update lottie-ios.podspec 2017-02-09 14:22:37 -08:00
Brandon Withrow
acafade9a1 Carthage Support Bugfix 2017-02-09 14:17:13 -08:00
Brandon Withrow
e82f6d0436 Bumping podspec vesrion 2017-02-09 13:59:56 -08:00
Brandon Withrow
737c883060 Merge pull request #71 from airbnb/btw/carthage
Add Lottie-OS to carthage
2017-02-09 13:58:02 -08:00
Brandon Withrow
9d33723eef Add Lottie-OS to carthage 2017-02-09 13:57:07 -08:00
appleguy
1ec69221e3 [UIImage+ASConvenience] Reorder header and add more documentation. (#3004)
Order the methods so the most valuable one, as_imageNamed, is more immediately noticeable.
Also added a block comment describing its purpose and usage suggestions.
Separated @implementation for fairly unrelated methods by categories.
2017-02-09 13:52:36 -08:00
Brandon Withrow
2b6ba0b521 Merge pull request #70 from airbnb/btw/projectfixes
Removed Whitespaces in filenames
2017-02-09 13:40:00 -08:00
Brandon Withrow
a677cd6833 Removed Whitespaces in filenames 2017-02-09 13:28:19 -08:00
Garrett Moon
6d9f12c7e9 [ASNetworkImageNode] Assert if both URL and image are set (#2782)
* [ASNetworkImageNode] Assert if both URL and image are set

Here's one other idea for addressing this problem. Essentially,
we assert if you've set both the URL and the image. I've played around
with Pinterest and there's only one case where we hit this (the transition).

So I've also added another method (which is a bummer, it's weird I know)
but there's one good reason to add this method, ephemeralImage, which is
the user doesn't have to manually clear it out like they would if they
used defaultImage to save memory.

Putting this up for discussion.

* Fix comment

* Oh yeah, @dynamic, thanks @adlai

* Remove ephemeralImage
2017-02-09 13:23:44 -08:00
Brandon Withrow
4eb8919e71 Merge pull request #69 from AlexQuinlivan/aq/intrinsic-content-size
LOTAnimationView intrinsicContentSize
2017-02-09 13:11:10 -08:00
Adlai Holler
0bda7ee230 Repeal and replace ASControlState (#3005) 2017-02-09 13:10:10 -08:00
AlexQuinlivan
4b790058b4 Use the compositions size as the intrinsic size of the view 2017-02-10 09:43:13 +13:00
Brandon Withrow
1ca88747f4 Merge pull request #68 from airbnb/btw/trimpaths
Add support for full trim paths and offsets
2017-02-09 11:50:49 -08:00
Brandon Withrow
3f3ad99dc6 Add support for trim paths and trim offset 2017-02-09 11:47:10 -08:00
Brandon Withrow
3c970862ce Merge pull request #64 from airbnb/lmr--add-static-library-target
Add Static Library Target
2017-02-09 10:07:03 -08:00
Brandon Withrow
d8a1f17031 Merge pull request #63 from ryanstout/master
LLAnimationView rename in README.
2017-02-09 10:06:33 -08:00
Peter
c3b00d270b Merge branch 'tmp' 2017-02-09 20:49:49 +03:00
Peter
615652b8f8 no message 2017-02-09 20:49:10 +03:00
Adlai Holler
a13b36d63f Allow UICollectionViewLayout to Provide Layout Inspector, Always Update Delegate (#3003)
* Allow UICollectionViewLayout to give us a layout inspector, always call the didChangeDelegate/didChangeDataSource on binding

* Make an assertion

* Update the tests

* Tests use actual layout inspector

* Be more consistent
2017-02-08 22:03:13 -08:00
Scott Goodson
1adfb005ca [Build] Tiny fix to cast intValue to the enume type we're using it as (strict compiler settings can fail without the cast). 2017-02-08 20:30:28 -08:00
Leland Richardson
5a48cfcdeb Add Static Library Target 2017-02-08 19:13:56 -08:00
appleguy
ca8fcdfe49 [ASScrollNode] Add .scrollDirection property so that internal content sizing can be easily "unlimited" in the direction of scrolling. (#3001) 2017-02-08 16:39:05 -08:00
Ryan Stout
1454d81035 Readme class rename. Looks like the LA prefix got renamed to LOT at some point. The readme example shows LLAnimationView, but the class name is LOTAnimationView 2017-02-08 16:35:48 -07:00
Adlai Holler
ada553c5a7 Avoid Measuring Cell Nodes with Empty Size Range (#3000)
* Always avoid measuring cell nodes with empty bounds

* Be lenient

* Add required assertion comment

* Avoid importing non-modular header publicly
2017-02-08 13:58:22 -08:00
overtake
433b21a122 changes 2017-02-08 23:39:09 +03:00
Brandon Withrow
c005574450 Merge pull request #59 from airbnb/lmr--add-to-npm
Add Lottie IOS to NPM
2017-02-08 10:41:07 -08:00
Leland Richardson
326404b9e9 Add Lottie IOS to NPM 2017-02-08 09:32:48 -08:00
Rocir Santiago
b33cced1eb [ASDisplayNode] Add support for setting non-fatal error block (#2993)
* Add support for setting non-fatal error block

* Better documentation and fix typos

* Added ASDisplayNodeAssertNonFatal macro that asserts in dev and call block in prod

* Make non fatal error code equals to 1

* Add support for condition in ASDisplayNodeAssertNonFatal

* Only call non fatal block if condition isn’t satisfied
2017-02-07 17:13:33 -08:00