ios / Masonry · Commits

Go to a project

Authored by Robert Payne
Committed by GitHub
Commit ba96e71f5db0ee4e87d5f285dec9412d4548e307 2 parents 9e9017cf 53a095b8

Merge pull request #473 from iwill/master 

Fully supports iOS 11 safeAreaLayoutGuide, and fix #470
Inline Side-by-side
Showing 22 changed files with 269 additions and 103 deletions
@@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 00FC4A321B7359D700DCA999 /* MASExampleDistributeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00FC4A311B7359D700DCA999 /* MASExampleDistributeView.m */; }; 10 00FC4A321B7359D700DCA999 /* MASExampleDistributeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00FC4A311B7359D700DCA999 /* MASExampleDistributeView.m */; };
11 - 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 114413081924B6EE008E702E /* Default-568h@2x.png */; };  
12 27A27D461A6CF0C400D34F52 /* MASExampleAspectFitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A27D451A6CF0C400D34F52 /* MASExampleAspectFitView.m */; }; 11 27A27D461A6CF0C400D34F52 /* MASExampleAspectFitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A27D451A6CF0C400D34F52 /* MASExampleAspectFitView.m */; };
13 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C02224819D0C4EC00507321 /* Images.xcassets */; }; 12 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C02224819D0C4EC00507321 /* Images.xcassets */; };
14 3DB1CAD5184538E200E91FC5 /* MASExampleArrayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB1CAD4184538E200E91FC5 /* MASExampleArrayView.m */; }; 13 3DB1CAD5184538E200E91FC5 /* MASExampleArrayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB1CAD4184538E200E91FC5 /* MASExampleArrayView.m */; };
@@ -33,12 +32,13 @@ @@ -33,12 +32,13 @@
33 DD9B4D35183CC980002BF408 /* MASExampleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD9B4D34183CC980002BF408 /* MASExampleScrollView.m */; }; 32 DD9B4D35183CC980002BF408 /* MASExampleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD9B4D34183CC980002BF408 /* MASExampleScrollView.m */; };
34 DDDF60CC181915E300BF7B8B /* MASExampleLabelView.m in Sources */ = {isa = PBXBuildFile; fileRef = DDDF60CB181915E300BF7B8B /* MASExampleLabelView.m */; }; 33 DDDF60CC181915E300BF7B8B /* MASExampleLabelView.m in Sources */ = {isa = PBXBuildFile; fileRef = DDDF60CB181915E300BF7B8B /* MASExampleLabelView.m */; };
35 DDF3875C179D648D00178773 /* MASExampleAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = DDF3875B179D648D00178773 /* MASExampleAnimatedView.m */; }; 34 DDF3875C179D648D00178773 /* MASExampleAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = DDF3875B179D648D00178773 /* MASExampleAnimatedView.m */; };
  35 + DFBACE591F7B76E40047F15A /* MASExampleSafeAreaLayoutGuideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DFBACE581F7B76E40047F15A /* MASExampleSafeAreaLayoutGuideViewController.m */; };
  36 + DFBACE5D1F7B86860047F15A /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DFBACE5C1F7B86860047F15A /* Launch Screen.storyboard */; };
