1701 Commits

Author SHA1 Message Date
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
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
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
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
appleguy
29374deede Merge pull request #1131 from levi/setNeedsDataFetch
Update documentation for `setNeedsDataFetch`
2016-01-27 20:09:55 -08:00
appleguy
4fa9869ca9 Merge pull request #1124 from nvh/fix-framework-target
Added Prefix Headers to framework target
2016-01-27 20:08:38 -08:00
Levi McCallum
203952aca7 Update documentation 2016-01-27 20:06:46 -08:00
appleguy
5004935d82 Merge pull request #1130 from levi/setNeedsDataFetch
Add `setNeedsDataFetch` to trigger in-range `fetchData` calls
2016-01-27 20:06:30 -08:00
appleguy
e1f485e08a Merge pull request #1125 from binl/bl_expose_batchBegin
expose beginUpdates and endUpdates
2016-01-27 20:02:50 -08:00
appleguy
6721f1ecc3 Merge pull request #1128 from lkzhao/ASTextKitFontSizeAdjuster
fix bug: constraint size not updated for frontsizeadjuster
2016-01-27 20:02:06 -08:00
Levi McCallum
05af98b578 Update documentation 2016-01-27 19:58:36 -08:00
Levi McCallum
55e289836e Clean up output of NSStringFromASInterfaceState 2016-01-27 18:34:21 -08:00
Levi McCallum
ee23830318 Remove setNeedsDataFetch queuing, as interfaceState always performs fetch on re-enter 2016-01-27 18:25:39 -08:00
Levi McCallum
411d0b3deb Add tests for setNeedsDataFetch and out of range fetch behavior 2016-01-27 18:24:59 -08:00
Levi McCallum
bb02a2d487 Clean up interface state printing style 2016-01-27 17:19:40 -08:00
Levi McCallum
585b1215a9 Recursively fetchData for requests 2016-01-27 17:19:11 -08:00
Bin Liu
b26337c449 Levi's comments 2016-01-27 15:06:29 -08:00
Levi McCallum
ec7a3599bd Add setNeedsDataFetch method to queue off screen fetchData calls 2016-01-27 14:52:37 -08:00
Luke Zhao
733c65d1eb fix bug: constraint size not updated for frontsizeadjuster 2016-01-27 13:49:00 -08:00
Bin Liu
f6be279c60 Added more facilitator methods 2016-01-27 12:50:41 -08:00
Bin Liu
263bb311f2 expose beginUpdates and endUpdates 2016-01-27 10:50:42 -08:00
Niels van Hoorn
c5af8028b6 Added Prefix Headers to framework 2016-01-27 17:19:28 +01:00
appleguy
f696eb7476 Merge pull request #1122 from knopp/_ASAsyncTransaction-operation-priority
[_ASAsyncTransaction] make priority a NSInteger with default to 0
2016-01-26 19:47:57 -08:00
Matej Knopp
da5f7eccd9 [_ASAsyncTransaction] make priority a NSInteger with default to 0
Signed-off-by: Matej Knopp <matej.knopp@gmail.com>
2016-01-27 00:37:27 +01:00
appleguy
d433205e5a Merge pull request #1117 from knopp/_ASAsyncTransaction-operation-priority
[_ASAsyncTransaction] implement operation priority
2016-01-26 12:32:31 -08:00
appleguy
f1da7102a1 Merge pull request #1119 from yury/update-port-of-component-text-kit
[ASTextNode] Update back-ported ComponentKit text renderer changes for long truncation strings.
2016-01-26 12:32:10 -08:00
appleguy
167a00b963 Merge pull request #1120 from nguyenhuy/revert_reloadData
Revert reloadData optimizations, keep tests as further development improves testing and optimization implementation.
2016-01-26 12:31:06 -08:00
Huy Nguyen
56c6bd681b Revert "Revert commit 83aaa46, thus bring 2e4d716 back"
This reverts commit 209425c22ce84ecbb7ab631753ec8fc34dd9cbb0.
2016-01-26 12:05:02 -08:00
Huy Nguyen
8a6b7cff97 Revert "Fix ASCollectionView data inconsistency after reloadData"
This reverts commit 50e5cffbe1e6bfa9c9cc9116519c996af088ec83.
2016-01-26 12:04:55 -08:00
yury
a3a0440a01 [text] Use the closest glyph to determine hit token 2016-01-26 22:41:02 +03:00
yury
a0b7254213 [text] Fix crash when highlighted range exceeds truncation range 2016-01-26 22:37:44 +03:00
Matej Knopp
0a45bd9596 [_ASAsyncTransaction] implement operation priority
Signed-off-by: Matej Knopp <matej.knopp@gmail.com>
2016-01-26 15:31:40 +01:00
Matej Knopp
75abf07c6f [_ASAsyncTransaction] tweak number of threads
Thread count is now 2 * activeProcessorCount, however during tracking it is decreased by 1

Signed-off-by: Matej Knopp <matej.knopp@gmail.com>
2016-01-26 15:18:16 +01:00
appleguy
1514d23d33 Merge pull request #1114 from nguyenhuy/reloaddata_tests
Test reloadData in ASTableViewStressTest
2016-01-25 23:00:28 -08:00
Huy Nguyen
3bb8967b96 Enable ASCollectionViewTests:testCollectionViewController 2016-01-25 22:26:30 -08:00
Huy Nguyen
e1074b605b Test reloadData in ASTableViewStressTest 2016-01-25 22:22:09 -08:00
appleguy
fb60acbecc Merge pull request #1113 from lkzhao/ASTextKitFontSizeAdjuster
[ASTextNode] Fix test build for font size adjuster
2016-01-25 20:03:01 -08:00
Luke Zhao
70be4c96ba import ASTextNode+Beta.h 2016-01-25 19:59:16 -08:00
appleguy
508e3db8ee Merge pull request #1091 from lkzhao/ASTextKitFontSizeAdjuster
[ASTextNode] Support iteratively shrinking font size in order to ensure no single words are wrapped.
2016-01-25 19:36:39 -08:00
Luke Zhao
f37c805b72 Move minimumScaleFactor to ASTextNode+Beta 2016-01-25 19:12:29 -08:00
Luke Zhao
f413a618e0 add ASTextKitFontSizeAdjuster 2016-01-25 19:07:28 -08:00