ios / Masonry · Commits

Go to a project

Authored by iwill
Commit f131c1cf2a53bbedc75720270d0fdf86f7845a06 1 parent 2cf22518

update for iPhone X

Inline Side-by-side
Showing 13 changed files with 62 additions and 71 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,12 @@ @@ -33,12 +32,12 @@
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 + DFBACE5D1F7B86860047F15A /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DFBACE5C1F7B86860047F15A /* Launch Screen.storyboard */; };
36 /* End PBXBuildFile section */ 36 /* End PBXBuildFile section */
37 37
38 /* Begin PBXFileReference section */ 38 /* Begin PBXFileReference section */
39 00FC4A301B7359D700DCA999 /* MASExampleDistributeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleDistributeView.h; sourceTree = "<group>"; }; 39 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>"; }; 40 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>"; }; 41 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>"; }; 42 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>"; }; 43 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 +84,7 @@ @@ -85,6 +84,7 @@
85 DDDF60CB181915E300BF7B8B /* MASExampleLabelView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleLabelView.m; sourceTree = "<group>"; }; 84 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>"; }; 85 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>"; }; 86 DDF3875B179D648D00178773 /* MASExampleAnimatedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleAnimatedView.m; sourceTree = "<group>"; };
  87 + DFBACE5C1F7B86860047F15A /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
88 /* End PBXFileReference section */ 88 /* End PBXFileReference section */
89 89
90 /* Begin PBXFrameworksBuildPhase section */ 90 /* Begin PBXFrameworksBuildPhase section */
@@ -105,7 +105,6 @@ @@ -105,7 +105,6 @@
105 DD52F21E179CAD57005CD195 = { 105 DD52F21E179CAD57005CD195 = {
106 isa = PBXGroup; 106 isa = PBXGroup;
107 children = ( 107 children = (
108 - 114413081924B6EE008E702E /* Default-568h@2x.png */,  
109 DD52F230179CAD57005CD195 /* Masonry iOS Examples */, 108 DD52F230179CAD57005CD195 /* Masonry iOS Examples */,
110 DD52F229179CAD57005CD195 /* Frameworks */, 109 DD52F229179CAD57005CD195 /* Frameworks */,
111 DD52F228179CAD57005CD195 /* Products */, 110 DD52F228179CAD57005CD195 /* Products */,
@@ -141,6 +140,7 @@ @@ -141,6 +140,7 @@
141 DD52F256179CADC4005CD195 /* Views */, 140 DD52F256179CADC4005CD195 /* Views */,
142 3C02224819D0C4EC00507321 /* Images.xcassets */, 141 3C02224819D0C4EC00507321 /* Images.xcassets */,
143 DD52F231179CAD57005CD195 /* Supporting Files */, 142 DD52F231179CAD57005CD195 /* Supporting Files */,
  143 + DFBACE5C1F7B86860047F15A /* Launch Screen.storyboard */,
144 ); 144 );
145 path = "Masonry iOS Examples"; 145 path = "Masonry iOS Examples";
146 sourceTree = "<group>"; 146 sourceTree = "<group>";
@@ -268,9 +268,9 @@ @@ -268,9 +268,9 @@
268 isa = PBXResourcesBuildPhase; 268 isa = PBXResourcesBuildPhase;
269 buildActionMask = 2147483647; 269 buildActionMask = 2147483647;
270 files = ( 270 files = (
  271 + DFBACE5D1F7B86860047F15A /* Launch Screen.storyboard in Resources */,
271 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */, 272 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */,
272 DD52F235179CAD57005CD195 /* InfoPlist.strings in Resources */, 273 DD52F235179CAD57005CD195 /* InfoPlist.strings in Resources */,
273 - 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */,  
274 ); 274 );
275 runOnlyForDeploymentPostprocessing = 0; 275 runOnlyForDeploymentPostprocessing = 0;
276 }; 276 };
@@ -461,7 +461,6 @@ @@ -461,7 +461,6 @@
461 isa = XCBuildConfiguration; 461 isa = XCBuildConfiguration;
462 baseConfigurationReference = 50B25D0621957AEB87C3FCC2 /* Pods-Masonry iOS Examples.debug.xcconfig */; 462 baseConfigurationReference = 50B25D0621957AEB87C3FCC2 /* Pods-Masonry iOS Examples.debug.xcconfig */;
463 buildSettings = { 463 buildSettings = {
464 - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;  
465 GCC_PRECOMPILE_PREFIX_HEADER = YES; 464 GCC_PRECOMPILE_PREFIX_HEADER = YES;
466 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch"; 465 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch";
467 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist"; 466 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist";
@@ -476,7 +475,6 @@ @@ -476,7 +475,6 @@
476 isa = XCBuildConfiguration; 475 isa = XCBuildConfiguration;
477 baseConfigurationReference = 321AA59CF7B045B6D503D2E5 /* Pods-Masonry iOS Examples.release.xcconfig */; 476 baseConfigurationReference = 321AA59CF7B045B6D503D2E5 /* Pods-Masonry iOS Examples.release.xcconfig */;
478 buildSettings = { 477 buildSettings = {
479 - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;  
480 GCC_PRECOMPILE_PREFIX_HEADER = YES; 478 GCC_PRECOMPILE_PREFIX_HEADER = YES;
481 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch"; 479 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch";
482 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist"; 480 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist";
  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 + <deployment identifier="iOS"/>
  8 + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
  9 + <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
  10 + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  11 + </dependencies>
  12 + <scenes>
  13 + <!--View Controller-->
  14 + <scene sceneID="EHf-IW-A2E">
  15 + <objects>
  16 + <viewController id="01J-lp-oVM" sceneMemberID="viewController">
  17 + <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
  18 + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
  19 + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  20 + <subviews>
  21 + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2017 Jonas Budelmann. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
  22 + <rect key="frame" x="0.0" y="612.5" width="375" height="20.5"/>
  23 + <fontDescription key="fontDescription" type="system" pointSize="17"/>
  24 + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  25 + <nil key="highlightedColor"/>
  26 + </label>
  27 + <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">
  28 + <rect key="frame" x="0.0" y="202" width="375" height="43"/>
  29 + <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
  30 + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  31 + <nil key="highlightedColor"/>
  32 + </label>
  33 + </subviews>
  34 + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
  35 + <constraints>
  36 + <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
  37 + <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
  38 + <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
  39 + <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="34" id="Y44-ml-fuU"/>
  40 + <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
  41 + <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
  42 + </constraints>
  43 + </view>
  44 + </viewController>
  45 + <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
  46 + </objects>
  47 + <point key="canvasLocation" x="53" y="375"/>
  48 + </scene>
  49 + </scenes>
  50 +</document>
@@ -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>