36 /* End PBXBuildFile section */ 37 /* End PBXBuildFile section */
37 38
38 /* Begin PBXFileReference section */ 39 /* Begin PBXFileReference section */
39 00FC4A301B7359D700DCA999 /* MASExampleDistributeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleDistributeView.h; sourceTree = "<group>"; }; 40 00FC4A301B7359D700DCA999 /* MASExampleDistributeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleDistributeView.h; sourceTree = "<group>"; };
40 00FC4A311B7359D700DCA999 /* MASExampleDistributeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleDistributeView.m; sourceTree = "<group>"; }; 41 00FC4A311B7359D700DCA999 /* MASExampleDistributeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleDistributeView.m; sourceTree = "<group>"; };
41 - 114413081924B6EE008E702E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };  
42 27A27D441A6CF0C400D34F52 /* MASExampleAspectFitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleAspectFitView.h; sourceTree = "<group>"; }; 42 27A27D441A6CF0C400D34F52 /* MASExampleAspectFitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleAspectFitView.h; sourceTree = "<group>"; };
43 27A27D451A6CF0C400D34F52 /* MASExampleAspectFitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleAspectFitView.m; sourceTree = "<group>"; }; 43 27A27D451A6CF0C400D34F52 /* MASExampleAspectFitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleAspectFitView.m; sourceTree = "<group>"; };
44 321AA59CF7B045B6D503D2E5 /* Pods-Masonry iOS Examples.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Masonry iOS Examples.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.release.xcconfig"; sourceTree = "<group>"; }; 44 321AA59CF7B045B6D503D2E5 /* Pods-Masonry iOS Examples.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Masonry iOS Examples.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.release.xcconfig"; sourceTree = "<group>"; };
@@ -85,6 +85,9 @@ @@ -85,6 +85,9 @@
85 DDDF60CB181915E300BF7B8B /* MASExampleLabelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleLabelView.m; sourceTree = "<group>"; }; 85 DDDF60CB181915E300BF7B8B /* MASExampleLabelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleLabelView.m; sourceTree = "<group>"; };
86 DDF3875A179D648D00178773 /* MASExampleAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleAnimatedView.h; sourceTree = "<group>"; }; 86 DDF3875A179D648D00178773 /* MASExampleAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleAnimatedView.h; sourceTree = "<group>"; };
87 DDF3875B179D648D00178773 /* MASExampleAnimatedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleAnimatedView.m; sourceTree = "<group>"; }; 87 DDF3875B179D648D00178773 /* MASExampleAnimatedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleAnimatedView.m; sourceTree = "<group>"; };
  88 + DFBACE571F7B76E30047F15A /* MASExampleSafeAreaLayoutGuideViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MASExampleSafeAreaLayoutGuideViewController.h; sourceTree = "<group>"; };
  89 + DFBACE581F7B76E40047F15A /* MASExampleSafeAreaLayoutGuideViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MASExampleSafeAreaLayoutGuideViewController.m; sourceTree = "<group>"; };
  90 + DFBACE5C1F7B86860047F15A /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
88 /* End PBXFileReference section */ 91 /* End PBXFileReference section */
89 92
90 /* Begin PBXFrameworksBuildPhase section */ 93 /* Begin PBXFrameworksBuildPhase section */
@@ -105,7 +108,6 @@ @@ -105,7 +108,6 @@
105 DD52F21E179CAD57005CD195 = { 108 DD52F21E179CAD57005CD195 = {
106 isa = PBXGroup; 109 isa = PBXGroup;
107 children = ( 110 children = (
108 - 114413081924B6EE008E702E /* Default-568h@2x.png */,  
109 DD52F230179CAD57005CD195 /* Masonry iOS Examples */, 111 DD52F230179CAD57005CD195 /* Masonry iOS Examples */,
110 DD52F229179CAD57005CD195 /* Frameworks */, 112 DD52F229179CAD57005CD195 /* Frameworks */,
111 DD52F228179CAD57005CD195 /* Products */, 113 DD52F228179CAD57005CD195 /* Products */,
@@ -141,6 +143,7 @@ @@ -141,6 +143,7 @@
141 DD52F256179CADC4005CD195 /* Views */, 143 DD52F256179CADC4005CD195 /* Views */,
142 3C02224819D0C4EC00507321 /* Images.xcassets */, 144 3C02224819D0C4EC00507321 /* Images.xcassets */,
143 DD52F231179CAD57005CD195 /* Supporting Files */, 145 DD52F231179CAD57005CD195 /* Supporting Files */,
  146 + DFBACE5C1F7B86860047F15A /* Launch Screen.storyboard */,
144 ); 147 );
145 path = "Masonry iOS Examples"; 148 path = "Masonry iOS Examples";
146 sourceTree = "<group>"; 149 sourceTree = "<group>";
@@ -200,6 +203,8 @@ @@ -200,6 +203,8 @@
200 DD52F250179CADC0005CD195 /* MASExampleViewController.m */, 203 DD52F250179CADC0005CD195 /* MASExampleViewController.m */,
201 DD653E481843E61500D1EC5A /* MASExampleLayoutGuideViewController.h */, 204 DD653E481843E61500D1EC5A /* MASExampleLayoutGuideViewController.h */,
202 DD653E491843E61500D1EC5A /* MASExampleLayoutGuideViewController.m */, 205 DD653E491843E61500D1EC5A /* MASExampleLayoutGuideViewController.m */,
  206 + DFBACE571F7B76E30047F15A /* MASExampleSafeAreaLayoutGuideViewController.h */,
  207 + DFBACE581F7B76E40047F15A /* MASExampleSafeAreaLayoutGuideViewController.m */,
203 ); 208 );
204 name = Controllers; 209 name = Controllers;
205 sourceTree = "<group>"; 210 sourceTree = "<group>";
@@ -268,9 +273,9 @@ @@ -268,9 +273,9 @@
268 isa = PBXResourcesBuildPhase; 273 isa = PBXResourcesBuildPhase;
269 buildActionMask = 2147483647; 274 buildActionMask = 2147483647;
270 files = ( 275 files = (
  276 + DFBACE5D1F7B86860047F15A /* Launch Screen.storyboard in Resources */,
271 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */, 277 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */,
272 DD52F235179CAD57005CD195 /* InfoPlist.strings in Resources */, 278 DD52F235179CAD57005CD195 /* InfoPlist.strings in Resources */,
273 - 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */,  
274 ); 279 );
275 runOnlyForDeploymentPostprocessing = 0; 280 runOnlyForDeploymentPostprocessing = 0;
276 }; 281 };
@@ -344,6 +349,7 @@ @@ -344,6 +349,7 @@
344 27A27D461A6CF0C400D34F52 /* MASExampleAspectFitView.m in Sources */, 349 27A27D461A6CF0C400D34F52 /* MASExampleAspectFitView.m in Sources */,
345 DD52F252179CADC0005CD195 /* MASExampleConstantsView.m in Sources */, 350 DD52F252179CADC0005CD195 /* MASExampleConstantsView.m in Sources */,
346 DD52F253179CADC0005CD195 /* MASExampleListViewController.m in Sources */, 351 DD52F253179CADC0005CD195 /* MASExampleListViewController.m in Sources */,
  352 + DFBACE591F7B76E40047F15A /* MASExampleSafeAreaLayoutGuideViewController.m in Sources */,
