From b8f1af10536134ecbd4fef6a178871888757db98 Mon Sep 17 00:00:00 2001 From: George Polak Date: Thu, 19 Feb 2015 19:45:27 -0500 Subject: [PATCH] ipad support --- GPUberView/GPUberViewController.m | 1 + .../GPUberViewDemo.xcodeproj/project.pbxproj | 2 + .../LaunchImage.launchimage/Contents.json | 119 ++++++++++++++++++ .../uber_button.imageset/Contents.json | 22 ---- .../uber_button.imageset/uber_button.png | Bin 2817 -> 0 bytes .../uber_button.imageset/uber_button@2x.png | Bin 5288 -> 0 bytes GPUberViewDemo/GPUberViewDemo/Info.plist | 6 +- .../GPUberViewDemo/MainViewController.xib | 29 ++++- 8 files changed, 149 insertions(+), 30 deletions(-) delete mode 100644 GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/Contents.json delete mode 100644 GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/uber_button.png delete mode 100644 GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/uber_button@2x.png diff --git a/GPUberView/GPUberViewController.m b/GPUberView/GPUberViewController.m index 1790f74..9d79cfa 100644 --- a/GPUberView/GPUberViewController.m +++ b/GPUberView/GPUberViewController.m @@ -99,6 +99,7 @@ - (id)initWithServerToken:(NSString *)serverToken - (void)showInViewController:(UIViewController *)viewController { UINavigationController *nVc = [[UINavigationController alloc] initWithRootViewController:self]; + nVc.modalPresentationStyle = UIModalPresentationFormSheet; [viewController presentViewController:nVc animated:YES completion:nil]; } diff --git a/GPUberViewDemo/GPUberViewDemo.xcodeproj/project.pbxproj b/GPUberViewDemo/GPUberViewDemo.xcodeproj/project.pbxproj index 6104a64..2610b75 100644 --- a/GPUberViewDemo/GPUberViewDemo.xcodeproj/project.pbxproj +++ b/GPUberViewDemo/GPUberViewDemo.xcodeproj/project.pbxproj @@ -418,6 +418,7 @@ INFOPLIST_FILE = GPUberViewDemo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -430,6 +431,7 @@ INFOPLIST_FILE = GPUberViewDemo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/GPUberViewDemo/GPUberViewDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/GPUberViewDemo/GPUberViewDemo/Images.xcassets/LaunchImage.launchimage/Contents.json index 7377c42..7cef4e7 100644 --- a/GPUberViewDemo/GPUberViewDemo/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/GPUberViewDemo/GPUberViewDemo/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,5 +1,29 @@ { "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "667h", + "scale" : "2x" + }, { "orientation" : "portrait", "idiom" : "iphone", @@ -16,6 +40,101 @@ "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" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" } ], "info" : { diff --git a/GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/Contents.json b/GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/Contents.json deleted file mode 100644 index f2d1405..0000000 --- a/GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "uber_button.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "uber_button@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/uber_button.png b/GPUberViewDemo/GPUberViewDemo/Images.xcassets/uber_button.imageset/uber_button.png deleted file mode 100644 index 89f43ccb88e2d34da7d3485be5f9987f44b71f09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2817 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 LSRequiresIPhoneOS + NSLocationWhenInUseUsageDescription + Determines your Uber pickup location. UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities armv7 - NSLocationWhenInUseUsageDescription - Determines your Uber pickup location. UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight diff --git a/GPUberViewDemo/GPUberViewDemo/MainViewController.xib b/GPUberViewDemo/GPUberViewDemo/MainViewController.xib index 9f9137e..38d6ee6 100644 --- a/GPUberViewDemo/GPUberViewDemo/MainViewController.xib +++ b/GPUberViewDemo/GPUberViewDemo/MainViewController.xib @@ -18,12 +18,22 @@