ios / Masonry · Commits

Go to a project

Authored by Pavel Mazurin
Commit 735377e0494de2060362b52e05d7451760732897 1 parent 5bf69e35

Made test project compatible with iPhone 6(+)

Inline Side-by-side
Showing 9 changed files with 71 additions and 0 deletions
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 114413081924B6EE008E702E /* Default-568h@2x.png */; }; 10 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 114413081924B6EE008E702E /* Default-568h@2x.png */; };
  11 + 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C02224819D0C4EC00507321 /* Images.xcassets */; };
11 3DB1CAD5184538E200E91FC5 /* MASExampleArrayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB1CAD4184538E200E91FC5 /* MASExampleArrayView.m */; }; 12 3DB1CAD5184538E200E91FC5 /* MASExampleArrayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB1CAD4184538E200E91FC5 /* MASExampleArrayView.m */; };
12 4BEB55B61957394E008C862B /* MASExampleRemakeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BEB55B51957394E008C862B /* MASExampleRemakeView.m */; }; 13 4BEB55B61957394E008C862B /* MASExampleRemakeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BEB55B51957394E008C862B /* MASExampleRemakeView.m */; };
13 6C87DADA5AB046D9A3181A65 /* libPods-Masonry iOS Examples.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BDC1B8303EED42A2B01B94B1 /* libPods-Masonry iOS Examples.a */; }; 14 6C87DADA5AB046D9A3181A65 /* libPods-Masonry iOS Examples.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BDC1B8303EED42A2B01B94B1 /* libPods-Masonry iOS Examples.a */; };
@@ -33,6 +34,7 @@ @@ -33,6 +34,7 @@
33 34
34 /* Begin PBXFileReference section */ 35 /* Begin PBXFileReference section */
35 114413081924B6EE008E702E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; }; 36 114413081924B6EE008E702E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
  37 + 3C02224819D0C4EC00507321 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
36 3DB1CAD3184538E200E91FC5 /* MASExampleArrayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleArrayView.h; sourceTree = "<group>"; }; 38 3DB1CAD3184538E200E91FC5 /* MASExampleArrayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleArrayView.h; sourceTree = "<group>"; };
37 3DB1CAD4184538E200E91FC5 /* MASExampleArrayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleArrayView.m; sourceTree = "<group>"; }; 39 3DB1CAD4184538E200E91FC5 /* MASExampleArrayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASExampleArrayView.m; sourceTree = "<group>"; };
38 4BEB55B41957394E008C862B /* MASExampleRemakeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleRemakeView.h; sourceTree = "<group>"; }; 40 4BEB55B41957394E008C862B /* MASExampleRemakeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASExampleRemakeView.h; sourceTree = "<group>"; };
@@ -127,6 +129,7 @@ @@ -127,6 +129,7 @@
127 DD52F23A179CAD57005CD195 /* MASAppDelegate.m */, 129 DD52F23A179CAD57005CD195 /* MASAppDelegate.m */,
128 DD52F257179CADCB005CD195 /* Controllers */, 130 DD52F257179CADCB005CD195 /* Controllers */,
129 DD52F256179CADC4005CD195 /* Views */, 131 DD52F256179CADC4005CD195 /* Views */,
  132 + 3C02224819D0C4EC00507321 /* Images.xcassets */,
130 DD52F231179CAD57005CD195 /* Supporting Files */, 133 DD52F231179CAD57005CD195 /* Supporting Files */,
131 ); 134 );
132 path = "Masonry iOS Examples"; 135 path = "Masonry iOS Examples";
@@ -239,6 +242,7 @@ @@ -239,6 +242,7 @@
239 isa = PBXResourcesBuildPhase; 242 isa = PBXResourcesBuildPhase;
240 buildActionMask = 2147483647; 243 buildActionMask = 2147483647;
241 files = ( 244 files = (
  245 + 3C02224919D0C4EC00507321 /* Images.xcassets in Resources */,
242 DD52F235179CAD57005CD195 /* InfoPlist.strings in Resources */, 246 DD52F235179CAD57005CD195 /* InfoPlist.strings in Resources */,
243 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */, 247 114413091924B6EE008E702E /* Default-568h@2x.png in Resources */,
244 ); 248 );
@@ -379,6 +383,7 @@ @@ -379,6 +383,7 @@
379 isa = XCBuildConfiguration; 383 isa = XCBuildConfiguration;
380 baseConfigurationReference = B086DD7D31DD4B49ADC08504 /* Pods-Masonry iOS Examples.xcconfig */; 384 baseConfigurationReference = B086DD7D31DD4B49ADC08504 /* Pods-Masonry iOS Examples.xcconfig */;
381 buildSettings = { 385 buildSettings = {
  386 + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
382 GCC_PRECOMPILE_PREFIX_HEADER = YES; 387 GCC_PRECOMPILE_PREFIX_HEADER = YES;
383 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch"; 388 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch";
384 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist"; 389 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist";
@@ -391,6 +396,7 @@ @@ -391,6 +396,7 @@
391 isa = XCBuildConfiguration; 396 isa = XCBuildConfiguration;
392 baseConfigurationReference = B086DD7D31DD4B49ADC08504 /* Pods-Masonry iOS Examples.xcconfig */; 397 baseConfigurationReference = B086DD7D31DD4B49ADC08504 /* Pods-Masonry iOS Examples.xcconfig */;
393 buildSettings = { 398 buildSettings = {
  399 + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
394 GCC_PRECOMPILE_PREFIX_HEADER = YES; 400 GCC_PRECOMPILE_PREFIX_HEADER = YES;
395 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch"; 401 GCC_PREFIX_HEADER = "Masonry iOS Examples/Masonry iOS Examples-Prefix.pch";
396 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist"; 402 INFOPLIST_FILE = "Masonry iOS Examples/Masonry iOS Examples-Info.plist";
  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 +}