347 DD52F254179CADC0005CD195 /* MASExampleSidesView.m in Sources */, 353 DD52F254179CADC0005CD195 /* MASExampleSidesView.m in Sources */,
348 DD32C3FD18E8BFF6001F6AD2 /* MASExampleAttributeChainingView.m in Sources */, 354 DD32C3FD18E8BFF6001F6AD2 /* MASExampleAttributeChainingView.m in Sources */,
349 DD52F255179CADC0005CD195 /* MASExampleViewController.m in Sources */, 355 DD52F255179CADC0005CD195 /* MASExampleViewController.m in Sources */,
@@ -409,7 +415,6 @@ @@ -409,7 +415,6 @@
409 GCC_WARN_UNINITIALIZED_AUTOS = YES; 415 GCC_WARN_UNINITIALIZED_AUTOS = YES;
410 GCC_WARN_UNUSED_FUNCTION = YES; 416 GCC_WARN_UNUSED_FUNCTION = YES;
411 GCC_WARN_UNUSED_VARIABLE = YES; 417 GCC_WARN_UNUSED_VARIABLE = YES;
412 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
413 ONLY_ACTIVE_ARCH = YES; 418 ONLY_ACTIVE_ARCH = YES;
414 SDKROOT = iphoneos; 419 SDKROOT = iphoneos;
415 TARGETED_DEVICE_FAMILY = "1,2"; 420 TARGETED_DEVICE_FAMILY = "1,2";
@@ -449,7 +454,6 @@ @@ -449,7 +454,6 @@
449 GCC_WARN_UNINITIALIZED_AUTOS = YES; 454 GCC_WARN_UNINITIALIZED_AUTOS = YES;
450 GCC_WARN_UNUSED_FUNCTION = YES; 455 GCC_WARN_UNUSED_FUNCTION = YES;
451 GCC_WARN_UNUSED_VARIABLE = YES; 456 GCC_WARN_UNUSED_VARIABLE = YES;
452 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
453 OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; 457 OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
454 SDKROOT = iphoneos; 458 SDKROOT = iphoneos;
455 TARGETED_DEVICE_FAMILY = "1,2"; 459 TARGETED_DEVICE_FAMILY = "1,2";
@@ -461,11 +465,9 @@ @@ -461,11 +465,9 @@
461 isa = XCBuildConfiguration; 465 isa = XCBuildConfiguration;
462 baseConfigurationReference = 50B25D0621957AEB87C3FCC2 /* Pods-Masonry iOS Examples.debug.xcconfig */; 466 baseConfigurationReference = 50B25D0621957AEB87C3FCC2 /* Pods-Masonry iOS Examples.debug.xcconfig */;
463 buildSettings = { 467 buildSettings = {
464 - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;  
465 GCC_PRECOMPILE_PREFIX_HEADER = YES; 468 GCC_PRECOMPILE_PREFIX_HEADER = YES;
466 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch"; 469 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch";
467 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist"; 470 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist";
468 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
469 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}"; 471 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}";
470 PRODUCT_NAME = "Masonry iOS Examples"; 472 PRODUCT_NAME = "Masonry iOS Examples";
471 WRAPPER_EXTENSION = app; 473 WRAPPER_EXTENSION = app;
@@ -476,11 +478,9 @@ @@ -476,11 +478,9 @@
476 isa = XCBuildConfiguration; 478 isa = XCBuildConfiguration;
477 baseConfigurationReference = 321AA59CF7B045B6D503D2E5 /* Pods-Masonry iOS Examples.release.xcconfig */; 479 baseConfigurationReference = 321AA59CF7B045B6D503D2E5 /* Pods-Masonry iOS Examples.release.xcconfig */;
478 buildSettings = { 480 buildSettings = {
479 - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;  
480 GCC_PRECOMPILE_PREFIX_HEADER = YES; 481 GCC_PRECOMPILE_PREFIX_HEADER = YES;
481 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch"; 482 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch";
482 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist"; 483 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist";
483 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
484 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}"; 484 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}";
485 PRODUCT_NAME = "Masonry iOS Examples"; 485 PRODUCT_NAME = "Masonry iOS Examples";
486 WRAPPER_EXTENSION = app; 486 WRAPPER_EXTENSION = app;
  1 +{
  2 + "info" : {
  3 + "version" : 1,
  4 + "author" : "xcode"
  5 + }
  6 +}
1 -{  
2 - "images" : [  
3 - {  
4 - "extent" : "full-screen",  
5 - "idiom" : "iphone",  
6 - "subtype" : "736h",  
7 - "filename" : "Default-736h@3x.png",  
8 - "minimum-system-version" : "8.0",  
9 - "orientation" : "portrait",  
10 - "scale" : "3x"  
11 - },  
12 - {  
13 - "extent" : "full-screen",  
14 - "idiom" : "iphone",  
15 - "subtype" : "667h",  
16 - "filename" : "Default-667h@2x.png",  
17 - "minimum-system-version" : "8.0",  
18 - "orientation" : "portrait",  
19 - "scale" : "2x"  
20 - },  
21 - {  
22 - "orientation" : "portrait",  
23 - "idiom" : "iphone",  
24 - "extent" : "full-screen",  
25 - "minimum-system-version" : "7.0",  
26 - "filename" : "Default@2x.png",  
27 - "scale" : "2x"  
28 - },  
29 - {  
30 - "extent" : "full-screen",  
31 - "idiom" : "iphone",  
32 - "subtype" : "retina4",  
33 - "filename" : "Default-568h@2x.png",  
34 - "minimum-system-version" : "7.0",  
35 - "orientation" : "portrait",  
36 - "scale" : "2x"  
37 - },  
38 - {  
39 - "orientation" : "portrait",  
40 - "idiom" : "iphone",  
41 - "extent" : "full-screen",  
42 - "filename" : "Default_iOS6.png",  
43 - "scale" : "1x"  
44 - },  
45 - {  
46 - "orientation" : "portrait",  
47 - "idiom" : "iphone",  
48 - "extent" : "full-screen",  
49 - "filename" : "Default_iOS6@2x.png",  
50 - "scale" : "2x"  
51 - },  
52 - {  
53 - "orientation" : "portrait",  
54 - "idiom" : "iphone",  
55 - "extent" : "full-screen",  
56 - "filename" : "Default_iOS6-568h@2x.png",  
57 - "subtype" : "retina4",  
58 - "scale" : "2x"  
59 - }  
60 - ],  
61 - "info" : {  
62 - "version" : 1,  
63 - "author" : "xcode"  
64 - }  
65 -}  
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
  3 + <device id="retina4_7" orientation="portrait">
  4 + <adaptation id="fullscreen"/>
  5 + </device>
  6 + <dependencies>
  7 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
  8 + <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
  9 + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  10 + </dependencies>
  11 + <scenes>
  12 + <!--View Controller-->
  13 + <scene sceneID="EHf-IW-A2E">
  14 + <objects>
  15 + <viewController id="01J-lp-oVM" sceneMemberID="viewController">
  16 + <layoutGuides>
  17 + <viewControllerLayoutGuide type="top" id="cbD-vd-OFn"/>
  18 + <viewControllerLayoutGuide type="bottom" id="TBi-GG-GBk"/>
  19 + </layoutGuides>
  20 + <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
  21 + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
  22 + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  23 + <subviews>
  24 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
  25 + <rect key="frame" x="47.5" y="592.5" width="281" height="41"/>
  26 + <string key="text">Copyright © 2017 Jonas Budelmann.
  27 +All rights reserved.</string>
  28 + <fontDescription key="fontDescription" type="system" pointSize="17"/>
  29 + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  30 + <nil key="highlightedColor"/>
  31 + </label>
  32 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Masonry" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
  33 + <rect key="frame" x="114.5" y="202" width="146" height="43"/>
  34 + <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
  35 + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  36 + <nil key="highlightedColor"/>
  37 + </label>
  38 + </subviews>
  39 + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  40 + <constraints>
  41 + <constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
  42 + <constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
  43 + <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="34" id="Y44-ml-fuU"/>
  44 + <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
  45 + </constraints>
  46 + </view>
  47 + </viewController>
  48 + <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
  49 + </objects>
  50 + <point key="canvasLocation" x="52" y="374.66266866566718"/>
  51 + </scene>
  52 + </scenes>
  53 +</document>
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 #import "MASExampleRemakeView.h" 18 #import "MASExampleRemakeView.h"
19 #import "MASExampleScrollView.h" 19 #import "MASExampleScrollView.h"
20 #import "MASExampleLayoutGuideViewController.h" 20 #import "MASExampleLayoutGuideViewController.h"
  21 +#import "MASExampleSafeAreaLayoutGuideViewController.h"
21 #import "MASExampleArrayView.h" 22 #import "MASExampleArrayView.h"
22 #import "MASExampleAttributeChainingView.h" 23 #import "MASExampleAttributeChainingView.h"
23 #import "MASExampleAspectFitView.h" 24 #import "MASExampleAspectFitView.h"
@@ -77,6 +78,11 @@ static NSString * const kMASCellReuseIdentifier = @"kMASCellReuseIdentifier"; @@ -77,6 +78,11 @@ static NSString * const kMASCellReuseIdentifier = @"kMASCellReuseIdentifier";
77 self.exampleControllers = [self.exampleControllers arrayByAddingObject:[[MASExampleLayoutGuideViewController alloc] init]]; 78 self.exampleControllers = [self.exampleControllers arrayByAddingObject:[[MASExampleLayoutGuideViewController alloc] init]];
78 } 79 }
79 80
  81 + if ([UIView instancesRespondToSelector:@selector(safeAreaLayoutGuide)])
  82 + {
  83 + self.exampleControllers = [self.exampleControllers arrayByAddingObject:[[MASExampleSafeAreaLayoutGuideViewController alloc] init]];
  84 + }
  85 +
