Commit Graph

1739 Commits

Author SHA1 Message Date
appleguy
f15bd92df1 Merge pull request #1156 from levi/implicitNodeMembership
[ASDisplayNode] Implicit node hierarchy handling with ASLayouts
2016-02-01 18:33:32 -08:00
Levi McCallum
ac3c9d220b Respond to review comments 2016-02-01 18:29:50 -08:00
appleguy
0ba0cf871d Merge pull request #1147 from lappp9/ASVideoNode
[ASVideoNode] Video muting, tap delegate override, general cleanup
2016-02-01 17:52:57 -08:00
Levi McCallum
d168ec78ce Implement simple, in-order add/remove subnode support when changing layout specs 2016-02-01 17:49:48 -08:00
Levi McCallum
bd1de07c77 Add custom comparision block to array diffing category 2016-02-01 17:49:48 -08:00
Levi McCallum
9f25b54f9e Support insertion on first layout of display node 2016-02-01 17:49:48 -08:00
Levi McCallum
e852cb612c Simplify usage of diffing API 2016-02-01 17:49:47 -08:00
Levi McCallum
924e72f774 Mark setup placeholder method as private 2016-02-01 17:49:47 -08:00
Levi McCallum
3abe6d9181 Simplify measure call structure 2016-02-01 17:49:47 -08:00
Levi McCallum
7a3987a467 Add tests to LCS array category 2016-02-01 17:49:47 -08:00
Levi McCallum
822fc96f96 Add LCS diffing support to NSArray 2016-02-01 17:49:47 -08:00
Levi McCallum
29609bfe87 Clean up long lines 2016-02-01 17:49:47 -08:00
Levi McCallum
561ae212d9 Wrap implicit hierarchy management in a class enable bit 2016-02-01 17:49:47 -08:00
Levi McCallum
b2843d29c4 Allow any node to be identified in the flattened predicate search 2016-02-01 17:49:47 -08:00
Levi McCallum
184d1fc059 Switch layout flatten to BFS for node ordering 2016-02-01 17:49:47 -08:00
appleguy
c8af28e2d7 Merge pull request #1157 from nesium/disable_instrument_program_flow_arcs
Disable "Instrument Program Flow" for Release Build of iOS Framework
2016-02-01 17:49:21 -08:00
mb
dfefcb8a89 disabled GCC_INSTRUMENT_PROGRAM_FLOW_ARCS
for Release build of iOS Framework to fix error output in projects using that Framework
2016-02-01 15:35:24 +01:00
Luke Parham
2313b32406 removed comment 2016-01-29 16:31:54 -08:00
appleguy
279a04cfa6 Merge pull request #1152 from garrettmoon/allowPlaceholderNodesToBeStretchable
Allow images returned by placeholderImage to be stretchable
2016-01-29 15:05:09 -08:00
Garrett Moon
35fb3d2ae6 Allow images returned by placeholderImage to be stretchable 2016-01-29 14:45:18 -08:00
appleguy
6d2628104b Merge pull request #1146 from garrettmoon/movePreContextBlockToBeforeBackgroundFill
Move the call to willDisplayNodeContentWithRenderingContext to before…
2016-01-29 11:53:42 -08:00
appleguy
3e72d68f13 Merge pull request #1148 from tomizimobile/tailTruncationFix
Fix text truncation
2016-01-29 11:52:44 -08:00
Luke Parham
2d1499ab4f added muting property and delegate callback to override video tapping 2016-01-29 09:27:48 -08:00
Tom King
d0edbe809a ensure that the truncater is initialized before the context is in _calculateSize 2016-01-29 09:32:40 -05:00
Luke Parham
af37a48421 removed unnecessary clear color and improved comment 2016-01-28 23:34:16 -08:00
appleguy
08d15e4ca5 Merge pull request #1143 from samhsiung/transform_scroll
[ASTableView] make scrollDirection transform aware in ASCollectionView and ASTableView
2016-01-28 21:24:26 -08:00
Garrett Moon
580b7bdc78 Move the call to willDisplayNodeContentWithRenderingContext to before background fill in image node 2016-01-28 17:40:21 -08:00
Samuel Hsiung
39cd3afa0d [AS(Table|Collection)View] make scrollDirection transform aware 2016-01-28 16:42:46 -08:00
appleguy
8d9d5a0cc3 Merge pull request #1132 from garrettmoon/switchToInstanceDrawAndDisplay
[ASDisplayNode+AsyncDisplay] Implement instance methods of draw and display, use for text and image performance boost.
2016-01-28 16:17:31 -08:00
Garrett Moon
1ecfd81e3e Address comments 2016-01-28 16:05:49 -08:00
appleguy
68a4b1ea43 Merge pull request #1142 from levi/scrollDirectionFix
Add a safety check for targetContentOffset possibly being NULL
2016-01-28 15:55:50 -08:00
Levi McCallum
0e0a0f3280 Add a safety check for targetContentOffset possibly being NULL 2016-01-28 15:54:38 -08:00
appleguy
8db4544e31 Merge pull request #1135 from levi/scrollDirectionFix
Observe decelerating scroll velocity for accurate direction reporting
2016-01-28 15:43:45 -08:00
appleguy
2c194fd924 Merge pull request #1140 from rcancro/textNodeWordSpacing
[ASTextNode] Added ASTextNodeWordKerner support
2016-01-28 15:38:00 -08:00
rcancro
715a678829 scott's comments 2016-01-28 15:18:45 -08:00
appleguy
15e3c2e6d2 Merge pull request #1136 from samhsiung/fix_color_test
Fix attribute value setting in testLinkInTextUsesForegroundColor
2016-01-28 14:50:43 -08:00
appleguy
c7897e17d6 Merge pull request #1137 from lappp9/ASVideoNode
[ASVideoNode] Bug fix and default play button
2016-01-28 14:31:16 -08:00
Garrett Moon
7b002c408d Ensure context is non-null 2016-01-28 08:38:40 -08:00
rcancro
7f6f2fed11 Added ASTextNodeWordKerner support to ASTextNode
* Added a member to `ASTextKitAttributes` that is an optional delegate to the struct's NSLayoutManager.
* Changed ASTextNode to set this delegate to an instance of ASTextNodeWordKerner.
* Updated init method of `ASTextKitContext` to take an optional NSLayoutManager delegate
* Added the files in TextKit folder to the public headers (so we can include ASTextNodeTypes.h)
2016-01-28 08:38:22 -08:00
Garrett Moon
48150668c6 Fix up build 2016-01-28 08:33:18 -08:00
Luke Parham
b9d7e0fd0b Merge branch 'master' into ASVideoNode 2016-01-28 01:45:30 -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
Samuel Hsiung
8c963bd13c Fix attribute value setting in testLinkInTextUsesForegroundColor in ASTextKitTests 2016-01-27 23:51:44 -08:00
Levi McCallum
6eb0521fa3 Observe decelerating scroll velocity for accurate direction reporting 2016-01-27 23:20:21 -08:00
appleguy
e22c50101a Merge pull request #1134 from bimawa/ASTextNodeAddTestCase
Added additionalTruncationMessage Unit test
2016-01-27 22:45:19 -08:00
appleguy
5b9be8a8c3 Merge pull request #1127 from samhsiung/foreground_color_link
[ASTextKit] Use NSForegroundColorAttributeName for links in ASTextKitRenderer
2016-01-27 22:42:04 -08:00
Maxim Bunkov
8a8843a32a Added additionalTruncationMessage Unit test 2016-01-28 10:27:58 +05:00
Samuel Hsiung
90ac40020f Use NSForegroundColorAttributeName for links in ASTextNodes by subclassing NSLayoutManager 2016-01-27 21:13:28 -08:00
Garrett Moon
d7d36c0a6b Addressing Scott's comments 2016-01-27 21:08:04 -08:00