From ddc8d637305c1d3c9301f2b8a972dd48ddb3580b Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Thu, 21 May 2015 14:30:54 -0700 Subject: [PATCH 1/3] Add iOS tests support for iPhone 6/6+ screen sizes --- test/ios/App-Info.plist | 10 +++-- test/ios/LaunchScreen.xib | 45 ++++++++++++++++++++ test/ios/ios-tests.xcodeproj/project.pbxproj | 4 ++ 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 test/ios/LaunchScreen.xib diff --git a/test/ios/App-Info.plist b/test/ios/App-Info.plist index effff2063..f5a44890e 100644 --- a/test/ios/App-Info.plist +++ b/test/ios/App-Info.plist @@ -2,8 +2,6 @@ - MGLMapboxAccessToken - pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg CFBundleDevelopmentRegion en CFBundleDisplayName @@ -26,6 +24,12 @@ 1.0 LSRequiresIPhoneOS + MGLMapboxAccessToken + pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg + MGLMapboxMetricsEnabledSettingShownInApp + + UILaunchStoryboardName + LaunchScreen UIRequiredDeviceCapabilities armv7 @@ -36,8 +40,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - MGLMapboxMetricsEnabledSettingShownInApp - UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait diff --git a/test/ios/LaunchScreen.xib b/test/ios/LaunchScreen.xib new file mode 100644 index 000000000..f14a79070 --- /dev/null +++ b/test/ios/LaunchScreen.xib @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/test/ios/ios-tests.xcodeproj/project.pbxproj index 4f31a5b4a..9e36d0858 100644 --- a/test/ios/ios-tests.xcodeproj/project.pbxproj +++ b/test/ios/ios-tests.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 96567A231B0E84CD00D78776 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96567A221B0E84CD00D78776 /* LaunchScreen.xib */; }; DD043363196DBBD500E6F39D /* MGLTAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */; }; DD043364196DBBD500E6F39D /* MGLTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DD043360196DBBD500E6F39D /* MGLTViewController.m */; }; DD043366196DBBE000E6F39D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DD043365196DBBE000E6F39D /* main.m */; }; @@ -81,6 +82,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 96567A221B0E84CD00D78776 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = SOURCE_ROOT; }; DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; }; DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTAppDelegate.m; sourceTree = SOURCE_ROOT; }; @@ -219,6 +221,7 @@ children = ( DD043367196DBCC200E6F39D /* App-Info.plist */, DD043365196DBBE000E6F39D /* main.m */, + 96567A221B0E84CD00D78776 /* LaunchScreen.xib */, ); name = "Supporting Files"; sourceTree = ""; @@ -445,6 +448,7 @@ files = ( DD0581041ACB661200B112C9 /* Headers in Resources */, DD0581061ACB661C00B112C9 /* MapboxGL.bundle in Resources */, + 96567A231B0E84CD00D78776 /* LaunchScreen.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 9c309808bda7374690445da73f815ddfe24b5d30 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Thu, 21 May 2015 14:59:43 -0700 Subject: [PATCH 2/3] Add iOS test project launch images for older devices, too --- .../AppIcon.appiconset/Contents.json | 162 ++++++++++++++++++ .../LaunchImage.launchimage/Contents.json | 53 ++++++ .../Default-568h@2x.png | Bin 0 -> 184 bytes .../LaunchImage.launchimage/Default@2x.png | Bin 0 -> 170 bytes test/ios/ios-tests.xcodeproj/project.pbxproj | 4 + 5 files changed, 219 insertions(+) create mode 100644 test/ios/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 test/ios/Images.xcassets/LaunchImage.launchimage/Contents.json create mode 100644 test/ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png create mode 100644 test/ios/Images.xcassets/LaunchImage.launchimage/Default@2x.png diff --git a/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..5008911f9 --- /dev/null +++ b/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,162 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "57x57", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "size" : "57x57", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "72x72", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "72x72", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "car", + "size" : "120x120", + "scale" : "1x" + }, + { + "size" : "24x24", + "idiom" : "watch", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "38mm" + }, + { + "size" : "27.5x27.5", + "idiom" : "watch", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "42mm" + }, + { + "size" : "29x29", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "watch", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "38mm" + }, + { + "size" : "44x44", + "idiom" : "watch", + "scale" : "2x", + "role" : "longLook", + "subtype" : "42mm" + }, + { + "size" : "86x86", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "38mm" + }, + { + "size" : "98x98", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "42mm" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/test/ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/test/ios/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 000000000..628027f24 --- /dev/null +++ b/test/ios/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,53 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/test/ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/test/ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..208eea205a69e500b0bc99496dca3e8af7f4f79f GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sU@2f^28uX1mOBF}<^Z1%SL;m|?x$$F0=WgA vE{-7;ac>VXasqjW7ku~sE5m#gBtsh@lU~ojcxun%LXh#Eu6{1-oD!M2BK6SV_KF$egBxLR+za6d)U706BU yba4!+hc?L#?r#Eas270>sxvX Date: Thu, 21 May 2015 15:10:54 -0700 Subject: [PATCH 3/3] =?UTF-8?q?Change=20LaunchScreen=20text=20to=20=C2=A9?= =?UTF-8?q?=20because=20unicode=20is=20awesome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/ios/LaunchScreen.xib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ios/LaunchScreen.xib b/test/ios/LaunchScreen.xib index f14a79070..e0c780d8d 100644 --- a/test/ios/LaunchScreen.xib +++ b/test/ios/LaunchScreen.xib @@ -12,7 +12,7 @@ -