80 return self; 86 return self;
81 } 87 }
82 88
  1 +//
  2 +// MASExampleSafeAreaLayoutGuideViewController.h
  3 +// Masonry iOS Examples
  4 +//
  5 +// Created by MingLQ on 2017-09-27.
  6 +// Copyright © 2017 MingLQ. All rights reserved.
  7 +//
  8 +
  9 +#import <UIKit/UIKit.h>
  10 +
  11 +@interface MASExampleSafeAreaLayoutGuideViewController : UIViewController
  12 +
  13 +@end
  1 +//
  2 +// MASExampleSafeAreaLayoutGuideViewController.m
  3 +// Masonry iOS Examples
  4 +//
  5 +// Created by MingLQ on 2017-09-27.
  6 +// Copyright © 2017 MingLQ. All rights reserved.
  7 +//
  8 +
  9 +#import "MASExampleSafeAreaLayoutGuideViewController.h"
  10 +
  11 +@interface MASExampleSafeAreaLayoutGuideViewController ()
  12 +
  13 +@end
  14 +
  15 +@implementation MASExampleSafeAreaLayoutGuideViewController
  16 +
  17 +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
  18 + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
  19 + if (self) {
  20 + self.title = @"Safe Area Layout Guides";
  21 + }
  22 + return self;
  23 +}
  24 +
  25 +- (void)viewDidLoad {
  26 + [super viewDidLoad];
  27 +
  28 + self.view.backgroundColor = [UIColor whiteColor];
  29 +
  30 + UIView *view1 = [UIView new];
  31 + view1.backgroundColor = [UIColor redColor];
  32 + [self.view addSubview:view1];
  33 +
  34 + UIView *view2 = [UIView new];
  35 + view2.backgroundColor = [UIColor greenColor];
  36 + [self.view addSubview:view2];
  37 +
  38 + UIView *view3 = [UIView new];
  39 + view3.backgroundColor = [UIColor blueColor];
  40 + [self.view addSubview:view3];
  41 +
  42 + UIView *leftView = [self viewWithName:@"LY"];
  43 + UIView *rightView = [self viewWithName:@"RY"];
  44 + UIView *topView = [self viewWithName:@"TX"];
  45 + UIView *bottomView = [self viewWithName:@"BX"];
  46 +
  47 + UIView *leftTopView = [self viewWithName:@"LT"];
  48 + UIView *rightTopView = [self viewWithName:@"RT"];
  49 + UIView *leftBottomView = [self viewWithName:@"LB"];
  50 + UIView *rightBottomView = [self viewWithName:@"RB"];
  51 +
  52 + UIView *centerView = [self viewWithName:@"XY"];
  53 +
  54 + const CGFloat size = 50.0;
  55 +
  56 + [view1 mas_makeConstraints:^(MASConstraintMaker *make) {
  57 + make.edges.equalTo(self.view.mas_safeAreaLayoutGuide).inset(10.0);
  58 + }];
  59 +
  60 + [view2 mas_makeConstraints:^(MASConstraintMaker *make) {
  61 + make.center.equalTo(self.view.mas_safeAreaLayoutGuide);
  62 + make.width.height.equalTo(self.view.mas_safeAreaLayoutGuide).sizeOffset(CGSizeMake(- 40.0, - 40.0));
  63 + }];
  64 +
  65 + [view3 mas_makeConstraints:^(MASConstraintMaker *make) {
  66 + make.center.equalTo(self.view.mas_safeAreaLayoutGuide);
  67 + make.width.equalTo(self.view.mas_safeAreaLayoutGuide).sizeOffset(CGSizeMake(- 60.0, - 60.0));
  68 + make.height.equalTo(self.view.mas_safeAreaLayoutGuide).sizeOffset(CGSizeMake(- 60.0, - 60.0));
  69 + }];
  70 +
  71 + [leftTopView mas_makeConstraints:^(MASConstraintMaker *make) {
  72 + make.left.top.equalTo(self.view.mas_safeAreaLayoutGuide);
  73 + make.width.height.equalTo(@(size));
  74 + }];
  75 +
  76 + [rightTopView mas_makeConstraints:^(MASConstraintMaker *make) {
  77 + make.right.equalTo(self.view.mas_safeAreaLayoutGuideRight);
  78 + make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop);
  79 + make.width.height.equalTo(@(size));
  80 + }];
  81 +
  82 + [leftBottomView mas_makeConstraints:^(MASConstraintMaker *make) {
  83 + make.left.equalTo(self.view.mas_safeAreaLayoutGuideLeft);
  84 + make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
  85 + make.width.height.equalTo(@(size));
  86 + }];
  87 +
  88 + [rightBottomView mas_makeConstraints:^(MASConstraintMaker *make) {
  89 + make.right.bottom.equalTo(self.view.mas_safeAreaLayoutGuide);
  90 + make.width.height.equalTo(@(size));
  91 + }];
  92 +
  93 + [leftView mas_makeConstraints:^(MASConstraintMaker *make) {
  94 + make.left.centerY.equalTo(self.view.mas_safeAreaLayoutGuide);
  95 + make.width.height.equalTo(@(size));
  96 + }];
  97 +
  98 + [rightView mas_makeConstraints:^(MASConstraintMaker *make) {
  99 + make.right.equalTo(self.view.mas_safeAreaLayoutGuideRight);
  100 + make.centerY.equalTo(self.view.mas_safeAreaLayoutGuideCenterY);
  101 + make.width.height.equalTo(@(size));
  102 + }];
  103 +
  104 + [topView mas_makeConstraints:^(MASConstraintMaker *make) {
  105 + make.top.equalTo(self.view.mas_safeAreaLayoutGuideTop);
  106 + make.centerX.equalTo(self.view.mas_safeAreaLayoutGuideCenterX);
  107 + make.width.height.equalTo(@(size));
  108 + }];
  109 +
  110 + [bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
  111 + make.bottom.centerX.equalTo(self.view.mas_safeAreaLayoutGuide);
  112 + make.width.height.equalTo(@(size));
  113 + }];
  114 +
  115 + [centerView mas_makeConstraints:^(MASConstraintMaker *make) {
  116 + make.center.equalTo(self.view.mas_safeAreaLayoutGuide);
  117 + make.width.height.equalTo(@(size));
  118 + }];
  119 +}
  120 +
  121 +- (UIView *)viewWithName:(NSString *)name {
  122 + UILabel *label = [UILabel new];
  123 + label.text = name;
  124 + label.textAlignment = NSTextAlignmentCenter;
  125 + label.textColor = [UIColor blackColor];
  126 + label.backgroundColor = [UIColor yellowColor];
  127 + [self.view addSubview:label];
  128 + return label;
  129 +}
  130 +
  131 +@end
