Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Examples] Fix LayoutSpecExamples and LayoutSpecExamples-Swift: image URLs were still pointing to asyncdisplaykit.org #275

Merged
merged 5 commits into from
May 16, 2017
Merged

[Examples] Fix LayoutSpecExamples and LayoutSpecExamples-Swift: image URLs were still pointing to asyncdisplaykit.org #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4c422e
Fix Image URLs in LayoutSpecExamples and LayoutSpecExamples-Swift (th…
cestebanez May 15, 2017
9f1d042
Update documentation of ASMapNode example to accurately reflect imple…
cestebanez May 15, 2017
b2c3b8e
Fix headers
cestebanez May 15, 2017
b735db3
More headers fixing
cestebanez May 15, 2017
37176d6
Merge remote-tracking branch 'origin/master' into CETMaintainExamples
cestebanez May 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions examples/ASMapNode/Sample/MapHandlerNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
//
// MapHandlerNode.h
// Sample
// Texture
//
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
// grant of patent rights can be found in the PATENTS file in the same directory.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//

#import <AsyncDisplayKit/ASDisplayNode.h>
Expand Down
52 changes: 27 additions & 25 deletions examples/ASMapNode/Sample/MapHandlerNode.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
//
// MapHandlerNode.m
// Sample
// Texture
//
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
// grant of patent rights can be found in the PATENTS file in the same directory.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//

#import "MapHandlerNode.h"
Expand Down Expand Up @@ -112,22 +112,24 @@ - (void)didLoad
}

