From 94fa0f7b7eccb9776de9dd1d29b06218fcc5a4f8 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Mon, 3 Jul 2017 12:01:23 +0100 Subject: [PATCH 1/2] Integrate Weaver into ASDKGram --- examples/ASDKgram/Podfile | 5 +++-- examples/ASDKgram/Sample/AppDelegate.m | 14 +++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/examples/ASDKgram/Podfile b/examples/ASDKgram/Podfile index 3079a3f1d..eb879f3f1 100644 --- a/examples/ASDKgram/Podfile +++ b/examples/ASDKgram/Podfile @@ -1,7 +1,8 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' target 'Sample' do - pod 'Texture/IGListKit', :path => '../..' - pod 'Texture/PINRemoteImage', :path => '../..' + pod 'Texture/IGListKit', :path => '../..' + pod 'Texture/PINRemoteImage', :path => '../..' pod 'Texture/Yoga', :path => '../..' + pod 'Weaver' end diff --git a/examples/ASDKgram/Sample/AppDelegate.m b/examples/ASDKgram/Sample/AppDelegate.m index ce3c4a332..ceecbf06f 100644 --- a/examples/ASDKgram/Sample/AppDelegate.m +++ b/examples/ASDKgram/Sample/AppDelegate.m @@ -24,6 +24,12 @@ #import "WindowWithStatusBarUnderlay.h" #import "Utilities.h" +#define WEAVER 0 + +#if WEAVER +#import +#endif + @interface AppDelegate () @end @@ -75,7 +81,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // iOS8 hides the status bar in landscape orientation, this forces the status bar hidden status to NO [application setStatusBarHidden:YES withAnimation:UIStatusBarAnimationNone]; [application setStatusBarHidden:NO withAnimation:UIStatusBarAnimationNone]; - + +#if WEAVER + WVDebugger *debugger = [WVDebugger defaultInstance]; + [debugger enableLayoutElementDebuggingWithApplication:application]; + [debugger autoConnect]; +#endif + return YES; } From 379b95c31e5e6f09990058b606bb8cb37a4eb6ac Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Mon, 3 Jul 2017 12:08:59 +0100 Subject: [PATCH 2/2] Update the license of app delegate --- examples/ASDKgram/Sample/AppDelegate.m | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/examples/ASDKgram/Sample/AppDelegate.m b/examples/ASDKgram/Sample/AppDelegate.m index ceecbf06f..16484467f 100644 --- a/examples/ASDKgram/Sample/AppDelegate.m +++ b/examples/ASDKgram/Sample/AppDelegate.m @@ -1,20 +1,18 @@ // // AppDelegate.m -// Sample -// -// Created by Hannah Troisi on 2/16/16. +// 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 // -// 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. +// http://www.apache.org/licenses/LICENSE-2.0 // #import "AppDelegate.h"