@@ -24,6 +24,8 @@ @@ -24,6 +24,8 @@
24 <string>1.0</string> 24 <string>1.0</string>
25 <key>LSRequiresIPhoneOS</key> 25 <key>LSRequiresIPhoneOS</key>
26 <true/> 26 <true/>
  27 + <key>UILaunchStoryboardName</key>
  28 + <string>Launch Screen</string>
27 <key>UIRequiredDeviceCapabilities</key> 29 <key>UIRequiredDeviceCapabilities</key>
28 <array> 30 <array>
29 <string>armv7</string> 31 <string>armv7</string>
@@ -386,7 +386,6 @@ @@ -386,7 +386,6 @@
386 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 386 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
387 GCC_WARN_UNUSED_FUNCTION = YES; 387 GCC_WARN_UNUSED_FUNCTION = YES;
388 GCC_WARN_UNUSED_VARIABLE = YES; 388 GCC_WARN_UNUSED_VARIABLE = YES;
389 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
390 MACOSX_DEPLOYMENT_TARGET = 10.9; 389 MACOSX_DEPLOYMENT_TARGET = 10.9;
391 MTL_ENABLE_DEBUG_INFO = YES; 390 MTL_ENABLE_DEBUG_INFO = YES;
392 ONLY_ACTIVE_ARCH = YES; 391 ONLY_ACTIVE_ARCH = YES;
@@ -436,7 +435,6 @@ @@ -436,7 +435,6 @@
436 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 435 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
437 GCC_WARN_UNUSED_FUNCTION = YES; 436 GCC_WARN_UNUSED_FUNCTION = YES;
438 GCC_WARN_UNUSED_VARIABLE = YES; 437 GCC_WARN_UNUSED_VARIABLE = YES;
439 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
440 MACOSX_DEPLOYMENT_TARGET = 10.9; 438 MACOSX_DEPLOYMENT_TARGET = 10.9;
441 MTL_ENABLE_DEBUG_INFO = NO; 439 MTL_ENABLE_DEBUG_INFO = NO;
442 TARGETED_DEVICE_FAMILY = "1,2"; 440 TARGETED_DEVICE_FAMILY = "1,2";
@@ -492,7 +490,6 @@ @@ -492,7 +490,6 @@
492 DYLIB_INSTALL_NAME_BASE = "@rpath"; 490 DYLIB_INSTALL_NAME_BASE = "@rpath";
493 INFOPLIST_FILE = Masonry/Info.plist; 491 INFOPLIST_FILE = Masonry/Info.plist;
494 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 492 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
495 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
496 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; 493 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
497 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.$(PRODUCT_NAME:rfc1034identifier)"; 494 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.$(PRODUCT_NAME:rfc1034identifier)";
498 PRODUCT_NAME = Masonry; 495 PRODUCT_NAME = Masonry;
@@ -511,7 +508,6 @@ @@ -511,7 +508,6 @@
511 DYLIB_INSTALL_NAME_BASE = "@rpath"; 508 DYLIB_INSTALL_NAME_BASE = "@rpath";
512 INFOPLIST_FILE = Masonry/Info.plist; 509 INFOPLIST_FILE = Masonry/Info.plist;
513 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 510 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
514 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
515 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; 511 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
516 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.$(PRODUCT_NAME:rfc1034identifier)"; 512 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.$(PRODUCT_NAME:rfc1034identifier)";
517 PRODUCT_NAME = Masonry; 513 PRODUCT_NAME = Masonry;
@@ -125,7 +125,12 @@ static char kInstalledConstraintsKey; @@ -125,7 +125,12 @@ static char kInstalledConstraintsKey;
125 } else if ([secondViewAttribute isKindOfClass:MAS_VIEW.class]) { 125 } else if ([secondViewAttribute isKindOfClass:MAS_VIEW.class]) {
126 _secondViewAttribute = [[MASViewAttribute alloc] initWithView:secondViewAttribute layoutAttribute:self.firstViewAttribute.layoutAttribute]; 126 _secondViewAttribute = [[MASViewAttribute alloc] initWithView:secondViewAttribute layoutAttribute:self.firstViewAttribute.layoutAttribute];
127 } else if ([secondViewAttribute isKindOfClass:MASViewAttribute.class]) { 127 } else if ([secondViewAttribute isKindOfClass:MASViewAttribute.class]) {
128 - _secondViewAttribute = secondViewAttribute; 128 + MASViewAttribute *attr = secondViewAttribute;
  129 + if (attr.layoutAttribute == NSLayoutAttributeNotAnAttribute) {
  130 + _secondViewAttribute = [[MASViewAttribute alloc] initWithView:attr.view item:attr.item layoutAttribute:self.firstViewAttribute.layoutAttribute];;
  131 + } else {
  132 + _secondViewAttribute = secondViewAttribute;
  133 + }
129 } else { 134 } else {
130 NSAssert(NO, @"attempting to add unsupported attribute: %@", secondViewAttribute); 135 NSAssert(NO, @"attempting to add unsupported attribute: %@", secondViewAttribute);
131 } 136 }
@@ -55,10 +55,17 @@ @@ -55,10 +55,17 @@
55 #if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000) 55 #if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000)
56 56
57 @property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuide; 57 @property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuide;
58 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTop;  
59 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideBottom; 58 +
  59 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeading;
  60 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTrailing;
