GitHub/Texture
1
0
Fork 0
mirror of https://github.com/TextureGroup/Texture.git synced 2026-04-07 19:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,958 Commits 371 Branches 222 Tags
MSASTextNode2SupportTruncationTokenAttributesMerging
Commit Graph
4958 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Schneider 678df37017 [Layout Transition API] Simplify applying layout transition (#1886) 
* Simplify applying layout transition in preparation for bigger layout transition API work

* Change from apply to complete in if layout transitions are involved and _applyLayout: to _setCalculatedLayout: for layout

* Change to applySubnodeInsertions and applySubnodeRemovals

* Change from completeTransition to commitTransition and flip logic around when to trampoline to the main thread for implicit hierarchy management

* More internal API improvements

* Fix merge conflicts

* Rename _layout to _calculatedLayout
 2016-07-29 10:52:55 -07:00
Hannah Troisi ff2c47c415 add assertion for ASRelativeDimensionTypePercent value to be between 0-1 (#2009) 2016-07-29 10:38:20 -07:00
Adlai Holler 6a21daa80f [ASInternalHelpers] Use type-generic math (#2006) 2016-07-28 20:44:14 -07:00
Adlai Holler 5ff5a27717 [ASTextKitComponents] Remove unused, somewhat dangerous functions (#2007) 
[ASTextKitComponents] Remove Unused Scale Conversion Functions
 2016-07-28 20:43:27 -07:00
Yue-Wang-Google 7426c1dd66 Fixed implicit cast for 64-bit devices in ASTextKitComponents.h (#1994) 2016-07-28 17:03:02 -07:00
Hannah Troisi 79e44207e8 Merge pull request #1993 from Yue-Wang-Google/patch-2 
[ASRangeController] Fix import misspelling
 2016-07-28 15:15:54 -07:00
Yue-Wang-Google b0aeb2997d Fixed recursively setting displaysAsynchronously in ASDK snapshot tests to recurse through all descendant nodes instead of just the root node's subnodes (#1995) 
Patch from Google Inc.
 2016-07-28 14:57:23 -07:00
Yue-Wang-Google d481ce5423 [ASTextNode] Fix ascender to include line height specified in attributed string paragraph style (#1997) 
* Fix ASTextNode's ascender to also include the line height specified by paragraph style in the attributed string.

* Merge conflict (original patch is for an old version)
 2016-07-28 10:53:48 -07:00
Yue-Wang-Google 93a5c36a39 Fixed typo in ASCollectionViewFlowLayoutInspector.m pertaining to supplementary node layout. (#1996) 
Patch from iOS teams at Google Inc.
 2016-07-28 10:13:49 -07:00
ricky f0b1f12160 [ASEnvironmentTraitCollection] default user interface idiom to UIUserInterfaceIdiomUnspecified (#1998) 
* [ASEnvironmentTraitCollection] default user interface idiom to ASEnvironmentTraitCollection

UIUserInterfaceIdiomUnspecified is -1 so we were actually defaulting our trait collection to UIUserInterfaceIdiomPhone (which is 0).

* Fix a few places where we weren’t using the default method to create the base traits
 2016-07-28 10:03:32 -07:00
Yue-Wang-Google b59e368b71 [PATCH] Fix capitalizations in imports. 2016-07-27 14:17:56 -07:00
Yue-Wang-Google 95bf8bbe1f Fix ASTextNode truncation string (#1992) 
Initial PR to open source our internal ASDK patch list from Google Inc. :)
 2016-07-27 13:18:21 -07:00
Hannah Troisi f5b3a282af Fix Pinterest Xcode 7.3.1 Analyzer Warnings (#1988) 2016-07-27 08:23:16 -07:00
Adlai Holler aeec0b1a14 [ASChangeSetDataController] Enable some assertions (#1984) 2016-07-25 17:28:24 -07:00
Michael Schneider e010cd3d9e Fix compiler warnings in _ASHierarchyChangeSet on 32bit (#1982) 2016-07-25 13:17:10 -07:00
Adlai Holler 7b2e14c128 Disable thrash tests to avoid deallocated-while-visible exception that's popped up 2016-07-25 10:26:51 -07:00
Alice Chang 2bf1b56f55 fixed potential ASPINRemoteImageDownloader crash (#1972) 2016-07-24 16:01:15 -07:00
Adlai Holler f434192339 [Tests] Two Minor Cleanups (#1977) 
* [Tests] Use XCTestExpectation instead of rolling our own in ASMultiplexImageNode

* [Tests] Remove do-nothing ASCollectionView test method
 2016-07-24 15:32:27 -07:00
Adlai Holler a79c69a5f1 [ASWeakSet] Refactor to use NSHashTable (#1976) 
[ASWeakSet] Tweak it

[ASWeakSet] Simplify
 2016-07-24 15:31:09 -07:00
Levi McCallum 304df12f71 Add recursive description debugging method to ASLayout (#1975) 
* Add recursiveDescription debugging method

* Add recursive description implementation

* Add LayoutableObject to ASLayout description
 2016-07-24 15:12:53 -07:00
Hannah Troisi 6ed5d4a6ac Update CONTRIBUTING.md 2016-07-24 15:11:19 -07:00
Hannah Troisi 052b5ffc7a Update CONTRIBUTING.md 2016-07-24 15:11:07 -07:00
Hannah Troisi 4a220a452b Update CONTRIBUTING.md 2016-07-24 15:10:14 -07:00
Hannah Troisi 54856a5243 Update README.md 2016-07-24 09:37:55 -07:00
Hannah Troisi 4070c40e6e Update README.md 2016-07-24 09:36:17 -07:00
Hannah Troisi 923be12f17 Update README.md 2016-07-24 09:34:40 -07:00
Hannah Troisi 07db6d85b3 Update README.md 2016-07-24 09:33:33 -07:00
Levi McCallum c6b17ba7bb Add description to ASLayout (#1973) 
* Add description to ASLayout

* Constrained size is a size range, print correctly

* Add missing closing bracket
 2016-07-23 20:12:26 -07:00
Tim Johnsen a6e03e8d93 Fix issue causing ASPINRemoteImageDownloader to return incorrect progress values. (#1966) 2016-07-23 20:09:58 -07:00
Adlai Holler 7ec6f07953 [General] Remove dead code, check optional protocol selector before calling (#1970) 2016-07-22 13:09:28 -07:00
Michael Schneider 050fb626fa Merge pull request #1965 from maicki/MSFixCrashInsertNilNode 
[ASDisplayNode] Don't crash if inserting a nil node
 2016-07-21 16:38:16 -07:00
Adlai Holler 3bfa60c445 Move ASDataController+Subclasses.h to fix Swift build 2016-07-21 15:52:24 -07:00
Michael Schneider bbe2fe5f4c Add and fix tests for adding a nil subnode 2016-07-21 14:54:39 -07:00
Michael Schneider 9b47a9114a Fix compiler warning in as_smallDescription on 32 bit (#1964) 2016-07-21 14:52:21 -07:00
Michael Schneider 4b9ee3c64d Don't crash if inserting a nil node 2016-07-21 14:41:19 -07:00
Adlai Holler 8cde594de3 [ASDataController] Add validation logic to the change set to throw exceptions on invalid updates (#1894) 
[_ASHierarchyChangeSet] Oopsy daisy

[ASDataController] Tweak our update validation

[ASHierarchyChangeSet] Fix bugs

Finish up some stuff

[ASDataController] Put some stuff back

[ASChangeSetDataController] Always use changeset

[ASDataController] Put other stuff back

[_ASHierarchyChangeSet] Use fast enumeration

[_ASHierarchyChangeSet] Fix assertion format strings, return on fail so we don't crash in production

[ASDataController] Store data source item counts as vector rather than NSArray

[ASDataController] Build some tests for the update validation

[ASDataController] Fix issues with update validation

Get rid of new file

[ASDataController] Suppress changeset validation before initial reload

[ASDataController] Make invalid update log vs. exception publicly toggleable
 2016-07-21 14:37:51 -07:00
Levi McCallum 0c70bca2bd [ASVideoNode] Fix conditional that prevented local asset loading (#1962) 
* Fix conditional that prevented local asset loading

* Allow setting new asset to clear previously set URL
 2016-07-21 10:39:31 -07:00
Max Gu 1d4620edce Adding documentation for assetURL in ASVideoNode, and adding a mutex lock for assetURL setter (#1961) 
* Adding comment in ASVideoNode.h for the assetURL property

* Adding a mutexlock in setAssetURL in ASVideoNode
 2016-07-20 18:40:49 -07:00
Adlai Holler 5723f603c1 Merge pull request #1954 from Xinchi/HLS_issue 
Hls issue
 2016-07-20 17:56:56 -07:00
Max Gu 6bd287086c Addressing Adlai's comment 2016-07-20 17:33:34 -07:00
Max Gu b8ad8d6cc0 Combine 2 if statements into 1 2016-07-20 17:09:23 -07:00
Max Gu 76303f3799 Setting the internal asset to the player item's asest 2016-07-20 17:03:57 -07:00
Max Gu b04aa2e2bc Removing some unused method 2016-07-20 16:07:17 -07:00
Max Gu f6eaa43315 Adding the new ASVideoNode API that allows for video player item construction with URL 2016-07-20 16:01:14 -07:00
Adlai Holler abcdaf8f55 Merge pull request #1956 from facebook/AHNoSkipEmptyUpdate 
[ASCollectionView] Do Not Suppress Empty Updates
 2016-07-20 13:41:49 -07:00
Adlai Holler 3ebddb6837 [ASCollectionView] Move the variable in 2016-07-20 13:06:00 -07:00
Adlai Holler 6a13c0365b [ASCollectionView] Do not suppress empty updates 2016-07-20 12:53:01 -07:00
Max Gu 44a80672cb Adding track to the requestedKeys to be loaded asynchronously so that it doesn't block the main thread 2016-07-19 20:25:32 -07:00
Michael Schneider 7096f47f90 Merge pull request #1951 from maicki/MSFixASViewControllerConstrainedSizeiOS8 
Fixes iOS 7 and iOS 8 wrong size in viewWillAppear: while a a rotation is happening
 2016-07-19 16:48:51 -07:00
Michael Schneider 90d5c97d0f Fixes iOS 7 and iOS 8 wrong size in viewWillAppear: while a a rotation is happening 2016-07-19 16:24:47 -07:00