diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..464c1b3 Binary files /dev/null and b/.DS_Store differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 3485c8b..a52e09b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ Preview ======= -Snappy is currently in preview and regular Changelogs will be provided as it comes out of preview into production quality code. \ No newline at end of file +Snap is currently in preview and regular Changelogs will be provided as it comes out of preview into production quality code. \ No newline at end of file diff --git a/CodeSnippets/Snappy Constraint Make.codesnippet b/CodeSnippets/Snappy Constraint Make.codesnippet index 35bf0b8..598f6b3 100644 --- a/CodeSnippets/Snappy Constraint Make.codesnippet +++ b/CodeSnippets/Snappy Constraint Make.codesnippet @@ -17,7 +17,7 @@ IDECodeSnippetLanguage Xcode.SourceCodeLanguage.Swift IDECodeSnippetTitle - Snappy Constraint Make + Snap Constraint Make IDECodeSnippetUserSnippet IDECodeSnippetVersion diff --git a/CodeSnippets/Snappy Constraint Remake.codesnippet b/CodeSnippets/Snappy Constraint Remake.codesnippet index 3b28109..8bdfb9d 100644 --- a/CodeSnippets/Snappy Constraint Remake.codesnippet +++ b/CodeSnippets/Snappy Constraint Remake.codesnippet @@ -17,7 +17,7 @@ IDECodeSnippetLanguage Xcode.SourceCodeLanguage.Swift IDECodeSnippetTitle - Snappy Constraint Remake + Snap Constraint Remake IDECodeSnippetUserSnippet IDECodeSnippetVersion diff --git a/LICENSE b/LICENSE index 15f29e1..34c7a18 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ // // Constraint.swift -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/README.md b/README.md index a8d7488..a140568 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Snappy +# Snap -Snappy is a light-weight layout framework which wraps AutoLayout with a nicer syntax. Snappy has its own layout DSL which provides a chainable way of describing your NSLayoutConstraints which results in layout code that is more concise and readable. Snappy supports both iOS and OS X. +Snap is a light-weight layout framework which wraps AutoLayout with a nicer syntax. Snap has its own layout DSL which provides a chainable way of describing your NSLayoutConstraints which results in layout code that is more concise and readable. Snap supports both iOS and OS X. -> Snappy uses some Swift-only features like function overloading, so it cannot be used from Objective-C. Because of this we’ve chosen to swap prefixes from Masonry’s `mas_` to `snp_` so you can use both Masonry and Snappy in the same project. +> Snap uses some Swift-only features like function overloading, so it cannot be used from Objective-C. Because of this we’ve chosen to swap prefixes from Masonry’s `mas_` to `snp_` so you can use both Masonry and Snap in the same project. ## Requirements @@ -11,21 +11,21 @@ Snappy is a light-weight layout framework which wraps AutoLayout with a nicer sy ## Installation -_Due to the current lack of [proper infrastructure](http://cocoapods.org) for Swift dependency management, using Snappy in your project requires the following steps:_ +_Due to the current lack of [proper infrastructure](http://cocoapods.org) for Swift dependency management, using Snap in your project requires the following steps:_ -1. Add Snappy as a [submodule](http://git-scm.com/docs/git-submodule) by opening the Terminal, `cd`-ing into your top-level project directory, and entering the command `git submodule add https://github.com/Masonry/Snappy.git` -2. Open the `Snappy` folder, and drag `Snappy.xcodeproj` into the file navigator of your Xcode project1. +1. Add Snap as a [submodule](http://git-scm.com/docs/git-submodule) by opening the Terminal, `cd`-ing into your top-level project directory, and entering the command `git submodule add https://github.com/Masonry/Snap.git` +2. Open the `Snap` folder, and drag `Snap.xcodeproj` into the file navigator of your Xcode project1. 3. In Xcode, navigate to the target configuration window by clicking on the blue project icon, and selecting the application target under the "Targets" heading in the sidebar. 4. In the tab bar at the top of that window, open the "General" panel. -5. Click on the `+` button in the "Embedded Binaries" group of the panel and select and add `Snappy.framework`. +5. Click on the `+` button in the "Embedded Binaries" group of the panel and select and add `Snap.framework`. -1It's important you add Snappy as a subproject of your Xcode Project and not of a potential Xcode Workspace containing your project +1It's important you add Snap as a subproject of your Xcode Project and not of a potential Xcode Workspace containing your project ## Installation (Cocoapods pre-release) -1. Add Snappy as a line in your Podfile `pod 'Snappy', :git => 'https://github.com/Masonry/Snappy.git'` +1. Add Snap as a line in your Podfile `pod 'Snap', :git => 'https://github.com/Masonry/Snap.git'` 2. Run `pod install` -3. Add `import Snappy` to your `AppDelegate.swift` +3. Add `import Snap` to your `AppDelegate.swift` ## What's wrong with NSLayoutConstraints? @@ -108,9 +108,9 @@ view1.snp_makeConstraints { make in ``` Also note in the first example we had to add the constraints to the superview `superview.addConstraints`. -Snappy however will automagically add constraints to the appropriate view. +Snap however will automagically add constraints to the appropriate view. -Snappy will also call `view1.setTranslatesAutoresizingMaskIntoConstraints(false)` for you. +Snap will also call `view1.setTranslatesAutoresizingMaskIntoConstraints(false)` for you. ## Not all things are created equal @@ -162,7 +162,7 @@ make.width.lessThanOrEqualTo(400) ``` However Auto Layout does not allow alignment attributes such as left, right, centerY etc to be set to constant values. -So if you pass a primitive for these attributes Snappy will turn these into constraints relative to the view’s superview ie: +So if you pass a primitive for these attributes Snap will turn these into constraints relative to the view’s superview ie: ```swift // creates view.left <= view.superview.left + 10 make.left.lessThanOrEqualTo(10) @@ -196,7 +196,7 @@ make.top.equalTo(label.snp_top).with.priority(600); ## Composition, composition, composition -Snappy also gives you a few convenience methods which create multiple constraints at the same time. +Snap also gives you a few convenience methods which create multiple constraints at the same time. #### edges @@ -240,7 +240,7 @@ make.top.equalTo(otherView) ## Hold on for dear life Sometimes you need modify existing constraints in order to animate or remove/replace constraints. -In Snappy there are a few different approaches to updating constraints. +In Snap there are a few different approaches to updating constraints. #### 1. References You can hold on to a reference of a particular constraint by assigning the result of a constraint make expression to a local variable or a class property. @@ -265,7 +265,7 @@ self.topConstraint.uninstall() ### 2. snp_remakeConstraints -`snp_remakeConstraints` is similar to `snp_makeConstraints`, but will first remove all existing constraints installed by Snappy. +`snp_remakeConstraints` is similar to `snp_makeConstraints`, but will first remove all existing constraints installed by Snap. ```swift func changeButtonPosition() { @@ -284,7 +284,7 @@ func changeButtonPosition() { ## Code Snippets -Copy the included code snippets to ``~/Library/Developer/Xcode/UserData/CodeSnippets`` to write your snappy closures at lightning speed! +Copy the included code snippets to ``~/Library/Developer/Xcode/UserData/CodeSnippets`` to write your snap closures at lightning speed! `snp_make` -> `.snp_makeConstraints { make in }` diff --git a/Snappy.podspec b/Snap.podspec similarity index 65% rename from Snappy.podspec rename to Snap.podspec index 4c365df..84865cf 100644 --- a/Snappy.podspec +++ b/Snap.podspec @@ -1,15 +1,15 @@ Pod::Spec.new do |s| - s.name = 'Snappy' + s.name = 'Snap' s.version = '0.0.1' s.license = 'MIT' s.summary = 'Harness the power of auto layout with a simplified, chainable, and compile time safe syntax.' - s.homepage = 'https://github.com/Masonry/Snappy' + s.homepage = 'https://github.com/Masonry/Snap' s.authors = { 'Robert Payne' => 'robertpayne@me.com' } s.social_media_url = 'http://twitter.com/robertjpayne' - s.source = { :git => 'https://github.com/Masonry/Snappy.git', :tag => '0.0.1' } + s.source = { :git => 'https://github.com/Masonry/Snap.git', :tag => '0.0.1' } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' - s.source_files = 'Snappy/*.swift' + s.source_files = 'Snap/*.swift' end \ No newline at end of file diff --git a/Snappy.xcodeproj/project.pbxproj b/Snap.xcodeproj/project.pbxproj similarity index 85% rename from Snappy.xcodeproj/project.pbxproj rename to Snap.xcodeproj/project.pbxproj index 7023d69..d6151c3 100644 --- a/Snappy.xcodeproj/project.pbxproj +++ b/Snap.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ EEBCC9F019CC64F80083B827 /* EdgeInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCC9EF19CC64F70083B827 /* EdgeInsets.swift */; }; - EEBCC9F219CC65050083B827 /* View+Snappy.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCC9F119CC65040083B827 /* View+Snappy.swift */; }; + EEBCC9F219CC65050083B827 /* View+Snap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCC9F119CC65040083B827 /* View+Snap.swift */; }; EEBCC9F419CC65110083B827 /* ConstraintAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCC9F319CC65110083B827 /* ConstraintAttributes.swift */; }; EEBCC9F619CC65200083B827 /* ConstraintRelation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCC9F519CC65200083B827 /* ConstraintRelation.swift */; }; EEBCC9F819CC65260083B827 /* ConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCC9F719CC65260083B827 /* ConstraintItem.swift */; }; @@ -19,13 +19,13 @@ /* Begin PBXFileReference section */ EE91728119CB304E007888CF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - EE91728219CB304E007888CF /* Snappy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Snappy.h; sourceTree = ""; }; + EE91728219CB304E007888CF /* Snap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Snap.h; sourceTree = ""; }; EE91728B19CB304E007888CF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - EE91728C19CB304E007888CF /* SnappyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnappyTests.swift; sourceTree = ""; }; - EEBCC9D819CC627D0083B827 /* Snappy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Snappy.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EEBCC9E219CC627E0083B827 /* SnappyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SnappyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + EE91728C19CB304E007888CF /* SnapTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapTests.swift; sourceTree = ""; }; + EEBCC9D819CC627D0083B827 /* Snap.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Snap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EEBCC9E219CC627E0083B827 /* SnapTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SnapTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; EEBCC9EF19CC64F70083B827 /* EdgeInsets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EdgeInsets.swift; sourceTree = ""; }; - EEBCC9F119CC65040083B827 /* View+Snappy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+Snappy.swift"; sourceTree = ""; }; + EEBCC9F119CC65040083B827 /* View+Snap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+Snap.swift"; sourceTree = ""; }; EEBCC9F319CC65110083B827 /* ConstraintAttributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintAttributes.swift; sourceTree = ""; }; EEBCC9F519CC65200083B827 /* ConstraintRelation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintRelation.swift; sourceTree = ""; }; EEBCC9F719CC65260083B827 /* ConstraintItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintItem.swift; sourceTree = ""; }; @@ -55,8 +55,8 @@ DDC9FD8C1981B4DD009612C7 = { isa = PBXGroup; children = ( - EE91727F19CB304E007888CF /* Snappy */, - EE91728919CB304E007888CF /* SnappyTests */, + EE91727F19CB304E007888CF /* Snap */, + EE91728919CB304E007888CF /* SnapTests */, DDC9FD961981B4DD009612C7 /* Products */, ); sourceTree = ""; @@ -64,17 +64,17 @@ DDC9FD961981B4DD009612C7 /* Products */ = { isa = PBXGroup; children = ( - EEBCC9D819CC627D0083B827 /* Snappy.framework */, - EEBCC9E219CC627E0083B827 /* SnappyTests.xctest */, + EEBCC9D819CC627D0083B827 /* Snap.framework */, + EEBCC9E219CC627E0083B827 /* SnapTests.xctest */, ); name = Products; sourceTree = ""; }; - EE91727F19CB304E007888CF /* Snappy */ = { + EE91727F19CB304E007888CF /* Snap */ = { isa = PBXGroup; children = ( - EE91728219CB304E007888CF /* Snappy.h */, - EEBCC9F119CC65040083B827 /* View+Snappy.swift */, + EE91728219CB304E007888CF /* Snap.h */, + EEBCC9F119CC65040083B827 /* View+Snap.swift */, EEBCC9FB19CC65430083B827 /* ConstraintMaker.swift */, EEBCC9FF19CC66020083B827 /* Constraint.swift */, EEBCC9F719CC65260083B827 /* ConstraintItem.swift */, @@ -84,7 +84,7 @@ EEBCC9EF19CC64F70083B827 /* EdgeInsets.swift */, EE91728019CB304E007888CF /* Supporting Files */, ); - path = Snappy; + path = Snap; sourceTree = ""; }; EE91728019CB304E007888CF /* Supporting Files */ = { @@ -95,13 +95,13 @@ name = "Supporting Files"; sourceTree = ""; }; - EE91728919CB304E007888CF /* SnappyTests */ = { + EE91728919CB304E007888CF /* SnapTests */ = { isa = PBXGroup; children = ( - EE91728C19CB304E007888CF /* SnappyTests.swift */, + EE91728C19CB304E007888CF /* SnapTests.swift */, EE91728A19CB304E007888CF /* Supporting Files */, ); - path = SnappyTests; + path = SnapTests; sourceTree = ""; }; EE91728A19CB304E007888CF /* Supporting Files */ = { @@ -125,9 +125,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - EEBCC9D719CC627D0083B827 /* Snappy */ = { + EEBCC9D719CC627D0083B827 /* Snap */ = { isa = PBXNativeTarget; - buildConfigurationList = EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snappy" */; + buildConfigurationList = EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snap" */; buildPhases = ( EEBCC9D319CC627D0083B827 /* Sources */, EEBCC9D419CC627D0083B827 /* Frameworks */, @@ -138,14 +138,14 @@ ); dependencies = ( ); - name = Snappy; - productName = Snappy; - productReference = EEBCC9D819CC627D0083B827 /* Snappy.framework */; + name = Snap; + productName = Snap; + productReference = EEBCC9D819CC627D0083B827 /* Snap.framework */; productType = "com.apple.product-type.framework"; }; - EEBCC9E119CC627D0083B827 /* SnappyTests */ = { + EEBCC9E119CC627D0083B827 /* SnapTests */ = { isa = PBXNativeTarget; - buildConfigurationList = EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnappyTests" */; + buildConfigurationList = EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnapTests" */; buildPhases = ( EEBCC9DE19CC627D0083B827 /* Sources */, EEBCC9DF19CC627D0083B827 /* Frameworks */, @@ -155,9 +155,9 @@ ); dependencies = ( ); - name = SnappyTests; - productName = SnappyTests; - productReference = EEBCC9E219CC627E0083B827 /* SnappyTests.xctest */; + name = SnapTests; + productName = SnapTests; + productReference = EEBCC9E219CC627E0083B827 /* SnapTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -177,7 +177,7 @@ }; }; }; - buildConfigurationList = DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "Snappy" */; + buildConfigurationList = DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "Snap" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -190,8 +190,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - EEBCC9D719CC627D0083B827 /* Snappy */, - EEBCC9E119CC627D0083B827 /* SnappyTests */, + EEBCC9D719CC627D0083B827 /* Snap */, + EEBCC9E119CC627D0083B827 /* SnapTests */, ); }; /* End PBXProject section */ @@ -223,7 +223,7 @@ EEBCC9F419CC65110083B827 /* ConstraintAttributes.swift in Sources */, EEBCC9FE19CC65510083B827 /* LayoutConstraint.swift in Sources */, EEBCC9FC19CC65430083B827 /* ConstraintMaker.swift in Sources */, - EEBCC9F219CC65050083B827 /* View+Snappy.swift in Sources */, + EEBCC9F219CC65050083B827 /* View+Snap.swift in Sources */, EEBCCA0019CC66020083B827 /* Constraint.swift in Sources */, EEBCC9F819CC65260083B827 /* ConstraintItem.swift in Sources */, ); @@ -330,7 +330,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = Snappy/Info.plist; + INFOPLIST_FILE = Snap/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -349,7 +349,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Snappy/Info.plist; + INFOPLIST_FILE = Snap/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -371,7 +371,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = SnappyTests/Info.plist; + INFOPLIST_FILE = SnapTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -385,7 +385,7 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); - INFOPLIST_FILE = SnappyTests/Info.plist; + INFOPLIST_FILE = SnapTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -395,7 +395,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "Snappy" */ = { + DDC9FD901981B4DD009612C7 /* Build configuration list for PBXProject "Snap" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC9FDAF1981B4DD009612C7 /* Debug */, @@ -404,7 +404,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snappy" */ = { + EEBCC9E819CC627E0083B827 /* Build configuration list for PBXNativeTarget "Snap" */ = { isa = XCConfigurationList; buildConfigurations = ( EEBCC9E919CC627E0083B827 /* Debug */, @@ -413,7 +413,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnappyTests" */ = { + EEBCC9EB19CC627E0083B827 /* Build configuration list for PBXNativeTarget "SnapTests" */ = { isa = XCConfigurationList; buildConfigurations = ( EEBCC9EC19CC627E0083B827 /* Debug */, diff --git a/Snappy.xcodeproj/xcshareddata/xcschemes/Snappy.xcscheme b/Snap.xcodeproj/xcshareddata/xcschemes/Snap.xcscheme similarity index 82% rename from Snappy.xcodeproj/xcshareddata/xcschemes/Snappy.xcscheme rename to Snap.xcodeproj/xcshareddata/xcschemes/Snap.xcscheme index e83291c..851ed42 100644 --- a/Snappy.xcodeproj/xcshareddata/xcschemes/Snappy.xcscheme +++ b/Snap.xcodeproj/xcshareddata/xcschemes/Snap.xcscheme @@ -1,6 +1,6 @@ + BuildableName = "Snap.framework" + BlueprintName = "Snap" + ReferencedContainer = "container:Snap.xcodeproj"> @@ -43,9 +43,9 @@ + BuildableName = "Snap.framework" + BlueprintName = "Snap" + ReferencedContainer = "container:Snap.xcodeproj"> @@ -61,9 +61,9 @@ + BuildableName = "Snap.framework" + BlueprintName = "Snap" + ReferencedContainer = "container:Snap.xcodeproj"> diff --git a/Snappy/Constraint.swift b/Snap/Constraint.swift similarity index 99% rename from Snappy/Constraint.swift rename to Snap/Constraint.swift index f0b54c1..205665b 100644 --- a/Snappy/Constraint.swift +++ b/Snap/Constraint.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/Snappy/ConstraintAttributes.swift b/Snap/ConstraintAttributes.swift similarity index 99% rename from Snappy/ConstraintAttributes.swift rename to Snap/ConstraintAttributes.swift index 3497b58..a10ce5c 100644 --- a/Snappy/ConstraintAttributes.swift +++ b/Snap/ConstraintAttributes.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/Snappy/ConstraintItem.swift b/Snap/ConstraintItem.swift similarity index 99% rename from Snappy/ConstraintItem.swift rename to Snap/ConstraintItem.swift index 1de3704..1c3c69d 100644 --- a/Snappy/ConstraintItem.swift +++ b/Snap/ConstraintItem.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/Snappy/ConstraintMaker.swift b/Snap/ConstraintMaker.swift similarity index 98% rename from Snappy/ConstraintMaker.swift rename to Snap/ConstraintMaker.swift index 7bb609c..284535d 100644 --- a/Snappy/ConstraintMaker.swift +++ b/Snap/ConstraintMaker.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // @@ -28,7 +28,7 @@ import AppKit #endif /** - * ConstraintMaker is the maker in snappy that gets all constraints kickstarted + * ConstraintMaker is the maker in snap that gets all constraints kickstarted */ public class ConstraintMaker { public var left: Constraint { return addConstraint(ConstraintAttributes.Left) } diff --git a/Snappy/ConstraintRelation.swift b/Snap/ConstraintRelation.swift similarity index 99% rename from Snappy/ConstraintRelation.swift rename to Snap/ConstraintRelation.swift index 40d5b44..a00c184 100644 --- a/Snappy/ConstraintRelation.swift +++ b/Snap/ConstraintRelation.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/Snappy/EdgeInsets.swift b/Snap/EdgeInsets.swift similarity index 99% rename from Snappy/EdgeInsets.swift rename to Snap/EdgeInsets.swift index a73204e..7aa432d 100644 --- a/Snappy/EdgeInsets.swift +++ b/Snap/EdgeInsets.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/Snappy/Info.plist b/Snap/Info.plist similarity index 100% rename from Snappy/Info.plist rename to Snap/Info.plist diff --git a/Snappy/LayoutConstraint.swift b/Snap/LayoutConstraint.swift similarity index 97% rename from Snappy/LayoutConstraint.swift rename to Snap/LayoutConstraint.swift index 1588d81..041c46e 100644 --- a/Snappy/LayoutConstraint.swift +++ b/Snap/LayoutConstraint.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // @@ -28,7 +28,7 @@ import AppKit #endif /** -* LayoutConstraint is a subclass of NSLayoutConstraint to assist Snappy and also provide better debugging +* LayoutConstraint is a subclass of NSLayoutConstraint to assist Snap and also provide better debugging */ public class LayoutConstraint: NSLayoutConstraint { internal var constraint: Constraint? diff --git a/Snappy/Snappy.h b/Snap/Snap.h similarity index 85% rename from Snappy/Snappy.h rename to Snap/Snap.h index 890a94f..c534bca 100644 --- a/Snappy/Snappy.h +++ b/Snap/Snap.h @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // @@ -23,8 +23,8 @@ #import -//! Project version number for Snappy. -FOUNDATION_EXPORT double SnappyVersionNumber; +//! Project version number for Snap. +FOUNDATION_EXPORT double SnapVersionNumber; -//! Project version string for Snappy. -FOUNDATION_EXPORT const unsigned char SnappyVersionString[]; \ No newline at end of file +//! Project version string for Snap. +FOUNDATION_EXPORT const unsigned char SnapVersionString[]; \ No newline at end of file diff --git a/Snappy/View+Snappy.swift b/Snap/View+Snap.swift similarity index 99% rename from Snappy/View+Snappy.swift rename to Snap/View+Snap.swift index 0051707..ee032e6 100644 --- a/Snappy/View+Snappy.swift +++ b/Snap/View+Snap.swift @@ -1,5 +1,5 @@ // -// Snappy +// Snap // // Copyright (c) 2011-2014 Masonry Team - https://github.com/Masonry // diff --git a/SnappyTests/Info.plist b/SnapTests/Info.plist similarity index 100% rename from SnappyTests/Info.plist rename to SnapTests/Info.plist diff --git a/SnappyTests/SnappyTests.swift b/SnapTests/SnapTests.swift similarity index 92% rename from SnappyTests/SnappyTests.swift rename to SnapTests/SnapTests.swift index 034f59a..82665ad 100644 --- a/SnappyTests/SnappyTests.swift +++ b/SnapTests/SnapTests.swift @@ -1,6 +1,6 @@ // -// SnappyTests.swift -// SnappyTests +// SnapTests.swift +// SnapTests // // Created by Robert Payne on 20/09/14. // Copyright (c) 2014 Jonas Budelmann. All rights reserved. @@ -9,7 +9,7 @@ import UIKit import XCTest -class SnappyTests: XCTestCase { +class SnapTests: XCTestCase { override func setUp() { super.setUp()