60 @property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeft; 61 @property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeft;
61 @property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideRight; 62 @property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideRight;
  63 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTop;
  64 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideBottom;
  65 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideWidth;
  66 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideHeight;
  67 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideCenterX;
  68 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideCenterY;
62 69
63 #endif 70 #endif
64 71
@@ -137,21 +137,49 @@ @@ -137,21 +137,49 @@
137 #if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000) 137 #if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000)
138 138
139 - (MASViewAttribute *)mas_safeAreaLayoutGuide { 139 - (MASViewAttribute *)mas_safeAreaLayoutGuide {
140 - return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeBottom]; 140 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeNotAnAttribute];
141 } 141 }
142 -- (MASViewAttribute *)mas_safeAreaLayoutGuideTop {  
143 - return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeTop]; 142 +
  143 +- (MASViewAttribute *)mas_safeAreaLayoutGuideLeading {
  144 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeLeading];
144 } 145 }
145 -- (MASViewAttribute *)mas_safeAreaLayoutGuideBottom {  
146 - return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeBottom]; 146 +
  147 +- (MASViewAttribute *)mas_safeAreaLayoutGuideTrailing {
  148 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeTrailing];
147 } 149 }
  150 +
148 - (MASViewAttribute *)mas_safeAreaLayoutGuideLeft { 151 - (MASViewAttribute *)mas_safeAreaLayoutGuideLeft {
149 return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeLeft]; 152 return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeLeft];
150 } 153 }
  154 +
151 - (MASViewAttribute *)mas_safeAreaLayoutGuideRight { 155 - (MASViewAttribute *)mas_safeAreaLayoutGuideRight {
152 return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeRight]; 156 return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeRight];
153 } 157 }
154 158
  159 +- (MASViewAttribute *)mas_safeAreaLayoutGuideTop {
  160 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeTop];
  161 +}
  162 +
  163 +- (MASViewAttribute *)mas_safeAreaLayoutGuideBottom {
  164 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeBottom];
  165 +}
  166 +
  167 +- (MASViewAttribute *)mas_safeAreaLayoutGuideWidth {
  168 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeWidth];
  169 +}
  170 +
  171 +- (MASViewAttribute *)mas_safeAreaLayoutGuideHeight {
  172 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeHeight];
  173 +}
  174 +
  175 +- (MASViewAttribute *)mas_safeAreaLayoutGuideCenterX {
  176 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeCenterX];
  177 +}
  178 +
  179 +- (MASViewAttribute *)mas_safeAreaLayoutGuideCenterY {
  180 + return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeCenterY];
  181 +}
  182 +
