Commit Graph

13022 Commits

Author SHA1 Message Date
Luke Parham
a75871055f added video sample app with tableview and simple one with 3 video examples 2015-12-18 02:22:33 -06:00
appleguy
ca11efb187 Merge pull request #951 from facebook/ASTextNodeRendererInvalidationEfficiency
[ASTextNode] Renderer should not be invalidated if bounds size matches calculatedSize, even if it doesn't match constrainedSize.
2015-12-17 22:27:52 -08:00
Scott Goodson
1872ac07aa [ASTextNode] Renderer should not be invalidated if bounds size matches calculatedSize, even if it doesn't match constrainedSize. 2015-12-17 22:12:29 -08:00
appleguy
ed1c71d588 Merge pull request #924 from aaronschubert0/ASMapNode
Improve ASMapNode to get ready for 2.0
2015-12-17 19:34:50 -08:00
appleguy
3b5fb17f81 Merge pull request #942 from bsmith11/ASTextKitCoreTextAttributesBug
ASTextKit CoreText attributes cleansing should not remove NSParagraphStyle attributes
2015-12-17 19:18:43 -08:00
appleguy
d56a53d9aa Merge pull request #941 from samhsiung/fix_truncation
Fix ASTextNode truncated size calculation ignoring attributes in the last line, by syncing the truncationString's attributes with the primary attributedString.
2015-12-17 18:17:48 -08:00
appleguy
bc6e5fee1a Merge pull request #949 from rcancro/roundMin
Do not round when resolving relative dimensions
2015-12-17 15:34:12 -08:00
rcancro
c6f4aff4ef Do not round when resolving relative dimensions
When laying out a node I got to a point where the constrained width was min 132.22222pts and max width was 100%. When resolving the relative size to pts it rounded to 132pt. This caused an assert in ASSizeRangeMake because the min width (132.222pt) was bigger than the max width (132pt)
2015-12-17 15:20:40 -08:00
Luke Parham
6cbc51dc61 cleaned up comments 2015-12-16 23:44:17 -06:00
Luke Parham
b5c1076921 wip, adding play button functionality 2015-12-16 23:02:39 -06:00
Levi McCallum
669fd38dd4 Fix project includes for ASPagerNode 2015-12-16 17:53:21 -08:00
Levi McCallum
1b5ac3615e Add ASPagerNode to framework header 2015-12-16 17:53:21 -08:00
Levi McCallum
473085db47 Move position of ASPagerNodeDataSource to support Travis builds 2015-12-16 17:53:21 -08:00
Levi McCallum
aea5a3318e Implement simple horizontal paging node 2015-12-16 17:53:21 -08:00
appleguy
8349be288b Merge pull request #945 from rcancro/aslayoutPixelBounds
Enforce pixels bounds for ASLayout size/position, while also protecting against underspecified layouts setting NaN or Inf on CALayer.
2015-12-16 17:40:50 -08:00
appleguy
3d48637974 Merge pull request #946 from facebook/ASTextNodeLongPress
ASTextNode shouldn't create a long press gesture recognizer unless the delegate cares about the callback.
2015-12-16 17:38:26 -08:00
Scott Goodson
f44c829564 ASTextNode shouldn't create a long press gesture recognizer unless the delegate cares about the callback. 2015-12-16 17:20:08 -08:00
rcancro
2e6e81e66b Don't allow unitialized or under constrained layouts cause a crash.
Should I move the pixel bounds rounding to here instead of leaving it in ASLayout?
2015-12-16 15:34:30 -08:00
rcancro
71c44843c8 enforce pixels bounds for ASLayout size/position 2015-12-16 13:14:33 -08:00
Aaron Schubert
4ceab33038 Further clean up for ASDK 2.0 2015-12-16 10:20:13 +00:00
Brandon Withrow
0a6871b32b Added Example Library, updated shape drawing 2015-12-15 16:25:33 -08:00
Luke Parham
fe5a58087d Merge branch 'master' into cells-with-view-controllers 2015-12-15 15:31:13 -06:00
Luke Parham
17c985da38 commented some stuff out 2015-12-15 15:30:27 -06:00
Brandon Withrow
2d32d8e6fd Added basic support for shape layers 2015-12-15 11:59:36 -08:00
Bradley Smith
e64965c1ca Fixed ASTextKit CoreText attributes bug which was incorrectly reading a NSParagraphStyle as CTParagraphStyleRef 2015-12-15 14:41:37 -05:00
Brandon Withrow
dd1518f4b2 Initial commit 2015-12-15 10:39:06 -08:00
Samuel Hsiung
f9d476e170 Fix ASTextNode truncated size calculation ignoring attributes in the last line 2015-12-15 10:09:03 -08:00
Lukas Spieß
a75f2fe6d6 Cleanup project structure and move testing frameworks 2015-12-15 15:59:51 +01:00
Lukas Spieß
1600538402 Switch to using DWARF without dSYM for tests in Debug
This change was necessary to work around an issue with either Xcode 7 or OCMock, resulting A LOT of warnings. Compare https://github.com/erikdoe/ocmock/issues/262
2015-12-15 13:25:19 +01:00
Lukas Spieß
cab8fc103e Replace removed OCHamcrest API with new syntax 2015-12-15 13:08:54 +01:00
Lukas Spieß
e28bf7a431 Remove precompile header in tests targets 2015-12-15 13:08:20 +01:00
Lukas Spieß
53b1bbcb85 Update testing frameworks 2015-12-15 12:55:46 +01:00
Christoph Wendt
e6e692a22c Merge pull request #233 from bitstadium/feature/extend-nullability-backwards-compatiblity
Add additional fallbacks for newer nullability annotation syntax
2015-12-14 10:57:31 -08:00
Aaron Schubert
50f652a5b3 Fix indendation 2015-12-14 10:22:37 +00:00
Adlai Holler
e202b18db9 Annotate some new stuff 2015-12-13 10:07:14 -08:00
Adlai Holler
7079a9cc79 Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
2015-12-13 10:05:03 -08:00
appleguy
0cc229d38d Merge pull request #935 from samhsiung/clip_yes
Re-enable clipsToBounds on ASEditableTextNode's textView to fix iOS 9 style overflowing
2015-12-12 18:00:52 -08:00
Scott Goodson
6ad1503556 Merge branch 'master' into RemoveWorkingWindow 2015-12-11 22:42:13 -08:00
Scott Goodson
872b3588d8 Complete merge of working window removal with ASHierarchyState changes in master. 2015-12-11 22:15:13 -08:00
Scott Goodson
00fe336ae7 Merge branch 'master' into RemoveWorkingWindow 2015-12-11 21:34:45 -08:00
Samuel Hsiung
e4ca0e3ccf make ASEditableTextNode's textView clip to bounds 2015-12-11 18:53:10 -08:00
appleguy
7380296e27 Merge pull request #877 from soniccat/master
[ASTextNode] Possible layout fix (fixes a case with Interface Builder initialization ordering)
2015-12-11 12:23:56 -08:00
appleguy
745f724fae Merge pull request #933 from garrettmoon/fixCrashRelatedToOutOfOrderMainQueueBlocks
Fixes an issue where reloadDataImmediately interleaves with asynchronous loading in ASDataController.
2015-12-11 11:08:05 -08:00
Garrett Moon
941a732fd6 Rename and move ASMainSerialQueue to its own class 2015-12-11 10:53:06 -08:00
Garrett Moon
066596314e Fix deadlock when an editing transaction needs to perform its work on the main thread, and then elsewhere, on the main thread, we block waiting for all editing transactions to finish 2015-12-11 10:45:23 -08:00
Garrett Moon
f94229796c Fixes out of order blocks running on main queue in ASDataController
ASDataController’s completedNodes is accessed by treating the main thread as a serial queue. The ​*problem*​ is, operations can cut in line by being added while on the main thread. I.e. it just calls the block instead of dispatch_async’ing to the main thread. This results in data inconsistency.

To address this, I've added a queue of operations which get run serially (not to be confused with a serial dispatch queue). Instead of running blocks directly on the main thread, if it’s called while not on the main thread, it dispatch_asyncs to the main thread and runs any blocks in the queue. If it ​*is*​ on the main thread, it runs any blocks already in the queue and then runs the block.
2015-12-11 10:45:22 -08:00
appleguy
2d9064dd1e Merge pull request #932 from garrettmoon/exposeRecursivelyEnsureDisplay
Introduce ASDisplayNode+Beta.h - Expose recursivelyEnsureDisplay
2015-12-10 20:17:10 -08:00
Garrett Moon
082dc1cbca Expose recursivelyEnsureDisplay 2015-12-10 19:42:17 -08:00
Lukas Spieß
8c0bd62ee1 Remove installation of appledoc from .travis.yml 2015-12-10 13:12:33 +01:00
Lukas Spieß
92a539e0f4 Make sure to update homebrew before installing appledoc 2015-12-10 02:34:54 +01:00