Commit Graph

13022 Commits

Author SHA1 Message Date
Scott Goodson
b03a9b68dd [Build] Restore operational AsyncDisplayKit-Prefix.pch
This was regressed by the large project file changes in 404795dc02

I don't yet have full context on the goals of that change, but it's definitely necessary to have the .pch
with the current requirements of the project. This line ensures that Cocoapods adds it.
2017-02-04 16:38:55 -08:00
Abdurahim Jauzee
552b8c2c52 imported Lottie header from PublicClasses to framework header file
Without this import Swift-based projects won't see any public classes
from `Lottie` if it was installed with `Carthage`
2017-02-04 21:58:51 +03:00
EddieFu
390a71ce32 Fix a typo for selector 2017-02-04 13:47:58 -05:00
Brandon Withrow
40067e6b47 Merge pull request #24 from ianegordon/master
Initialize control point to CGPointZero
2017-02-04 08:46:52 -08:00
Brandon Withrow
cd8149bcb9 Merge pull request #27 from flappyFeline/master
fix crash in AnimatedTextField
2017-02-04 08:46:06 -08:00
flappyFeline
9b9d67e1a9 fix crash when typing and deleting on TypingDemoViewController.(beyond array) 2017-02-04 11:28:27 +08:00
flappyFeline
fb64cc93d9 edit podfile by Xcode to avoid issues in the future. 2017-02-04 10:30:02 +08:00
Michael Schneider
12e4e5b048 [Layout] Improve Layout System Abstraction (#2941)
* Improve Layout Abstraction

* Address naming comments

- Rename ASPrimitiveTraitEnvironment to ASTraitEnvironment
- Rename ASPrimitiveTraitCollectionPropagateDown to ASTraitCollectionPropagateDown
- Rename progagateNewPrimitiveTraitCollection: to propagateNewTraitCollection:
2017-02-03 13:04:20 -08:00
Ian Gordon
2728af2950 Initialize control point to CGPointZero 2017-02-03 14:16:22 -05:00
Adlai Holler
a2ff2b9900 Force ASPagerNode pages to be bounds-sized (#2973) 2017-02-03 10:29:15 -08:00
Brandon Withrow
fd6e34f4ba Merge pull request #19 from asowers1/Carthage-README
Carthage instructions in README
2017-02-03 07:58:06 -08:00
Brandon Withrow
20c2faca29 Merge pull request #20 from SoXeon/master
fix crash in Demo for Animated Keyboard
2017-02-03 07:57:17 -08:00
dazi.dp
cef8eb10d7 fix crash in Demo for Animated Keyboard
fix crash in Demo for Animated Keyboard
2017-02-03 14:26:54 +08:00
Andrew Sowers
d8068c3756 Carthage instructions in README 2017-02-02 22:31:40 -05:00
Brandon Withrow
a2a62cc154 Merge pull request #11 from hansemannn/resolve-warnings
Fix all project warnings, specify nullability
2017-02-02 15:52:14 -08:00
Brandon Withrow
2ca94d6d3c Merge pull request #18 from airbnb/btw/3drotationcrash
Fix crash for 3d rotation values
2017-02-02 14:54:55 -08:00
Brandon Withrow
6b365d7227 Fix crash for 3d rotation values 2017-02-02 14:50:57 -08:00
Adlai Holler
bf2363cb8f [ASDKgram] Perform batch-fetching updates on main (#2972) 2017-02-02 14:03:40 -08:00
Michael Schneider
d42dcfefc1 [ASNodeController] Move ASNodeController to beta header (#2966)
* Move ASNodeController to beta header

* Make it public

* Change ASNodeController+Beta to .mm
2017-02-02 12:51:33 -08:00
Brandon Withrow
69094298e2 Merge pull request #12 from federicocappelli/patch-2
Update README.md
2017-02-02 11:42:50 -08:00
Grishka
2027dabd60 Initial public release 2017-02-02 19:24:40 +03:00
Peter
c8055aa8cd Merge branch 'tmp' 2017-02-02 18:59:42 +03:00
Peter
c8ec89bae0 no message 2017-02-02 18:59:18 +03:00
Peter
746821b41a Merge branch 'master' into HEAD 2017-02-02 18:58:17 +03:00
Peter
dbba320020 no message 2017-02-02 18:58:11 +03:00
Federico Cappelli
a8df13ac02 Update README.md
- "Install Lottie" section added to the readme, I've failed initially trying to add pod 'lottie' to my podfile 
- Swift bridge header import instructions removed, not necessaire using cocoapod (just tested)
2017-02-02 13:30:04 +00:00
Hans Knöchel
5159b2ce38 Fix all project warnings, specify nullability 2017-02-02 13:19:26 +01:00
Peter
15c9274a8e no message 2017-02-02 11:47:45 +03:00
Peter
e1195986b9 no message 2017-02-02 11:47:26 +03:00
Peter
e7b34f5811 Merge commit '404795dc02aa57b167223bfaee7c380907022ca1'
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit/ASCellNode+Internal.h
#	AsyncDisplayKit/ASCellNode.mm
#	AsyncDisplayKit/ASCollectionNode+Beta.h
#	AsyncDisplayKit/ASCollectionNode.mm
#	AsyncDisplayKit/ASCollectionView.mm
#	AsyncDisplayKit/ASCollectionViewProtocols.h
#	AsyncDisplayKit/ASDisplayNode.mm
#	AsyncDisplayKit/ASMultiplexImageNode.h
#	AsyncDisplayKit/ASMultiplexImageNode.mm
#	AsyncDisplayKit/ASNavigationController.m
#	AsyncDisplayKit/ASNetworkImageNode.mm
#	AsyncDisplayKit/ASPagerFlowLayout.m
#	AsyncDisplayKit/ASPagerNode.m
#	AsyncDisplayKit/ASTabBarController.m
#	AsyncDisplayKit/ASTableNode.h
#	AsyncDisplayKit/ASTableNode.mm
#	AsyncDisplayKit/ASTableView.mm
#	AsyncDisplayKit/ASTableViewProtocols.h
#	AsyncDisplayKit/ASVideoNode.h
#	AsyncDisplayKit/ASVideoNode.mm
#	AsyncDisplayKit/ASVideoPlayerNode.mm
#	AsyncDisplayKit/ASViewController.mm
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m
#	AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m
#	AsyncDisplayKit/Details/ASBasicImageDownloader.mm
#	AsyncDisplayKit/Details/ASBatchContext.mm
#	AsyncDisplayKit/Details/ASChangeSetDataController.h
#	AsyncDisplayKit/Details/ASChangeSetDataController.mm
#	AsyncDisplayKit/Details/ASCollectionDataController.mm
#	AsyncDisplayKit/Details/ASCollectionViewLayoutController.mm
#	AsyncDisplayKit/Details/ASCollectionViewLayoutInspector.m
#	AsyncDisplayKit/Details/ASDataController.mm
#	AsyncDisplayKit/Details/ASFlowLayoutController.h
#	AsyncDisplayKit/Details/ASFlowLayoutController.mm
#	AsyncDisplayKit/Details/ASIndexedNodeContext.mm
#	AsyncDisplayKit/Details/ASPhotosFrameworkImageRequest.h
#	AsyncDisplayKit/Details/ASPhotosFrameworkImageRequest.m
#	AsyncDisplayKit/Details/ASRangeController.mm
#	AsyncDisplayKit/Details/ASRangeControllerUpdateRangeProtocol+Beta.h
#	AsyncDisplayKit/Details/ASSectionContext.h
#	AsyncDisplayKit/Private/ASBatchFetching.m
#	AsyncDisplayKit/Private/ASCollectionView+Undeprecated.h
#	AsyncDisplayKit/Private/ASCollectionViewFlowLayoutInspector.h
#	AsyncDisplayKit/Private/ASCollectionViewFlowLayoutInspector.m
#	AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm
#	AsyncDisplayKit/Private/_ASPendingState.mm
#	examples/SocialAppLayout-Inverted/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme
2017-02-02 11:46:47 +03:00
Alex Pawlowski
2a3a574b28 Merge remote-tracking branch 'upstream/master' 2017-02-02 03:47:49 +02:00
Alex Pawlowski
059517d351 Implemented macOS Support 2017-02-02 03:45:10 +02:00
Brandon Withrow
a241b9e57a Merge pull request #9 from natestedman/carthage
Added shared scheme for Carthage support
2017-02-01 16:01:05 -08:00
Peter
f666792f97 no message 2017-02-02 02:59:08 +03:00
Nate Stedman
9c8d7731c7 Added shared scheme for Carthage support. 2017-02-01 18:54:09 -05:00
Brandon Withrow
c4bf8d5015 Merge pull request #8 from hansemannn/patch-1
Fix README.md
2017-02-01 15:22:49 -08:00
Brandon Withrow
31cea7107c Merge pull request #7 from plummer/patch-2
Fixed Typo
2017-02-01 15:22:28 -08:00
Hans Knöchel
7e42d0c662 Fix README.md 2017-02-02 00:20:11 +01:00
plummer
53c1f5ef0b Fixed Typo 2017-02-02 09:52:14 +11:00
Adlai Holler
404795dc02 Remove Support for iOS 7 (#2930)
* Drop support for iOS 7

* Copy reference images

* Update deployment for sample projects

* Update version

* Update "Life Without Cocoapods"
2017-02-01 14:40:37 -08:00
Brandon Withrow
5635d1c5d7 Update README.md 2017-02-01 14:38:41 -08:00
Brandon Withrow
97bcd859a2 Update README.md 2017-02-01 14:02:08 -08:00
Garrett Moon
0be685982b Merge pull request #2967 from facebook/bumpTo2dot1
Bump podspec to 2.1
2017-02-01 13:42:26 -08:00
ricky
39298f6694 [ASIndexedNodeContext] Do not cache the envTraitCollection, use the delegate to request it when needed (#2963)
Caching the envTraitCollection upon creation of `ASIndexedNodeContext` can lead to it becoming out of date. Ask the `id<ASEnvironment>` object for the trait collection when we need it.
2017-02-01 13:38:52 -08:00
Garrett Moon
c396e4db68 Bump podspec to 2.1 2017-02-01 13:30:43 -08:00
Brandon Withrow
8142974183 Merge pull request #3 from jongold/patch-1
Add syntax highlighting to README
2017-02-01 11:07:09 -08:00
Jon Gold
4c9e048464 Add syntax highlighting to README 2017-02-01 10:56:45 -08:00
Brandon Withrow
950809f538 Merge pull request #1 from ReadmeCritic/patch-1
[readme] fix typo
2017-02-01 10:44:25 -08:00
Brandon Withrow
bd3196e11c Merge pull request #2 from mukeshthawani/fix-typo
Fix typo
2017-02-01 10:44:10 -08:00
Mukesh Thawani
acfee53f53 Fix typo 2017-02-01 14:50:11 +05:30