155 #endif 183 #endif
156 184
157 #pragma mark - associated properties 185 #pragma mark - associated properties
@@ -912,7 +912,6 @@ @@ -912,7 +912,6 @@
912 ENABLE_STRICT_OBJC_MSGSEND = YES; 912 ENABLE_STRICT_OBJC_MSGSEND = YES;
913 GCC_NO_COMMON_BLOCKS = YES; 913 GCC_NO_COMMON_BLOCKS = YES;
914 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch"; 914 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch";
915 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
916 MTL_ENABLE_DEBUG_INFO = YES; 915 MTL_ENABLE_DEBUG_INFO = YES;
917 OTHER_LDFLAGS = ""; 916 OTHER_LDFLAGS = "";
918 OTHER_LIBTOOLFLAGS = ""; 917 OTHER_LIBTOOLFLAGS = "";
@@ -937,7 +936,6 @@ @@ -937,7 +936,6 @@
937 GCC_GENERATE_TEST_COVERAGE_FILES = YES; 936 GCC_GENERATE_TEST_COVERAGE_FILES = YES;
938 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; 937 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
939 GCC_NO_COMMON_BLOCKS = YES; 938 GCC_NO_COMMON_BLOCKS = YES;
940 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
941 MACH_O_TYPE = staticlib; 939 MACH_O_TYPE = staticlib;
942 MTL_ENABLE_DEBUG_INFO = NO; 940 MTL_ENABLE_DEBUG_INFO = NO;
943 OTHER_LDFLAGS = ""; 941 OTHER_LDFLAGS = "";
@@ -998,7 +996,6 @@ @@ -998,7 +996,6 @@
998 GCC_WARN_UNINITIALIZED_AUTOS = YES; 996 GCC_WARN_UNINITIALIZED_AUTOS = YES;
999 GCC_WARN_UNUSED_FUNCTION = YES; 997 GCC_WARN_UNUSED_FUNCTION = YES;
1000 GCC_WARN_UNUSED_VARIABLE = YES; 998 GCC_WARN_UNUSED_VARIABLE = YES;
1001 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1002 ONLY_ACTIVE_ARCH = YES; 999 ONLY_ACTIVE_ARCH = YES;
1003 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; 1000 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
1004 STRIP_INSTALLED_PRODUCT = NO; 1001 STRIP_INSTALLED_PRODUCT = NO;
@@ -1051,7 +1048,6 @@ @@ -1051,7 +1048,6 @@
1051 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1048 GCC_WARN_UNINITIALIZED_AUTOS = YES;
1052 GCC_WARN_UNUSED_FUNCTION = YES; 1049 GCC_WARN_UNUSED_FUNCTION = YES;
1053 GCC_WARN_UNUSED_VARIABLE = YES; 1050 GCC_WARN_UNUSED_VARIABLE = YES;
1054 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1055 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; 1051 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
1056 STRIP_INSTALLED_PRODUCT = NO; 1052 STRIP_INSTALLED_PRODUCT = NO;
1057 SYMROOT = "${SRCROOT}/../build"; 1053 SYMROOT = "${SRCROOT}/../build";
@@ -1070,7 +1066,6 @@ @@ -1070,7 +1066,6 @@
1070 ENABLE_STRICT_OBJC_MSGSEND = YES; 1066 ENABLE_STRICT_OBJC_MSGSEND = YES;
1071 GCC_NO_COMMON_BLOCKS = YES; 1067 GCC_NO_COMMON_BLOCKS = YES;
1072 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch"; 1068 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
1073 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1074 MTL_ENABLE_DEBUG_INFO = NO; 1069 MTL_ENABLE_DEBUG_INFO = NO;
1075 OTHER_LDFLAGS = ""; 1070 OTHER_LDFLAGS = "";
1076 OTHER_LIBTOOLFLAGS = ""; 1071 OTHER_LIBTOOLFLAGS = "";
@@ -1094,7 +1089,6 @@ @@ -1094,7 +1089,6 @@
1094 ENABLE_STRICT_OBJC_MSGSEND = YES; 1089 ENABLE_STRICT_OBJC_MSGSEND = YES;
1095 GCC_NO_COMMON_BLOCKS = YES; 1090 GCC_NO_COMMON_BLOCKS = YES;
1096 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch"; 1091 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch";
1097 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1098 MTL_ENABLE_DEBUG_INFO = NO; 1092 MTL_ENABLE_DEBUG_INFO = NO;
1099 OTHER_LDFLAGS = ""; 1093 OTHER_LDFLAGS = "";
1100 OTHER_LIBTOOLFLAGS = ""; 1094 OTHER_LIBTOOLFLAGS = "";
@@ -1118,7 +1112,6 @@ @@ -1118,7 +1112,6 @@
1118 ENABLE_STRICT_OBJC_MSGSEND = YES; 1112 ENABLE_STRICT_OBJC_MSGSEND = YES;
1119 GCC_NO_COMMON_BLOCKS = YES; 1113 GCC_NO_COMMON_BLOCKS = YES;
1120 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch"; 1114 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
1121 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1122 MTL_ENABLE_DEBUG_INFO = YES; 1115 MTL_ENABLE_DEBUG_INFO = YES;
1123 OTHER_LDFLAGS = ""; 1116 OTHER_LDFLAGS = "";
1124 OTHER_LIBTOOLFLAGS = ""; 1117 OTHER_LIBTOOLFLAGS = "";
@@ -1141,7 +1134,6 @@ @@ -1141,7 +1134,6 @@
1141 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 1134 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1142 ENABLE_STRICT_OBJC_MSGSEND = YES; 1135 ENABLE_STRICT_OBJC_MSGSEND = YES;
1143 GCC_NO_COMMON_BLOCKS = YES; 1136 GCC_NO_COMMON_BLOCKS = YES;
1144 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1145 MACH_O_TYPE = staticlib; 1137 MACH_O_TYPE = staticlib;
1146 MTL_ENABLE_DEBUG_INFO = NO; 1138 MTL_ENABLE_DEBUG_INFO = NO;
1147 OTHER_LDFLAGS = ""; 1139 OTHER_LDFLAGS = "";
@@ -1164,7 +1156,6 @@ @@ -1164,7 +1156,6 @@
1164 DEBUG_INFORMATION_FORMAT = dwarf; 1156 DEBUG_INFORMATION_FORMAT = dwarf;
1165 ENABLE_STRICT_OBJC_MSGSEND = YES; 1157 ENABLE_STRICT_OBJC_MSGSEND = YES;
1166 GCC_NO_COMMON_BLOCKS = YES; 1158 GCC_NO_COMMON_BLOCKS = YES;
1167 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1168 MACH_O_TYPE = staticlib; 1159 MACH_O_TYPE = staticlib;
1169 MTL_ENABLE_DEBUG_INFO = YES; 1160 MTL_ENABLE_DEBUG_INFO = YES;
1170 OTHER_LDFLAGS = ""; 1161 OTHER_LDFLAGS = "";
@@ -1189,7 +1180,6 @@ @@ -1189,7 +1180,6 @@
1189 GCC_GENERATE_TEST_COVERAGE_FILES = YES; 1180 GCC_GENERATE_TEST_COVERAGE_FILES = YES;
1190 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; 1181 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
1191 GCC_NO_COMMON_BLOCKS = YES; 1182 GCC_NO_COMMON_BLOCKS = YES;
1192 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1193 MACH_O_TYPE = staticlib; 1183 MACH_O_TYPE = staticlib;
1194 MTL_ENABLE_DEBUG_INFO = YES; 1184 MTL_ENABLE_DEBUG_INFO = YES;
1195 OTHER_LDFLAGS = ""; 1185 OTHER_LDFLAGS = "";
@@ -1212,7 +1202,6 @@ @@ -1212,7 +1202,6 @@
1212 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 1202 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1213 ENABLE_STRICT_OBJC_MSGSEND = YES; 1203 ENABLE_STRICT_OBJC_MSGSEND = YES;
1214 GCC_NO_COMMON_BLOCKS = YES; 1204 GCC_NO_COMMON_BLOCKS = YES;
1215 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1216 MACH_O_TYPE = staticlib; 1205 MACH_O_TYPE = staticlib;
1217 MTL_ENABLE_DEBUG_INFO = NO; 1206 MTL_ENABLE_DEBUG_INFO = NO;
1218 OTHER_LDFLAGS = ""; 1207 OTHER_LDFLAGS = "";
@@ -1235,7 +1224,6 @@ @@ -1235,7 +1224,6 @@
1235 DEBUG_INFORMATION_FORMAT = dwarf; 1224 DEBUG_INFORMATION_FORMAT = dwarf;
1236 ENABLE_STRICT_OBJC_MSGSEND = YES; 1225 ENABLE_STRICT_OBJC_MSGSEND = YES;
1237 GCC_NO_COMMON_BLOCKS = YES; 1226 GCC_NO_COMMON_BLOCKS = YES;
1238 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
1239 MACH_O_TYPE = staticlib; 1227 MACH_O_TYPE = staticlib;
1240 MTL_ENABLE_DEBUG_INFO = YES; 1228 MTL_ENABLE_DEBUG_INFO = YES;
1241 OTHER_LDFLAGS = ""; 1229 OTHER_LDFLAGS = "";
@@ -538,7 +538,6 @@ @@ -538,7 +538,6 @@
538 GCC_WARN_UNUSED_FUNCTION = YES; 538 GCC_WARN_UNUSED_FUNCTION = YES;
539 GCC_WARN_UNUSED_VARIABLE = YES; 539 GCC_WARN_UNUSED_VARIABLE = YES;
540 INFOPLIST_FILE = "MasonryTestsLoader/MasonryTestsLoader-Info.plist"; 540 INFOPLIST_FILE = "MasonryTestsLoader/MasonryTestsLoader-Info.plist";
541 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
542 ONLY_ACTIVE_ARCH = YES; 541 ONLY_ACTIVE_ARCH = YES;
543 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}"; 542 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}";
544 PRODUCT_NAME = "$(TARGET_NAME)"; 543 PRODUCT_NAME = "$(TARGET_NAME)";
@@ -586,7 +585,6 @@ @@ -586,7 +585,6 @@
586 GCC_WARN_UNUSED_FUNCTION = YES; 585 GCC_WARN_UNUSED_FUNCTION = YES;
587 GCC_WARN_UNUSED_VARIABLE = YES; 586 GCC_WARN_UNUSED_VARIABLE = YES;
588 INFOPLIST_FILE = "MasonryTestsLoader/MasonryTestsLoader-Info.plist"; 587 INFOPLIST_FILE = "MasonryTestsLoader/MasonryTestsLoader-Info.plist";
589 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
590 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}"; 588 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}";
591 PRODUCT_NAME = "$(TARGET_NAME)"; 589 PRODUCT_NAME = "$(TARGET_NAME)";
592 SDKROOT = iphoneos; 590 SDKROOT = iphoneos;
@@ -636,7 +634,6 @@ @@ -636,7 +634,6 @@
636 GCC_WARN_UNUSED_FUNCTION = YES; 634 GCC_WARN_UNUSED_FUNCTION = YES;
637 GCC_WARN_UNUSED_VARIABLE = YES; 635 GCC_WARN_UNUSED_VARIABLE = YES;
638 INFOPLIST_FILE = "MasonryTests-Info.plist"; 636 INFOPLIST_FILE = "MasonryTests-Info.plist";
639 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
640 ONLY_ACTIVE_ARCH = YES; 637 ONLY_ACTIVE_ARCH = YES;
641 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}"; 638 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}";
642 PRODUCT_NAME = "$(TARGET_NAME)"; 639 PRODUCT_NAME = "$(TARGET_NAME)";
@@ -680,7 +677,6 @@ @@ -680,7 +677,6 @@
680 GCC_WARN_UNUSED_FUNCTION = YES; 677 GCC_WARN_UNUSED_FUNCTION = YES;
681 GCC_WARN_UNUSED_VARIABLE = YES; 678 GCC_WARN_UNUSED_VARIABLE = YES;
682 INFOPLIST_FILE = "MasonryTests-Info.plist"; 679 INFOPLIST_FILE = "MasonryTests-Info.plist";
683 - IPHONEOS_DEPLOYMENT_TARGET = 8.0;  
684 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}"; 680 PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.${PRODUCT_NAME:rfc1034identifier}";
685 PRODUCT_NAME = "$(TARGET_NAME)"; 681 PRODUCT_NAME = "$(TARGET_NAME)";
686 SDKROOT = iphoneos; 682 SDKROOT = iphoneos;