41 Commits

Author SHA1 Message Date
Andrew Yates
eab0fc200b Migrate placeholder example project from 1.0 to 2.x (#1164) 2018-10-17 08:02:47 -07:00
Michael Schneider
209227908e
Add missing argument for calling image download completion block (#1106) 2018-09-15 08:04:46 -07:00
appleguy
465abb1ded [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077)
* [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses)

With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.

After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.

* [License] Update all Texture source files to be pure Apache 2.

* Changelog entry for Apache 2 license update.

* Revert "[License] Update all Texture source files to be pure Apache 2."

This reverts commit ffa0fbbba9717d871dd16c4b07539f2f8208fc2b.

* [License] Update all Texture source files to be pure Apache 2, maintaining copyrights.

* [License] Update CONTRIBUTING, README, Podspec & Dangerfile.
2018-08-28 07:39:18 -07:00
Michael Schneider
c8b5a1b323
Rewrite Swift Example (#1002)
* Rewrite Swift Example

* Add license header to OrderedDictionary
2018-07-08 08:55:28 -07:00
kenstir
4171e767be Fix ASDKgram-Swift to avoid 'error parsing JSON within PhotoModel Init' (#913) 2018-05-08 11:22:25 -07:00
Aaron Rosenberger
d6971980a3 Fixed: completeBatchFetching is called on a background thread (#731)
* Fixed breaking issue where completeBatchFetching is called on a background thread when no items are added to the collection

* Changed spaces to tabs for consistency

* Moved return statement for Code Review feedback

* Fixed the same issue in the Objective-C version of ASDKgram

* One more

* Update PhotoFeedModel.m

Fix header
2018-01-31 10:23:04 -05:00
Adlai Holler
61dade6bda Raise deployment target to iOS 9 (#743)
https://github.com/TextureGroup/Texture/pull/743

Manually merged since I forgot to retarget that diff onto master before merge
2018-01-15 15:13:05 -08:00
Stephen Williams
4dec51ca37 Fix ASDKgram example #trivial (#700)
- Fix an insta-crash that's caused by Webservice.load method to call its completion block off the main thread.
- Fix incorrect http status code check.
- Bump the deployment target to get the project compiling.
2017-12-20 12:53:13 +00:00
Erwin Zhang
cb2e5ddb2d Fix swift sample. (#669) 2017-11-21 13:33:45 +00:00
Max Wang
dce7ab3a9b [ASTextNode] Implement an example comparing ASTextNode 1 & 2 behavior. (#570)
* fix SIMULATE_WEB_RESPONSE not imported #449

* add constraint to using catching for layout

* Add TextNode example to test Yoga Layout

* update Yoga version

* add debugging log

* fix lisence

* clean up

* clean up

* fix lisence warning

* add shared scheme

* change sdk version

* revert some metadata

* Merge FlexLayoutExample to TextStressText.
Add flags to control different TextNode used.

* clean up

* fix lisence and syntax

* clean up

* remove xcworkspacedata

* Tiny coding style changes

* Another tiny change related to code style
2017-10-17 15:03:53 +01:00
Andrew Yates
0c72c4eaf0 Fix for Video Table Example Building (#383)
* Fix for Video Table Example Building

* Adjust to use setPreferredSize

* Change video URLs out for ones that still exist

* Update header

* Forgot to remove setHeight:

* Extract URLs

* Update license
2017-06-24 23:36:22 +01:00
Garrett Moon
caace4f98b More example fixes 2017-04-14 09:37:38 -07:00
Ahmed Denison-Afifi
b1cfd76cee Update example podfile platform to match AsyncDisplayKit (#3176)
* Update podfile platform
2017-03-14 12:34:06 +00:00
Michael Schneider
71ebf6b029 Fix ASImageDownloaderProtocol method that changed (#3108) 2017-03-01 11:13:19 -08:00
Marvin Nazari
a9a3e8e40c [IGListKit] Search example (#3047)
* Search example with IGListKit

* Cleanup

* updated to use new class methods [ASIGListSectionControllerMethods]
2017-02-27 12:52:48 -08:00
Calum Harris
7205ea0448 [Examples] Add ASDKgram-swift to examples_extra (#2910)
* add ASDKgram-swift to examples_extra

* Refactor ASDKgram-Swift as suggested by Adlai-Holler
2017-02-13 10:42:47 -08:00
Adlai Holler
7424b6d7f7 Update examples to use UIControlState (#3013) 2017-02-10 13:35:15 -08: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
David Hart
3b2e53fbe9 Fixed Carthage build error (#2761) 2016-12-18 00:38:29 -08:00
Garrett Moon
e95a1ca040 Any shared schemes will be build by carthage, this project shouldn't be built by carthage. (#2792) 2016-12-16 16:16:52 -08:00
Hannah Trosi
a64253cf38 [Examples] move failing Shop example to extra folder until config is fixed 2016-12-09 13:52:25 -08:00
Scott Goodson
c4a4df7c52 [Build] Move aside ASLayoutSpecPlayground-Swift for now, as it is causing an Xcode 8.0-specific build failure. 2016-11-07 15:15:58 -08:00
Hannah Troisi
3c995d8d12 [Examples] Layout 2.0 updates (#2382)
[Examples] Layout 2.0 updates: Switch YES to 1.0 for flexGrow and flexShrink
2016-10-15 17:30:48 -07:00
Michael Schneider
f369be43dd [Examples] Fix extra examples (#2342)
* Fix

* Add building extra examples to build.sh

* Fix example projects

* Fix CarthageBuildTest

* Export NSArray+Diffing.h to fix life without cocoapods
2016-10-04 19:34:14 -04:00
ricky
872aad220f [ASTextKitFontSizeAdjuster] Use the constrainedSize’s height to adjust font scaling (#2309)
* refactor shrinking logic

# Conflicts:
#	AsyncDisplayKit/TextKit/ASTextKitFontSizeAdjuster.mm

* fix ASTraitCollection sample

* updated comments.

* fix build errors

* adlai’s comments
2016-10-04 13:01:50 -04:00
Michael Schneider
8897614f0e [Layout] Layout API based on content area (#2110)
* Initial commit for adding a size constraint to ASLayoutable's

* Some more commits

* Fix sample projects in extra/

* Remove preferredFrameSize test of ASEditableTextNode

* Remove preferredFrameSize from examples_extra

* Add deprecation warning to -[ASDisplayNode preferredFrameSize]

* Add deprecation warning to -[ASDisplayNode measureWithSizeRange:]

* Commit

* Commit

* Remove ASRelativeSizeRange

* Make ASRelativeSize private

* Adjust examples

* Improve setting of -[ASLayoutable size] with points or fractions

* Add ASWrapperLayoutSpec

* Improve creation of ASRelativeDimension

* Add `preferredFrameSize` back and add deprecated logging

* Add `layoutSpecBlock` setter and getter and add locking for it

* Add better documentation and fix macros to create ASRelativeDimension

* Create new ASSizeRangeMake with just a CGSize as parameter

* Update Kitten and Social App Layout example

* Add layoutThatFits: and deprecate measure:

* Rename ASRelativeDimension to ASDimension

* Fix examples for ASDimension renaming

* Remove fancy height and width setter

* Fix ASDimension helper

* Rename -[ASLayout layoutableObject] to -[ASLayout layoutable]

* Update layout related methods and more clearer documentation around how to use it

* Deprecate old ASLayout class constructors

* Don't unnecessary recalculate layout if constrained or parent size did not change

* Use shared pointer for ASDisplayNodeLayout

* Fix rebase conflicts

* Add documentation and move implementation in mm file of ASDisplayNodeLayout

* Fix test errors

* Rename ASSize to ASLayoutableSize

* Address comments

* Rename setSizeFromCGSize to setSizeWithCGSize

* Improve inline functions in ASDimension

* Fix rebase conflicts
2016-09-07 08:44:48 -07:00
Adlai Holler
5e3627a9cd [ASTextNode] Actually deprecate attributedString property (#2151) 2016-09-01 16:43:03 -07:00
Michael Schneider
137c70647d Merge pull request #1892 from rcancro/finalLayoutableSetChildren
[ASLayoutSpec] Final layoutable set children
2016-07-11 14:31:35 -07:00
CJ Lin
f8e294bc23 fix image paths in example_extra/Multiplex 2016-07-12 01:36:41 +08:00
ricky
0696ea87b7 fixed trait example 2016-07-11 09:59:22 -07:00
Hannah Troisi
3763df1f06 [Example] Resolved ASTextNode bugs (test app to reproduce issues, do regression testing) (#1803)
* [Examples] text node known inconsistencies with UILabel

* addressed @appleguy's comments
2016-07-04 14:48:31 -07:00
Hannah Troisi
d850057916 [Travis CI] move carthageBuildTest to examples_extra to avoid Travis error 2016-06-23 16:25:48 -07:00
Hannah Troisi
c857e809f4 Clean up header comments (for consistent Facebook licensing info) (#1741)
[Licensing] Clean up header comments (for consistent Facebook licensing info)
2016-06-11 23:31:39 -07:00
Michael Schneider
76dbc1f5e6 Fix typo 2016-06-04 16:19:14 -07:00
Michael Schneider
4f493c4ad3 Fix placeholder image is not appearing if size of node changed after initial placement 2016-06-04 15:04:52 -07:00
appleguy
e5eed560e1 Merge pull request #1693 from rcancro/traitUpdate
[ASTraitCollection] Bug fixing/LayoutSpec propagation
2016-06-03 22:01:13 -07:00
ricky
13a35c5f2f more comments
* allow nil for setChild/children
* moved examples out of examples/
2016-06-03 13:59:59 -07:00
Erekle
49b2726632 fixed old examples 2016-05-20 12:21:57 +04:00
Scott Goodson
d26b489529 [Examples] Move several simpler, single-purpose examples to extras to ensure Travis does not time out. 2016-05-17 10:52:43 -07:00
Scott Goodson
15a4e18844 [Examples] Officially add tvOS to podspec, ensure Podfiles correctly show minimum supported version 7.0 instead of 7.1 2016-04-22 20:29:52 -07:00
Scott Goodson
8d9107f57e [Examples, Build] Moving some smaller / less useful examples to a separate directory, speeding up builds. 2016-04-22 19:41:43 -07:00