diff --git a/YogaKit/YogaKitSample/YogaKitSample/Info.plist b/YogaKit/Source/Info.plist similarity index 58% rename from YogaKit/YogaKitSample/YogaKitSample/Info.plist rename to YogaKit/Source/Info.plist index 22ca2cd4..67183244 100644 --- a/YogaKit/YogaKitSample/YogaKitSample/Info.plist +++ b/YogaKit/Source/Info.plist @@ -13,24 +13,12 @@ CFBundleName $(PRODUCT_NAME) CFBundlePackageType - APPL + FMWK CFBundleShortVersionString - 1.0 + 1.7.0 CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - diff --git a/YogaKit/Source/YGLayout.h b/YogaKit/Source/YGLayout.h index 8aff3b5e..4f827b0f 100644 --- a/YogaKit/Source/YGLayout.h +++ b/YogaKit/Source/YGLayout.h @@ -5,9 +5,9 @@ * file in the root directory of this source tree. */ #import -#import -#import -#import +#import +#import +#import YG_EXTERN_C_BEGIN diff --git a/YogaKit/Source/YGLayout.m b/YogaKit/Source/YGLayout.m index 7779c437..aedeb2f1 100644 --- a/YogaKit/Source/YGLayout.m +++ b/YogaKit/Source/YGLayout.m @@ -400,7 +400,7 @@ static void YGAttachNodesFromViewHierachy(UIView *const view) NSMutableArray *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count]; for (UIView *subview in view.subviews) { - if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) { + if (subview.yoga.isIncludedInLayout) { [subviewsToInclude addObject:subview]; } } diff --git a/YogaKit/Source/YogaKit.h b/YogaKit/Source/YogaKit.h new file mode 100644 index 00000000..69f40c47 --- /dev/null +++ b/YogaKit/Source/YogaKit.h @@ -0,0 +1,23 @@ +/** + * 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. + */ + +#import + +//! Project version number for YogaKit. +FOUNDATION_EXPORT double YogaKitVersionNumber; + +//! Project version string for YogaKit. +FOUNDATION_EXPORT const unsigned char YogaKitVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + +#import "UIView+Yoga.h" +#import +#import +#import diff --git a/YogaKit/YogaKit.xcodeproj/project.pbxproj b/YogaKit/YogaKit.xcodeproj/project.pbxproj new file mode 100644 index 00000000..56254f9f --- /dev/null +++ b/YogaKit/YogaKit.xcodeproj/project.pbxproj @@ -0,0 +1,436 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 22962D9D21FA7654006465F5 /* YGEnums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962D9C21FA7654006465F5 /* YGEnums.cpp */; }; + 22962D9F21FA7684006465F5 /* Yoga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962D9E21FA7684006465F5 /* Yoga.cpp */; }; + 22962DA221FA76AB006465F5 /* YGNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DA021FA76AB006465F5 /* YGNode.h */; }; + 22962DA321FA76AB006465F5 /* YGNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DA121FA76AB006465F5 /* YGNode.cpp */; }; + 22962DB321FA76DA006465F5 /* YGConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DA421FA76DA006465F5 /* YGConfig.cpp */; }; + 22962DB421FA76DA006465F5 /* YGNodePrint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DA521FA76DA006465F5 /* YGNodePrint.cpp */; }; + 22962DB521FA76DA006465F5 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DA621FA76DA006465F5 /* YGLayout.cpp */; }; + 22962DB621FA76DA006465F5 /* YGFloatOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DA721FA76DA006465F5 /* YGFloatOptional.h */; }; + 22962DB721FA76DA006465F5 /* YGMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DA821FA76DA006465F5 /* YGMarker.h */; }; + 22962DB821FA76DA006465F5 /* CompactValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DA921FA76DA006465F5 /* CompactValue.h */; }; + 22962DB921FA76DA006465F5 /* YGValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DAA21FA76DA006465F5 /* YGValue.cpp */; }; + 22962DBA21FA76DA006465F5 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DAB21FA76DA006465F5 /* Utils.cpp */; }; + 22962DBB21FA76DA006465F5 /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22962DAC21FA76DA006465F5 /* YGStyle.cpp */; }; + 22962DBC21FA76DA006465F5 /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DAD21FA76DA006465F5 /* YGStyle.h */; }; + 22962DBD21FA76DA006465F5 /* Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DAE21FA76DA006465F5 /* Utils.h */; }; + 22962DBE21FA76DA006465F5 /* YGValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DAF21FA76DA006465F5 /* YGValue.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22962DBF21FA76DA006465F5 /* YGConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DB021FA76DA006465F5 /* YGConfig.h */; }; + 22962DC121FA76DA006465F5 /* YGNodePrint.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DB221FA76DA006465F5 /* YGNodePrint.h */; }; + 22962DF321FA7EC4006465F5 /* UIView+Yoga.m in Sources */ = {isa = PBXBuildFile; fileRef = 22962DEC21FA7EC4006465F5 /* UIView+Yoga.m */; }; + 22962DF421FA7EC4006465F5 /* UIView+Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DED21FA7EC4006465F5 /* UIView+Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22962DF521FA7EC4006465F5 /* YGLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 22962DEE21FA7EC4006465F5 /* YGLayout.m */; }; + 22962DF721FA7EC4006465F5 /* YGLayout+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DF021FA7EC4006465F5 /* YGLayout+Private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 22962E0A21FA8F1A006465F5 /* YGLayoutExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22962E0921FA8F1A006465F5 /* YGLayoutExtensions.swift */; }; + 22962E0D21FAA5E6006465F5 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 22962DEA21FA7EC4006465F5 /* YGLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22CCC2B121FAAB7700A83111 /* YogaKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 22CCC2B021FAAB7700A83111 /* YogaKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 244F4AB61F818CE000460B54 /* Yoga-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 244F4AB41F818CE000460B54 /* Yoga-internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9D4FF1601E35ABC00029DFF7 /* YGEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D4FF15A1E35ABC00029DFF7 /* YGEnums.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9D4FF1611E35ABC00029DFF7 /* YGMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D4FF15B1E35ABC00029DFF7 /* YGMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9D4FF1651E35ABC00029DFF7 /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D4FF15F1E35ABC00029DFF7 /* Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 22962D9C21FA7654006465F5 /* YGEnums.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGEnums.cpp; path = ../yoga/YGEnums.cpp; sourceTree = ""; }; + 22962D9E21FA7684006465F5 /* Yoga.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Yoga.cpp; path = ../yoga/Yoga.cpp; sourceTree = ""; }; + 22962DA021FA76AB006465F5 /* YGNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGNode.h; path = ../yoga/YGNode.h; sourceTree = ""; }; + 22962DA121FA76AB006465F5 /* YGNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGNode.cpp; path = ../yoga/YGNode.cpp; sourceTree = ""; }; + 22962DA421FA76DA006465F5 /* YGConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGConfig.cpp; path = ../yoga/YGConfig.cpp; sourceTree = ""; }; + 22962DA521FA76DA006465F5 /* YGNodePrint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGNodePrint.cpp; path = ../yoga/YGNodePrint.cpp; sourceTree = ""; }; + 22962DA621FA76DA006465F5 /* YGLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGLayout.cpp; path = ../yoga/YGLayout.cpp; sourceTree = ""; }; + 22962DA721FA76DA006465F5 /* YGFloatOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGFloatOptional.h; path = ../yoga/YGFloatOptional.h; sourceTree = ""; }; + 22962DA821FA76DA006465F5 /* YGMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGMarker.h; path = ../yoga/YGMarker.h; sourceTree = ""; }; + 22962DA921FA76DA006465F5 /* CompactValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompactValue.h; path = ../yoga/CompactValue.h; sourceTree = ""; }; + 22962DAA21FA76DA006465F5 /* YGValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGValue.cpp; path = ../yoga/YGValue.cpp; sourceTree = ""; }; + 22962DAB21FA76DA006465F5 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utils.cpp; path = ../yoga/Utils.cpp; sourceTree = ""; }; + 22962DAC21FA76DA006465F5 /* YGStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGStyle.cpp; path = ../yoga/YGStyle.cpp; sourceTree = ""; }; + 22962DAD21FA76DA006465F5 /* YGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGStyle.h; path = ../yoga/YGStyle.h; sourceTree = ""; }; + 22962DAE21FA76DA006465F5 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../yoga/Utils.h; sourceTree = ""; }; + 22962DAF21FA76DA006465F5 /* YGValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGValue.h; path = ../yoga/YGValue.h; sourceTree = ""; }; + 22962DB021FA76DA006465F5 /* YGConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGConfig.h; path = ../yoga/YGConfig.h; sourceTree = ""; }; + 22962DB121FA76DA006465F5 /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGLayout.h; path = ../yoga/YGLayout.h; sourceTree = ""; }; + 22962DB221FA76DA006465F5 /* YGNodePrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGNodePrint.h; path = ../yoga/YGNodePrint.h; sourceTree = ""; }; + 22962DEA21FA7EC4006465F5 /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGLayout.h; path = Source/YGLayout.h; sourceTree = ""; }; + 22962DEC21FA7EC4006465F5 /* UIView+Yoga.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+Yoga.m"; path = "Source/UIView+Yoga.m"; sourceTree = ""; }; + 22962DED21FA7EC4006465F5 /* UIView+Yoga.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+Yoga.h"; path = "Source/UIView+Yoga.h"; sourceTree = ""; }; + 22962DEE21FA7EC4006465F5 /* YGLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YGLayout.m; path = Source/YGLayout.m; sourceTree = ""; }; + 22962DEF21FA7EC4006465F5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; sourceTree = ""; }; + 22962DF021FA7EC4006465F5 /* YGLayout+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "YGLayout+Private.h"; path = "Source/YGLayout+Private.h"; sourceTree = ""; }; + 22962E0921FA8F1A006465F5 /* YGLayoutExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YGLayoutExtensions.swift; path = Source/YGLayoutExtensions.swift; sourceTree = ""; }; + 22CCC2B021FAAB7700A83111 /* YogaKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YogaKit.h; path = Source/YogaKit.h; sourceTree = ""; }; + 244F4AB41F818CE000460B54 /* Yoga-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Yoga-internal.h"; path = "../yoga/Yoga-internal.h"; sourceTree = ""; }; + 9D4FF1351E35AB150029DFF7 /* YogaKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = YogaKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D4FF15A1E35ABC00029DFF7 /* YGEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGEnums.h; path = ../yoga/YGEnums.h; sourceTree = ""; }; + 9D4FF15B1E35ABC00029DFF7 /* YGMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGMacros.h; path = ../yoga/YGMacros.h; sourceTree = ""; }; + 9D4FF15F1E35ABC00029DFF7 /* Yoga.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Yoga.h; path = ../yoga/Yoga.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 9D4FF1311E35AB150029DFF7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 22962DE921FA7E90006465F5 /* YogaKit */ = { + isa = PBXGroup; + children = ( + 22962DEF21FA7EC4006465F5 /* Info.plist */, + 22962DED21FA7EC4006465F5 /* UIView+Yoga.h */, + 22962DEC21FA7EC4006465F5 /* UIView+Yoga.m */, + 22962DEA21FA7EC4006465F5 /* YGLayout.h */, + 22962DEE21FA7EC4006465F5 /* YGLayout.m */, + 22962DF021FA7EC4006465F5 /* YGLayout+Private.h */, + 22962E0921FA8F1A006465F5 /* YGLayoutExtensions.swift */, + 22CCC2B021FAAB7700A83111 /* YogaKit.h */, + ); + name = YogaKit; + sourceTree = ""; + }; + 9D4FF12B1E35AB150029DFF7 = { + isa = PBXGroup; + children = ( + 9D4FF1591E35ABAB0029DFF7 /* Yoga */, + 22962DE921FA7E90006465F5 /* YogaKit */, + 9D4FF1361E35AB150029DFF7 /* Products */, + ); + sourceTree = ""; + }; + 9D4FF1361E35AB150029DFF7 /* Products */ = { + isa = PBXGroup; + children = ( + 9D4FF1351E35AB150029DFF7 /* YogaKit.framework */, + ); + name = Products; + sourceTree = ""; + }; + 9D4FF1591E35ABAB0029DFF7 /* Yoga */ = { + isa = PBXGroup; + children = ( + 22962DA921FA76DA006465F5 /* CompactValue.h */, + 22962DAB21FA76DA006465F5 /* Utils.cpp */, + 22962DAE21FA76DA006465F5 /* Utils.h */, + 22962DA421FA76DA006465F5 /* YGConfig.cpp */, + 22962DB021FA76DA006465F5 /* YGConfig.h */, + 22962DA721FA76DA006465F5 /* YGFloatOptional.h */, + 22962DA621FA76DA006465F5 /* YGLayout.cpp */, + 22962DB121FA76DA006465F5 /* YGLayout.h */, + 22962DA821FA76DA006465F5 /* YGMarker.h */, + 22962DA521FA76DA006465F5 /* YGNodePrint.cpp */, + 22962DB221FA76DA006465F5 /* YGNodePrint.h */, + 22962DAC21FA76DA006465F5 /* YGStyle.cpp */, + 22962DAD21FA76DA006465F5 /* YGStyle.h */, + 22962DAA21FA76DA006465F5 /* YGValue.cpp */, + 22962DAF21FA76DA006465F5 /* YGValue.h */, + 22962DA121FA76AB006465F5 /* YGNode.cpp */, + 22962DA021FA76AB006465F5 /* YGNode.h */, + 22962D9E21FA7684006465F5 /* Yoga.cpp */, + 22962D9C21FA7654006465F5 /* YGEnums.cpp */, + 244F4AB41F818CE000460B54 /* Yoga-internal.h */, + 9D4FF15A1E35ABC00029DFF7 /* YGEnums.h */, + 9D4FF15B1E35ABC00029DFF7 /* YGMacros.h */, + 9D4FF15F1E35ABC00029DFF7 /* Yoga.h */, + ); + name = Yoga; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 9D4FF1321E35AB150029DFF7 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 9D4FF1611E35ABC00029DFF7 /* YGMacros.h in Headers */, + 9D4FF1601E35ABC00029DFF7 /* YGEnums.h in Headers */, + 9D4FF1651E35ABC00029DFF7 /* Yoga.h in Headers */, + 22962DBE21FA76DA006465F5 /* YGValue.h in Headers */, + 22962DF421FA7EC4006465F5 /* UIView+Yoga.h in Headers */, + 244F4AB61F818CE000460B54 /* Yoga-internal.h in Headers */, + 22962E0D21FAA5E6006465F5 /* YGLayout.h in Headers */, + 22CCC2B121FAAB7700A83111 /* YogaKit.h in Headers */, + 22962DF721FA7EC4006465F5 /* YGLayout+Private.h in Headers */, + 22962DA221FA76AB006465F5 /* YGNode.h in Headers */, + 22962DBD21FA76DA006465F5 /* Utils.h in Headers */, + 22962DB621FA76DA006465F5 /* YGFloatOptional.h in Headers */, + 22962DB821FA76DA006465F5 /* CompactValue.h in Headers */, + 22962DC121FA76DA006465F5 /* YGNodePrint.h in Headers */, + 22962DBC21FA76DA006465F5 /* YGStyle.h in Headers */, + 22962DBF21FA76DA006465F5 /* YGConfig.h in Headers */, + 22962DB721FA76DA006465F5 /* YGMarker.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 9D4FF1341E35AB150029DFF7 /* YogaKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9D4FF1491E35AB150029DFF7 /* Build configuration list for PBXNativeTarget "YogaKit" */; + buildPhases = ( + 9D4FF1301E35AB150029DFF7 /* Sources */, + 9D4FF1311E35AB150029DFF7 /* Frameworks */, + 9D4FF1321E35AB150029DFF7 /* Headers */, + 9D4FF1331E35AB150029DFF7 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = YogaKit; + productName = YogaKit; + productReference = 9D4FF1351E35AB150029DFF7 /* YogaKit.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 9D4FF12C1E35AB150029DFF7 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0820; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 9D4FF1341E35AB150029DFF7 = { + CreatedOnToolsVersion = 8.2.1; + LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 9D4FF12F1E35AB150029DFF7 /* Build configuration list for PBXProject "YogaKit" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 9D4FF12B1E35AB150029DFF7; + productRefGroup = 9D4FF1361E35AB150029DFF7 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 9D4FF1341E35AB150029DFF7 /* YogaKit */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 9D4FF1331E35AB150029DFF7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 9D4FF1301E35AB150029DFF7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22962DB321FA76DA006465F5 /* YGConfig.cpp in Sources */, + 22962DBB21FA76DA006465F5 /* YGStyle.cpp in Sources */, + 22962DA321FA76AB006465F5 /* YGNode.cpp in Sources */, + 22962DF521FA7EC4006465F5 /* YGLayout.m in Sources */, + 22962DB421FA76DA006465F5 /* YGNodePrint.cpp in Sources */, + 22962DB921FA76DA006465F5 /* YGValue.cpp in Sources */, + 22962D9F21FA7684006465F5 /* Yoga.cpp in Sources */, + 22962DF321FA7EC4006465F5 /* UIView+Yoga.m in Sources */, + 22962DB521FA76DA006465F5 /* YGLayout.cpp in Sources */, + 22962E0A21FA8F1A006465F5 /* YGLayoutExtensions.swift in Sources */, + 22962DBA21FA76DA006465F5 /* Utils.cpp in Sources */, + 22962D9D21FA7654006465F5 /* YGEnums.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 9D4FF1471E35AB150029DFF7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + XCODE_PROJECT_BUILD, + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = XCODE_PROJECT_BUILD; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 9D4FF1481E35AB150029DFF7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = XCODE_PROJECT_BUILD; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = XCODE_PROJECT_BUILD; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 9D4FF14A1E35AB150029DFF7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + HEADER_SEARCH_PATHS = ../; + INFOPLIST_FILE = Source/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKit; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + }; + name = Debug; + }; + 9D4FF14B1E35AB150029DFF7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + HEADER_SEARCH_PATHS = ../; + INFOPLIST_FILE = Source/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKit; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 4.2; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 9D4FF12F1E35AB150029DFF7 /* Build configuration list for PBXProject "YogaKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9D4FF1471E35AB150029DFF7 /* Debug */, + 9D4FF1481E35AB150029DFF7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9D4FF1491E35AB150029DFF7 /* Build configuration list for PBXNativeTarget "YogaKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9D4FF14A1E35AB150029DFF7 /* Debug */, + 9D4FF14B1E35AB150029DFF7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 9D4FF12C1E35AB150029DFF7 /* Project object */; +} diff --git a/YogaKit/YogaKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/YogaKit/YogaKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..98dd3194 --- /dev/null +++ b/YogaKit/YogaKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/xcshareddata/xcschemes/YogaKitSample.xcscheme b/YogaKit/YogaKit.xcodeproj/xcshareddata/xcschemes/YogaKit.xcscheme similarity index 59% rename from YogaKit/YogaKitSample/YogaKitSample.xcodeproj/xcshareddata/xcschemes/YogaKitSample.xcscheme rename to YogaKit/YogaKit.xcodeproj/xcshareddata/xcschemes/YogaKit.xcscheme index ca552e2b..8b1528f0 100644 --- a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/xcshareddata/xcschemes/YogaKitSample.xcscheme +++ b/YogaKit/YogaKit.xcodeproj/xcshareddata/xcschemes/YogaKit.xcscheme @@ -14,10 +14,10 @@ buildForAnalyzing = "YES"> + BlueprintIdentifier = "9D4FF1341E35AB150029DFF7" + BuildableName = "YogaKit.framework" + BlueprintName = "YogaKit" + ReferencedContainer = "container:YogaKit.xcodeproj"> @@ -26,26 +26,17 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - + BlueprintIdentifier = "9D4FF1341E35AB150029DFF7" + BuildableName = "YogaKit.framework" + BlueprintName = "YogaKit" + ReferencedContainer = "container:YogaKit.xcodeproj"> @@ -55,22 +46,22 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - + + BlueprintIdentifier = "9D4FF1341E35AB150029DFF7" + BuildableName = "YogaKit.framework" + BlueprintName = "YogaKit" + ReferencedContainer = "container:YogaKit.xcodeproj"> - + @@ -80,16 +71,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> - + + BlueprintIdentifier = "9D4FF1341E35AB150029DFF7" + BuildableName = "YogaKit.framework" + BlueprintName = "YogaKit" + ReferencedContainer = "container:YogaKit.xcodeproj"> - + diff --git a/YogaKit/YogaKitSample/Podfile b/YogaKit/YogaKitSample/Podfile deleted file mode 100644 index ab7eca4d..00000000 --- a/YogaKit/YogaKitSample/Podfile +++ /dev/null @@ -1,6 +0,0 @@ -use_frameworks! - -target 'YogaKitSample' do - pod 'YogaKit', :path => '../../YogaKit.podspec' - pod 'IGListKit', '~> 2.1.0' -end diff --git a/YogaKit/YogaKitSample/Podfile.lock b/YogaKit/YogaKitSample/Podfile.lock deleted file mode 100644 index 8600fade..00000000 --- a/YogaKit/YogaKitSample/Podfile.lock +++ /dev/null @@ -1,26 +0,0 @@ -PODS: - - IGListKit (2.1.0): - - IGListKit/Default (= 2.1.0) - - IGListKit/Default (2.1.0): - - IGListKit/Diffing - - IGListKit/Diffing (2.1.0) - - Yoga (1.7.0) - - YogaKit (1.7.0): - - Yoga (~> 1.7) - -DEPENDENCIES: - - IGListKit (~> 2.1.0) - - YogaKit (from `../../YogaKit.podspec`) - -EXTERNAL SOURCES: - YogaKit: - :path: ../../YogaKit.podspec - -SPEC CHECKSUMS: - IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e - Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c - YogaKit: 31576530e8fcae3175469719ec3212397403330b - -PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404 - -COCOAPODS: 1.1.1 diff --git a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj b/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj deleted file mode 100644 index 01b15da3..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj +++ /dev/null @@ -1,529 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 13687D531DF8748400E7C260 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13687D521DF8748400E7C260 /* Assets.xcassets */; }; - 13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D841DF87D1E00E7C260 /* UIKit.framework */; }; - 13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D861DF87D2400E7C260 /* Foundation.framework */; }; - 15A7CB5995C9DAB1C8803834 /* Pods_YogaKitSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */; }; - 40BD9F461E477A09002790A9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F451E477A09002790A9 /* AppDelegate.swift */; }; - 40BD9F4B1E47850C002790A9 /* BasicViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F4A1E47850C002790A9 /* BasicViewController.swift */; }; - 40BD9F501E479079002790A9 /* SingleLabelCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F4F1E479079002790A9 /* SingleLabelCollectionCell.swift */; }; - 40BD9F521E479173002790A9 /* LayoutInclusionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F511E479173002790A9 /* LayoutInclusionViewController.swift */; }; - 638A94481E1F06D100A726AD /* ExamplesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638A94471E1F06D100A726AD /* ExamplesViewController.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 638A94541E215CC800A726AD /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 13687D3B1DF8748300E7C260 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 13687D421DF8748300E7C260; - remoteInfo = YogaKitSample; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 13687D771DF878A000E7C260 /* yoga */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = include/yoga; - dstSubfolderSpec = 16; - files = ( - ); - name = yoga; - runOnlyForDeploymentPostprocessing = 0; - }; - 13687D7B1DF878CE00E7C260 /* YogaKit */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = include/YogaKit; - dstSubfolderSpec = 16; - files = ( - ); - name = YogaKit; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 13687D431DF8748400E7C260 /* YogaKitSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YogaKitSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13687D521DF8748400E7C260 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 13687D571DF8748400E7C260 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 13687D841DF87D1E00E7C260 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 13687D861DF87D2400E7C260 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YogaKitSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample.debug.xcconfig"; sourceTree = ""; }; - 40BD9F451E477A09002790A9 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 40BD9F4A1E47850C002790A9 /* BasicViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BasicViewController.swift; path = ViewControllers/BasicViewController.swift; sourceTree = ""; }; - 40BD9F4F1E479079002790A9 /* SingleLabelCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SingleLabelCollectionCell.swift; path = Views/SingleLabelCollectionCell.swift; sourceTree = ""; }; - 40BD9F511E479173002790A9 /* LayoutInclusionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LayoutInclusionViewController.swift; path = ViewControllers/LayoutInclusionViewController.swift; sourceTree = ""; }; - 638A94471E1F06D100A726AD /* ExamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamplesViewController.swift; sourceTree = ""; }; - 638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YogaKitSampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YogaKitSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample.release.xcconfig"; sourceTree = ""; }; - C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YogaKitSample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 13687D401DF8748300E7C260 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */, - 13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */, - 15A7CB5995C9DAB1C8803834 /* Pods_YogaKitSample.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 638A944C1E215CC800A726AD /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 13687D3A1DF8748300E7C260 = { - isa = PBXGroup; - children = ( - 13687D451DF8748400E7C260 /* YogaKitSample */, - 13687D441DF8748400E7C260 /* Products */, - 13687D831DF87D1E00E7C260 /* Frameworks */, - E1C759E3C8E84821213ECE8D /* Pods */, - ); - sourceTree = ""; - }; - 13687D441DF8748400E7C260 /* Products */ = { - isa = PBXGroup; - children = ( - 13687D431DF8748400E7C260 /* YogaKitSample.app */, - 638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 13687D451DF8748400E7C260 /* YogaKitSample */ = { - isa = PBXGroup; - children = ( - 40BD9F4E1E47902F002790A9 /* Views */, - 40BD9F481E4784B3002790A9 /* ViewControllers */, - 638A94471E1F06D100A726AD /* ExamplesViewController.swift */, - 13687D521DF8748400E7C260 /* Assets.xcassets */, - 13687D571DF8748400E7C260 /* Info.plist */, - 40BD9F451E477A09002790A9 /* AppDelegate.swift */, - ); - path = YogaKitSample; - sourceTree = ""; - }; - 13687D831DF87D1E00E7C260 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 13687D861DF87D2400E7C260 /* Foundation.framework */, - 13687D841DF87D1E00E7C260 /* UIKit.framework */, - C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 40BD9F481E4784B3002790A9 /* ViewControllers */ = { - isa = PBXGroup; - children = ( - 40BD9F4A1E47850C002790A9 /* BasicViewController.swift */, - 40BD9F511E479173002790A9 /* LayoutInclusionViewController.swift */, - ); - name = ViewControllers; - sourceTree = ""; - }; - 40BD9F4E1E47902F002790A9 /* Views */ = { - isa = PBXGroup; - children = ( - 40BD9F4F1E479079002790A9 /* SingleLabelCollectionCell.swift */, - ); - name = Views; - sourceTree = ""; - }; - E1C759E3C8E84821213ECE8D /* Pods */ = { - isa = PBXGroup; - children = ( - 1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */, - 82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 13687D421DF8748300E7C260 /* YogaKitSample */ = { - isa = PBXNativeTarget; - buildConfigurationList = 13687D5A1DF8748400E7C260 /* Build configuration list for PBXNativeTarget "YogaKitSample" */; - buildPhases = ( - 513B543F92B2E4F4D1EE1CE7 /* [CP] Check Pods Manifest.lock */, - 13687D771DF878A000E7C260 /* yoga */, - 13687D7B1DF878CE00E7C260 /* YogaKit */, - 13687D3F1DF8748300E7C260 /* Sources */, - 13687D401DF8748300E7C260 /* Frameworks */, - 13687D411DF8748300E7C260 /* Resources */, - FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */, - 6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = YogaKitSample; - productName = YogaKitSample; - productReference = 13687D431DF8748400E7C260 /* YogaKitSample.app */; - productType = "com.apple.product-type.application"; - }; - 638A944E1E215CC800A726AD /* YogaKitSampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 638A94561E215CC800A726AD /* Build configuration list for PBXNativeTarget "YogaKitSampleTests" */; - buildPhases = ( - 638A944B1E215CC800A726AD /* Sources */, - 638A944C1E215CC800A726AD /* Frameworks */, - 638A944D1E215CC800A726AD /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 638A94551E215CC800A726AD /* PBXTargetDependency */, - ); - name = YogaKitSampleTests; - productName = YogaKitSampleTests; - productReference = 638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 13687D3B1DF8748300E7C260 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0820; - ORGANIZATIONNAME = facebook; - TargetAttributes = { - 13687D421DF8748300E7C260 = { - CreatedOnToolsVersion = 8.1; - LastSwiftMigration = 0820; - ProvisioningStyle = Automatic; - }; - 638A944E1E215CC800A726AD = { - CreatedOnToolsVersion = 8.2.1; - ProvisioningStyle = Automatic; - TestTargetID = 13687D421DF8748300E7C260; - }; - }; - }; - buildConfigurationList = 13687D3E1DF8748300E7C260 /* Build configuration list for PBXProject "YogaKitSample" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 13687D3A1DF8748300E7C260; - productRefGroup = 13687D441DF8748400E7C260 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 13687D421DF8748300E7C260 /* YogaKitSample */, - 638A944E1E215CC800A726AD /* YogaKitSampleTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 13687D411DF8748300E7C260 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 13687D531DF8748400E7C260 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 638A944D1E215CC800A726AD /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 513B543F92B2E4F4D1EE1CE7 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 13687D3F1DF8748300E7C260 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 40BD9F501E479079002790A9 /* SingleLabelCollectionCell.swift in Sources */, - 40BD9F521E479173002790A9 /* LayoutInclusionViewController.swift in Sources */, - 638A94481E1F06D100A726AD /* ExamplesViewController.swift in Sources */, - 40BD9F4B1E47850C002790A9 /* BasicViewController.swift in Sources */, - 40BD9F461E477A09002790A9 /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 638A944B1E215CC800A726AD /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 638A94551E215CC800A726AD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 13687D421DF8748300E7C260 /* YogaKitSample */; - targetProxy = 638A94541E215CC800A726AD /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 13687D581DF8748400E7C260 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - 13687D591DF8748400E7C260 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 13687D5B1DF8748400E7C260 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = YogaKitSample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - 13687D5C1DF8748400E7C260 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - INFOPLIST_FILE = YogaKitSample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; - 638A94571E215CC800A726AD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = YogaKitSampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YogaKitSample.app/YogaKitSample"; - }; - name = Debug; - }; - 638A94581E215CC800A726AD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = YogaKitSampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YogaKitSample.app/YogaKitSample"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 13687D3E1DF8748300E7C260 /* Build configuration list for PBXProject "YogaKitSample" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 13687D581DF8748400E7C260 /* Debug */, - 13687D591DF8748400E7C260 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 13687D5A1DF8748400E7C260 /* Build configuration list for PBXNativeTarget "YogaKitSample" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 13687D5B1DF8748400E7C260 /* Debug */, - 13687D5C1DF8748400E7C260 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 638A94561E215CC800A726AD /* Build configuration list for PBXNativeTarget "YogaKitSampleTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 638A94571E215CC800A726AD /* Debug */, - 638A94581E215CC800A726AD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 13687D3B1DF8748300E7C260 /* Project object */; -} diff --git a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index cee8ad8b..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/YogaKit/YogaKitSample/YogaKitSample.xcworkspace/contents.xcworkspacedata b/YogaKit/YogaKitSample/YogaKitSample.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index ad8697b8..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - diff --git a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift b/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift deleted file mode 100644 index 861adeca..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -import Foundation -import UIKit - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - var window: UIWindow? - - func applicationDidFinishLaunching(_ application: UIApplication) { - self.window = UIWindow(frame: UIScreen.main.bounds) - if let window = self.window { - let navigationController = UINavigationController(rootViewController: ExamplesViewController()) - navigationController.navigationBar.isTranslucent = false - - window.rootViewController = navigationController - window.backgroundColor = .white - window.makeKeyAndVisible() - } - } -} diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6c654c33..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Yoga-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Yoga-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Yoga-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Yoga-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Yoga-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Yoga-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Yoga-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "Yoga-57x57@1x.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "Yoga-57x57@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Yoga-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Yoga-60x60@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-20x20@2x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-20x20@2x.png deleted file mode 100644 index bb33d6ef..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-20x20@2x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-20x20@3x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-20x20@3x.png deleted file mode 100644 index 75f037eb..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-20x20@3x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@1x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@1x.png deleted file mode 100644 index eace0a4e..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@1x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@2x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@2x.png deleted file mode 100644 index 21b04757..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@2x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@3x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@3x.png deleted file mode 100644 index b137f973..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-29x29@3x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-40x40@2x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-40x40@2x.png deleted file mode 100644 index 756f1731..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-40x40@2x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-40x40@3x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-40x40@3x.png deleted file mode 100644 index 6a0f2cc1..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-40x40@3x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-57x57@1x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-57x57@1x.png deleted file mode 100644 index c78286f9..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-57x57@1x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-57x57@2x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-57x57@2x.png deleted file mode 100644 index a41ef252..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-57x57@2x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-60x60@2x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-60x60@2x.png deleted file mode 100644 index 6a0f2cc1..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-60x60@2x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-60x60@3x.png b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-60x60@3x.png deleted file mode 100644 index e9ce1e70..00000000 Binary files a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Yoga-60x60@3x.png and /dev/null differ diff --git a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/Contents.json b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/Contents.json deleted file mode 100644 index 2d92bd53..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift b/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift deleted file mode 100644 index 38ee2618..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -import UIKit -import IGListKit - -private final class ExampleModel { - let title: String - let controllerClass: UIViewController.Type - - init(title: String, controllerClass: UIViewController.Type) { - self.title = title - self.controllerClass = controllerClass - } -} - -extension ExampleModel: IGListDiffable { - fileprivate func diffIdentifier() -> NSObjectProtocol { - return title as NSString - } - - fileprivate func isEqual(toDiffableObject object: IGListDiffable?) -> Bool { - guard let otherObj = object as? ExampleModel else { return false } - - return (title == otherObj.title) && - (controllerClass == otherObj.controllerClass) - } -} - -final class ExamplesViewController: UIViewController, IGListAdapterDataSource, IGListSingleSectionControllerDelegate { - private lazy var adapter: IGListAdapter = { - return IGListAdapter(updater: IGListAdapterUpdater(), viewController: self, workingRangeSize: 0) - }() - private let collectionView = IGListCollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout()) - - - // Update this to array to create more examples. - private let models: [ExampleModel] = [ExampleModel(title: "Basic Layout", controllerClass: BasicViewController.self), - ExampleModel(title: "Exclude Views in Layout", controllerClass: LayoutInclusionViewController.self)] - - //MARK: UIViewController - - override func viewDidLoad() { - super.viewDidLoad() - title = "Examples" - view.addSubview(collectionView) - adapter.collectionView = collectionView - adapter.dataSource = self - } - - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - collectionView.frame = view.bounds - } - - //MARK: IGListAdapterDataSource - - func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] { - return models as [IGListDiffable] - } - - func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController { - let sizeBlock: IGListSingleSectionCellSizeBlock = { (model, context) in - return CGSize(width: (context?.containerSize.width)!, height: 75.0) - } - - let configureBlock: IGListSingleSectionCellConfigureBlock = { (model, cell) in - guard let m = model as? ExampleModel, let c = cell as? SingleLabelCollectionCell else { - return - } - - c.label.text = m.title - } - - let sectionController = IGListSingleSectionController(cellClass: SingleLabelCollectionCell.self, - configureBlock: configureBlock, - sizeBlock: sizeBlock) - sectionController.selectionDelegate = self - return sectionController - } - - func emptyView(for listAdapter: IGListAdapter) -> UIView? { return nil } - - //MARK: IGListSingleSectionControllerDelegate - - func didSelect(_ sectionController: IGListSingleSectionController) { - let section = adapter.section(for: sectionController) - let model = models[section] - - let controller = model.controllerClass.init() - controller.title = model.title - - self.navigationController?.pushViewController(controller, animated: true) - } -} diff --git a/YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift b/YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift deleted file mode 100644 index 5a402af8..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -import UIKit -import IGListKit -import YogaKit - -struct DemoItem { - let name: String - root.backgroundColor = .red - root.yoga.isEnabled = true - root.yoga.width = YGValue(self.view.bounds.size.width) - root.yoga.height = YGValue(self.view.bounds.size.height) - root.yoga.alignItems = .center -} - -final class SwiftViewController: UIViewController, IGListAdapterDataSource { - - lazy var adapter: IGListAdapter = { - return IGListAdapter(updater: IGListAdapterUpdater(), viewController: self, workingRangeSize: 0) - }() - let collectionView = IGListCollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout()) - - //MARK: UIViewController - - override func viewDidLoad() { - super.viewDidLoad() - title = "YogaKit Examples" - view.addSubview(collectionView) - adapter.collectionView = collectionView - adapter.dataSource = self - } - - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - collectionView.frame = view.bounds - } - - - //MARK: IGListAdapterDataSource - - func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] { - return ["Dustin" as IGListDiffable, "Ryan" as IGListDiffable] - } - - func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController { - let sizeBlock: IGListSingleSectionCellSizeBlock = { (model, context) in - return CGSize(width: (context?.containerSize.width)!, height: 100.0) - } - let configureBlock: IGListSingleSectionCellConfigureBlock = { (model, cell) in - guard let m = model as? String else { - return - } - - cell.backgroundColor = (m == "Dustin") ? .blue : .red - } - - return IGListSingleSectionController(cellClass: UICollectionViewCell.self, - configureBlock: configureBlock, - sizeBlock: sizeBlock) - } - - func emptyView(for listAdapter: IGListAdapter) -> UIView? { - return nil - } -} diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewController.m b/YogaKit/YogaKitSample/YogaKitSample/ViewController.m deleted file mode 100644 index f95dab48..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/ViewController.m +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -#import "ViewController.h" - -#import - -@implementation ViewController - -- (void)viewDidLoad -{ - UIView *root = self.view; - root.backgroundColor = [UIColor redColor]; - root.yoga.isEnabled = YES; - root.yoga.width = YGPointValue(self.view.bounds.size.width); - root.yoga.height = YGPointValue(self.view.bounds.size.height); - root.yoga.alignItems = YGAlignCenter; - root.yoga.justifyContent = YGJustifyCenter; - - UIView *child1 = [UIView new]; - child1.backgroundColor = [UIColor blueColor]; - child1.yoga.isEnabled = YES; - child1.yoga.width = YGPointValue(100); - child1.yoga.height = YGPointValue(100); - - UIView *child2 = [UIView new]; - child2.backgroundColor = [UIColor greenColor]; - child2.frame = (CGRect) { - .size = { - .width = 200, - .height = 100, - } - }; - - UIView *child3 = [UIView new]; - child3.backgroundColor = [UIColor yellowColor]; - child3.frame = (CGRect) { - .size = { - .width = 100, - .height = 100, - } - }; - - [child2 addSubview:child3]; - [root addSubview:child1]; - [root addSubview:child2]; - [root.yoga applyLayoutPreservingOrigin:NO]; -} - - -@end diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift deleted file mode 100644 index 234cee31..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -import UIKit -import YogaKit - -final class BasicViewController: UIViewController { - override func viewDidLoad() { - let containerSize = self.view.bounds.size - - let root = self.view! - root.backgroundColor = .white - root.configureLayout { (layout) in - layout.isEnabled = true - layout.width = YGValue(containerSize.width) - layout.height = YGValue(containerSize.height) - layout.alignItems = .center - layout.justifyContent = .center - } - - let child1 = UIView() - child1.backgroundColor = .blue - child1.configureLayout { (layout) in - layout.isEnabled = true - layout.width = 100 - layout.height = 10 - layout.marginBottom = 25 - } - root.addSubview(child1) - - let child2 = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200)) - child2.backgroundColor = .green - child2.configureLayout { (layout) in - layout.isEnabled = true - layout.alignSelf = .flexEnd - } - root.addSubview(child2) - - let child3 = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 100)) - child3.backgroundColor = .yellow - child3.configureLayout { (layout) in - layout.isEnabled = true - layout.alignSelf = .flexStart - } - root.addSubview(child3) - - root.yoga.applyLayout(preservingOrigin: true) - } -} diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift deleted file mode 100644 index ce062402..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -import UIKit -import YogaKit - -final class LayoutInclusionViewController: UIViewController { - private let button: UIButton = UIButton(type: .system) - private let disappearingView: UIView = UIView(frame: .zero) - private let contentView: UIView = UIView(frame: .zero) - - override func viewDidLoad() { - let root = self.view! - root.backgroundColor = .white - root.configureLayout { (layout) in - layout.isEnabled = true - layout.flexDirection = .column - layout.justifyContent = .spaceAround - } - - contentView.backgroundColor = .clear - contentView.layer.borderColor = UIColor.lightGray.cgColor - contentView.layer.borderWidth = 1.0 - contentView.configureLayout { (layout) in - layout.isEnabled = true - layout.height = 300 - layout.width = YGValue(self.view.bounds.size.width) - layout.flexDirection = .row - layout.justifyContent = .center - layout.paddingHorizontal = 25 - } - self.view.addSubview(contentView) - - let redView = UIView(frame: .zero) - redView.backgroundColor = .red - redView.configureLayout { (layout) in - layout.isEnabled = true - layout.flexGrow = 1 - layout.flexShrink = 1 - } - contentView.addSubview(redView) - - disappearingView.backgroundColor = .blue - disappearingView.configureLayout { (layout) in - layout.isEnabled = true - layout.flexGrow = 1 - } - contentView.addSubview(disappearingView) - - button.setTitle("Add Blue View", for: UIControlState.selected) - button.setTitle("Remove Blue View", for: UIControlState.normal) - button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside) - button.configureLayout { (layout) in - layout.isEnabled = true - layout.height = 300 - layout.width = 300 - layout.alignSelf = .center - } - root.addSubview(button) - - root.yoga.applyLayout(preservingOrigin: false) - } - - // MARK - UIButton Action - func buttonWasTapped() { - button.isSelected = !button.isSelected - - button.isUserInteractionEnabled = false - disappearingView.yoga.isIncludedInLayout = !disappearingView.yoga.isIncludedInLayout - disappearingView.isHidden = !disappearingView.isHidden - - contentView.yoga.applyLayout(preservingOrigin: true) - button.isUserInteractionEnabled = true - } -} diff --git a/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift b/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift deleted file mode 100644 index 5f469886..00000000 --- a/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright 2014-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the license found in the - * LICENSE-examples file in the root directory of this source tree. - */ - -import UIKit -import YogaKit - -final class SingleLabelCollectionCell: UICollectionViewCell { - let label: UILabel = UILabel(frame: .zero) - - override init(frame: CGRect) { - super.init(frame: frame) - - contentView.configureLayout { (layout) in - layout.isEnabled = true - layout.flexDirection = .column - layout.justifyContent = .flexEnd - } - - label.textAlignment = .center - label.numberOfLines = 1 - label.yoga.isIncludedInLayout = false - contentView.addSubview(label) - - let border = UIView(frame: .zero) - border.backgroundColor = .lightGray - border.configureLayout { (layout) in - layout.isEnabled = true - layout.height = 0.5 - layout.marginHorizontal = 25 - } - contentView.addSubview(border) - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - override func layoutSubviews() { - super.layoutSubviews() - - contentView.yoga.applyLayout(preservingOrigin: false) - label.frame = contentView.bounds - } -} diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp index 357e137b..3dac33fa 100644 --- a/yoga/Yoga.cpp +++ b/yoga/Yoga.cpp @@ -385,10 +385,6 @@ void YGNodeInsertChild( const YGNodeRef node, const YGNodeRef child, const uint32_t index) { - YGAssertWithNode( - node, - child->getOwner() == nullptr, - "Child already has a owner, it must be removed first."); YGAssertWithNode( node,