/**
* ---------------------------------ASStackLayoutSpec--------------------------------
* | ------------------------------ASInsetLayoutSpec----------------------------- |
* | | ---------------------------ASStackLayoutSpec-------------------------- | |
* | | | -----------------ASStackLayoutSpec---------------- | | |
* | | | | --------------ASStackLayoutSpec------------- | | | |
* | | | | | ASEditableTextNode ASEditableTextNode | | | | |
* | | | | -------------------------------------------- | | | |
* | | | | --------------ASStackLayoutSpec------------- | ASButtonNode | | |
* | | | | | ASEditableTextNode ASEditableTextNode | | | | |
* | | | | -------------------------------------------- | | | |
* | | | -------------------------------------------------- | | |
* | | ---------------------------------------------------------------------- | |
* | ---------------------------------------------------------------------------- |
* | ASButtonNode |
* | ASMapNode |
* ----------------------------------------------------------------------------------
* ------------------------------------ASStackLayoutSpec-----------------------------------
* | ---------------------------------ASInsetLayoutSpec-------------------------------- |
* | | ------------------------------ASStackLayoutSpec----------------------------- | |
* | | | ---------------------------ASStackLayoutSpec-------------------------- | | |
* | | | | -----------------ASStackLayoutSpec---------------- | | | |
* | | | | | --------------ASStackLayoutSpec------------- | | | | |
* | | | | | | ASEditableTextNode ASEditableTextNode | | | | | |
* | | | | | -------------------------------------------- | | | | |
* | | | | | --------------ASStackLayoutSpec------------- | ASButtonNode | | | |
* | | | | | | ASEditableTextNode ASEditableTextNode | | | | | |
* | | | | | -------------------------------------------- | | | | |
* | | | | -------------------------------------------------- | | | |
* | | | ---------------------------------------------------------------------- | | |
* | | | ASButtonNode | | |
* | | ---------------------------------------------------------------------------- | |
* | ---------------------------------------------------------------------------------- |
* | ASMapNode |
* ----------------------------------------------------------------------------------------
*
* This diagram was created by setting a breakpoint on the returned `layoutSpec`
* and calling "po [layoutSpec asciiArtString]" in the debugger.
Expand Down
6 changes: 3 additions & 3 deletions examples/LayoutSpecExamples-Swift/Sample/LayoutExampleNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class PhotoWithInsetTextOverlay : LayoutExampleNode {

backgroundColor = .clear

photoNode.url = URL(string: "http://asyncdisplaykit.org/static/images/layout-examples-photo-with-inset-text-overlay-photo.png")
photoNode.url = URL(string: "http://texturegroup.org/static/images/layout-examples-photo-with-inset-text-overlay-photo.png")
photoNode.willDisplayNodeContentWithRenderingContext = { context, drawParameters in
let bounds = context.boundingBoxOfClipPath
UIBezierPath(roundedRect: bounds, cornerRadius: 10).addClip()
Expand Down Expand Up @@ -101,9 +101,9 @@ class PhotoWithOutsetIconOverlay : LayoutExampleNode {
required init() {
super.init()

photoNode.url = URL(string: "http://asyncdisplaykit.org/static/images/layout-examples-photo-with-outset-icon-overlay-photo.png")
photoNode.url = URL(string: "http://texturegroup.org/static/images/layout-examples-photo-with-outset-icon-overlay-photo.png")

iconNode.url = URL(string: "http://asyncdisplaykit.org/static/images/layout-examples-photo-with-outset-icon-overlay-icon.png")
iconNode.url = URL(string: "http://texturegroup.org/static/images/layout-examples-photo-with-outset-icon-overlay-icon.png")

iconNode.imageModificationBlock = { image in
let profileImageSize = CGSize(width: 60, height: 60)
Expand Down
13 changes: 10 additions & 3 deletions examples/LayoutSpecExamples/Sample/LayoutExampleNodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
//
// LayoutExampleNodes.h
// Sample
// Texture
//
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
// grant of patent rights can be found in the PATENTS file in the same directory.
//
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//

#import <AsyncDisplayKit/AsyncDisplayKit.h>
Expand Down
19 changes: 13 additions & 6 deletions examples/LayoutSpecExamples/Sample/LayoutExampleNodes.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
//
// LayoutExampleNodes.m
// Sample
// Texture
//
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree. An additional grant
// of patent rights can be found in the PATENTS file in the same directory.
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
// grant of patent rights can be found in the PATENTS file in the same directory.
//
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//

#import "LayoutExampleNodes.h"
Expand Down Expand Up @@ -124,7 +131,7 @@ - (instancetype)init
self.backgroundColor = [UIColor clearColor];

_photoNode = [[ASNetworkImageNode alloc] init];
_photoNode.URL = [NSURL URLWithString:@"http://asyncdisplaykit.org/static/images/layout-examples-photo-with-inset-text-overlay-photo.png"];
_photoNode.URL = [NSURL URLWithString:@"http://texturegroup.org/static/images/layout-examples-photo-with-inset-text-overlay-photo.png"];
_photoNode.willDisplayNodeContentWithRenderingContext = ^(CGContextRef context, id drawParameters) {
CGRect bounds = CGContextGetClipBoundingBox(context);
[[UIBezierPath bezierPathWithRoundedRect:bounds cornerRadius:10] addClip];
Expand Down Expand Up @@ -168,10 +175,10 @@ - (instancetype)init

if (self) {
_photoNode = [[ASNetworkImageNode alloc] init];
_photoNode.URL = [NSURL URLWithString:@"http://asyncdisplaykit.org/static/images/layout-examples-photo-with-outset-icon-overlay-photo.png"];
_photoNode.URL = [NSURL URLWithString:@"http://texturegroup.org/static/images/layout-examples-photo-with-outset-icon-overlay-photo.png"];

_iconNode = [[ASNetworkImageNode alloc] init];
_iconNode.URL = [NSURL URLWithString:@"http://asyncdisplaykit.org/static/images/layout-examples-photo-with-outset-icon-overlay-icon.png"];
_iconNode.URL = [NSURL URLWithString:@"http://texturegroup.org/static/images/layout-examples-photo-with-outset-icon-overlay-icon.png"];

[_iconNode setImageModificationBlock:^UIImage *(UIImage *image) { // FIXME: in framework autocomplete for setImageModificationBlock line seems broken
CGSize profileImageSize = CGSizeMake(60, 60);
Expand Down