diff --git a/.gitignore b/.gitignore index c964cd8..c17d573 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +# OS X +.DS_Store + # Xcode -# build/ *.pbxuser !default.pbxuser @@ -17,10 +19,8 @@ DerivedData *.ipa *.xcuserstate -# CocoaPods -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -#Pods/ +# Bundler +.bundle + +# AppCode +.idea/ diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index b3a7005..8801d72 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -13,14 +13,42 @@ 48F3CBCF1AE738D3008CCACA /* FDTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 48F3CBCA1AE738D3008CCACA /* FDTableViewCell.m */; }; 48F3CBD01AE738D3008CCACA /* FDTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 48F3CBCC1AE738D3008CCACA /* FDTableViewController.m */; }; 48F3CBD31AE738F9008CCACA /* FDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 48F3CBD21AE738F9008CCACA /* FDViewController.m */; }; - 48FC0BF51AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FC0BF41AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m */; }; 4A40B0971ADCE7620018D61D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A40B0961ADCE7620018D61D /* main.m */; }; 4A40B09A1ADCE7620018D61D /* FDAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A40B0991ADCE7620018D61D /* FDAppDelegate.m */; }; 4A40B0A21ADCE7620018D61D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A40B0A11ADCE7620018D61D /* Images.xcassets */; }; 4A40B0A51ADCE7620018D61D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4A40B0A31ADCE7620018D61D /* LaunchScreen.xib */; }; 4A40B0C81ADCE8120018D61D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A40B0C71ADCE8120018D61D /* Main.storyboard */; }; + 6180C4191C7C37DF00E3003B /* FDCollapsibleConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 6180C4181C7C37DF00E3003B /* FDCollapsibleConstraints.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6180C41D1C7C37DF00E3003B /* FDCollapsibleConstraints.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6180C4161C7C37DF00E3003B /* FDCollapsibleConstraints.framework */; }; + 6180C41E1C7C37DF00E3003B /* FDCollapsibleConstraints.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6180C4161C7C37DF00E3003B /* FDCollapsibleConstraints.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 6180C4241C7C380400E3003B /* UIView+FDCollapsibleConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FC0BF31AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6180C4251C7C380900E3003B /* UIView+FDCollapsibleConstraints.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FC0BF41AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 6180C41B1C7C37DF00E3003B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A40B0891ADCE7620018D61D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 6180C4151C7C37DF00E3003B; + remoteInfo = FDCollapsibleConstraints; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 6180C4221C7C37DF00E3003B /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 6180C41E1C7C37DF00E3003B /* FDCollapsibleConstraints.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 48F3CBB21AE62255008CCACA /* UITableView+FDTemplateLayoutCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITableView+FDTemplateLayoutCell.h"; sourceTree = ""; }; 48F3CBB31AE62255008CCACA /* UITableView+FDTemplateLayoutCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITableView+FDTemplateLayoutCell.m"; sourceTree = ""; }; @@ -33,8 +61,8 @@ 48F3CBCC1AE738D3008CCACA /* FDTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FDTableViewController.m; sourceTree = ""; }; 48F3CBD11AE738F9008CCACA /* FDViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FDViewController.h; sourceTree = ""; }; 48F3CBD21AE738F9008CCACA /* FDViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FDViewController.m; sourceTree = ""; }; - 48FC0BF31AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+FDCollapsibleConstraints.h"; sourceTree = ""; }; - 48FC0BF41AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+FDCollapsibleConstraints.m"; sourceTree = ""; }; + 48FC0BF31AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+FDCollapsibleConstraints.h"; path = "../../Classes/UIView+FDCollapsibleConstraints.h"; sourceTree = ""; }; + 48FC0BF41AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+FDCollapsibleConstraints.m"; path = "../../Classes/UIView+FDCollapsibleConstraints.m"; sourceTree = ""; }; 4A40B0911ADCE7620018D61D /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4A40B0951ADCE7620018D61D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4A40B0961ADCE7620018D61D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -43,10 +71,21 @@ 4A40B0A11ADCE7620018D61D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 4A40B0A41ADCE7620018D61D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 4A40B0C71ADCE8120018D61D /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + 6180C4161C7C37DF00E3003B /* FDCollapsibleConstraints.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FDCollapsibleConstraints.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6180C4181C7C37DF00E3003B /* FDCollapsibleConstraints.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FDCollapsibleConstraints.h; sourceTree = ""; }; + 6180C41A1C7C37DF00E3003B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ 4A40B08E1ADCE7620018D61D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6180C41D1C7C37DF00E3003B /* FDCollapsibleConstraints.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 6180C4121C7C37DF00E3003B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -87,20 +126,11 @@ path = "View Demo"; sourceTree = ""; }; - 48FC0BF21AE20ED500ECA845 /* FDCollapsibleConstraints */ = { - isa = PBXGroup; - children = ( - 48FC0BF31AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.h */, - 48FC0BF41AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m */, - ); - name = FDCollapsibleConstraints; - path = ../../Classes; - sourceTree = ""; - }; 4A40B0881ADCE7620018D61D = { isa = PBXGroup; children = ( 4A40B0931ADCE7620018D61D /* Demo */, + 6180C4171C7C37DF00E3003B /* FDCollapsibleConstraints */, 4A40B0921ADCE7620018D61D /* Products */, ); sourceTree = ""; @@ -109,6 +139,7 @@ isa = PBXGroup; children = ( 4A40B0911ADCE7620018D61D /* Demo.app */, + 6180C4161C7C37DF00E3003B /* FDCollapsibleConstraints.framework */, ); name = Products; sourceTree = ""; @@ -119,7 +150,6 @@ 48F3CBC61AE738D3008CCACA /* Cell Demo */, 48F3CBCD1AE738D3008CCACA /* View Demo */, 48F3CBB11AE62255008CCACA /* UITableView+FDTemplateLayoutCell */, - 48FC0BF21AE20ED500ECA845 /* FDCollapsibleConstraints */, 4A40B0C71ADCE8120018D61D /* Main.storyboard */, 4A40B0981ADCE7620018D61D /* FDAppDelegate.h */, 4A40B0991ADCE7620018D61D /* FDAppDelegate.m */, @@ -140,8 +170,39 @@ name = "Supporting Files"; sourceTree = ""; }; + 6180C4171C7C37DF00E3003B /* FDCollapsibleConstraints */ = { + isa = PBXGroup; + children = ( + 48FC0BF31AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.h */, + 48FC0BF41AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m */, + 6180C4231C7C37E700E3003B /* Supporting Files */, + ); + path = FDCollapsibleConstraints; + sourceTree = ""; + }; + 6180C4231C7C37E700E3003B /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 6180C41A1C7C37DF00E3003B /* Info.plist */, + 6180C4181C7C37DF00E3003B /* FDCollapsibleConstraints.h */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 6180C4131C7C37DF00E3003B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 6180C4191C7C37DF00E3003B /* FDCollapsibleConstraints.h in Headers */, + 6180C4241C7C380400E3003B /* UIView+FDCollapsibleConstraints.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 4A40B0901ADCE7620018D61D /* Demo */ = { isa = PBXNativeTarget; @@ -150,16 +211,36 @@ 4A40B08D1ADCE7620018D61D /* Sources */, 4A40B08E1ADCE7620018D61D /* Frameworks */, 4A40B08F1ADCE7620018D61D /* Resources */, + 6180C4221C7C37DF00E3003B /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( + 6180C41C1C7C37DF00E3003B /* PBXTargetDependency */, ); name = Demo; productName = Demo; productReference = 4A40B0911ADCE7620018D61D /* Demo.app */; productType = "com.apple.product-type.application"; }; + 6180C4151C7C37DF00E3003B /* FDCollapsibleConstraints */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6180C4211C7C37DF00E3003B /* Build configuration list for PBXNativeTarget "FDCollapsibleConstraints" */; + buildPhases = ( + 6180C4111C7C37DF00E3003B /* Sources */, + 6180C4121C7C37DF00E3003B /* Frameworks */, + 6180C4131C7C37DF00E3003B /* Headers */, + 6180C4141C7C37DF00E3003B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = FDCollapsibleConstraints; + productName = FDCollapsibleConstraints; + productReference = 6180C4161C7C37DF00E3003B /* FDCollapsibleConstraints.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -172,6 +253,9 @@ 4A40B0901ADCE7620018D61D = { CreatedOnToolsVersion = 6.3; }; + 6180C4151C7C37DF00E3003B = { + CreatedOnToolsVersion = 7.2.1; + }; }; }; buildConfigurationList = 4A40B08C1ADCE7620018D61D /* Build configuration list for PBXProject "Demo" */; @@ -188,6 +272,7 @@ projectRoot = ""; targets = ( 4A40B0901ADCE7620018D61D /* Demo */, + 6180C4151C7C37DF00E3003B /* FDCollapsibleConstraints */, ); }; /* End PBXProject section */ @@ -204,6 +289,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6180C4141C7C37DF00E3003B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -214,7 +306,6 @@ 48F3CBD01AE738D3008CCACA /* FDTableViewController.m in Sources */, 48F3CBB41AE62255008CCACA /* UITableView+FDTemplateLayoutCell.m in Sources */, 48F3CBCF1AE738D3008CCACA /* FDTableViewCell.m in Sources */, - 48FC0BF51AE20ED500ECA845 /* UIView+FDCollapsibleConstraints.m in Sources */, 4A40B09A1ADCE7620018D61D /* FDAppDelegate.m in Sources */, 4A40B0971ADCE7620018D61D /* main.m in Sources */, 48F3CBD31AE738F9008CCACA /* FDViewController.m in Sources */, @@ -222,8 +313,24 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6180C4111C7C37DF00E3003B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6180C4251C7C380900E3003B /* UIView+FDCollapsibleConstraints.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 6180C41C1C7C37DF00E3003B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 6180C4151C7C37DF00E3003B /* FDCollapsibleConstraints */; + targetProxy = 6180C41B1C7C37DF00E3003B /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 4A40B0A31ADCE7620018D61D /* LaunchScreen.xib */ = { isa = PBXVariantGroup; @@ -336,6 +443,50 @@ }; name = Release; }; + 6180C41F1C7C37DF00E3003B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTABILITY = YES; + INFOPLIST_FILE = FDCollapsibleConstraints/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.redesignapp.FDCollapsibleConstraints; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 6180C4201C7C37DF00E3003B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = FDCollapsibleConstraints/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.redesignapp.FDCollapsibleConstraints; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -357,6 +508,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 6180C4211C7C37DF00E3003B /* Build configuration list for PBXNativeTarget "FDCollapsibleConstraints" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6180C41F1C7C37DF00E3003B /* Debug */, + 6180C4201C7C37DF00E3003B /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 4A40B0891ADCE7620018D61D /* Project object */; diff --git a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/FDCollapsibleConstraints.xcscheme b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/FDCollapsibleConstraints.xcscheme new file mode 100644 index 0000000..48ba7d2 --- /dev/null +++ b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/FDCollapsibleConstraints.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Demo/Demo/Cell Demo/FDTableViewCell.m b/Demo/Demo/Cell Demo/FDTableViewCell.m index 5868ecb..548b024 100644 --- a/Demo/Demo/Cell Demo/FDTableViewCell.m +++ b/Demo/Demo/Cell Demo/FDTableViewCell.m @@ -8,7 +8,7 @@ #import "FDTableViewCell.h" #import "FDListEntity.h" -#import "UIView+FDCollapsibleConstraints.h" +#import @interface FDTableViewCell () diff --git a/Demo/Demo/View Demo/FDViewController.m b/Demo/Demo/View Demo/FDViewController.m index 17869be..e60695b 100644 --- a/Demo/Demo/View Demo/FDViewController.m +++ b/Demo/Demo/View Demo/FDViewController.m @@ -7,7 +7,7 @@ // #import "FDViewController.h" -#import "UIView+FDCollapsibleConstraints.h" +#import @interface FDViewController () diff --git a/Demo/FDCollapsibleConstraints/FDCollapsibleConstraints.h b/Demo/FDCollapsibleConstraints/FDCollapsibleConstraints.h new file mode 100644 index 0000000..e11e6e8 --- /dev/null +++ b/Demo/FDCollapsibleConstraints/FDCollapsibleConstraints.h @@ -0,0 +1,20 @@ +// +// FDCollapsibleConstraints.h +// FDCollapsibleConstraints +// +// Created by Shannon Wu on 2/23/16. +// Copyright © 2016 Phil. All rights reserved. +// + +#import + +//! Project version number for FDCollapsibleConstraints. +FOUNDATION_EXPORT double FDCollapsibleConstraintsVersionNumber; + +//! Project version string for FDCollapsibleConstraints. +FOUNDATION_EXPORT const unsigned char FDCollapsibleConstraintsVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + +#import \ No newline at end of file diff --git a/Demo/FDCollapsibleConstraints/Info.plist b/Demo/FDCollapsibleConstraints/Info.plist new file mode 100644 index 0000000..d3de8ee --- /dev/null +++ b/Demo/FDCollapsibleConstraints/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + +