fix issue #29 update demo app for iOS 6.1

Author: nicolaschengdev

demos/Demo/WYPopoverDemo.xcodeproj/project.pbxproj

@@ -341,7 +341,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "WYPopoverDemo/WYPopoverDemo-Prefix.pch";
 				INFOPLIST_FILE = "WYPopoverDemo/WYPopoverDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;
@@ -354,7 +354,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "WYPopoverDemo/WYPopoverDemo-Prefix.pch";
 				INFOPLIST_FILE = "WYPopoverDemo/WYPopoverDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = app;

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -9,10 +9,9 @@
 #import "WYSettingsViewController.h"
 #import "WYAnotherViewController.h"
 
-@interface WYAllDirectionsViewController () <WYPopoverControllerDelegate, UIPopoverControllerDelegate>
+@interface WYAllDirectionsViewController () <WYPopoverControllerDelegate>
 {
     WYPopoverController* popoverController;
-    UIPopoverController* standardPopoverController;
 }
 
 - (IBAction)showPopover:(id)sender;
@@ -58,7 +57,18 @@ - (IBAction)showPopover:(id)sender
         UIView* btn = (UIView*)sender;
 
         WYSettingsViewController* settingsViewController = [[WYSettingsViewController alloc] init];
-        settingsViewController.preferredContentSize = CGSizeMake(280, 200);
+        
+        if ([settingsViewController respondsToSelector:@selector(setPreferredContentSize:)])
+        {
+            // iOS 7
+            settingsViewController.preferredContentSize = CGSizeMake(280, 200);
+        }
+        else
+        {
+            // iOS < 7
+            settingsViewController.contentSizeForViewInPopover = CGSizeMake(280, 200);
+        }
+        
         settingsViewController.title = @"Settings";
         [settingsViewController.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(done:)]];
 
@@ -73,11 +83,6 @@ - (IBAction)showPopover:(id)sender
         popoverController.wantsDefaultContentAppearance = NO;
         [popoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
 
-        /*
-        standardPopoverController = [[UIPopoverController alloc] initWithContentViewController:contentViewController];
-        standardPopoverController.delegate = self;
-        [standardPopoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
-        */
     }
     else
     {
@@ -107,19 +112,6 @@ - (void)popoverControllerDidDismiss:(WYPopoverController *)controller
     popoverController = nil;
 }
 
-#pragma mark - UIPopoverControllerDelegate
-
-- (BOOL)popoverControllerShouldDismissPopover:(UIPopoverController *)aPopoverController
-{
-    return YES;
-}
-
-- (void)popoverControllerDidDismissPopover:(UIPopoverController *)aPopoverController
-{
-    standardPopoverController.delegate = nil;
-    standardPopoverController = nil;
-}
-
 #pragma mark - UIViewControllerRotation
 
 // Applications should use supportedInterfaceOrientations and/or shouldAutorotate..

demos/Demo/WYPopoverDemo/WYModalViewController.m

@@ -39,7 +39,16 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
 
         UIViewController* destinationViewController = (UIViewController *)segue.destinationViewController;
 
-        destinationViewController.contentSizeForViewInPopover = CGSizeMake(280, 280);
+        if ([destinationViewController respondsToSelector:@selector(setPreferredContentSize:)])
+        {
+            // iOS 7
+            destinationViewController.preferredContentSize = CGSizeMake(280, 200);
+        }
+        else
+        {
+            // iOS < 7
+            destinationViewController.contentSizeForViewInPopover = CGSizeMake(280, 200);
+        }
 
         popoverController = [popoverSegue popoverControllerWithSender:sender permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
 

demos/DemoSegue/WYPopoverDemoSegue/en.lproj/MainStoryboard.storyboard

@@ -132,7 +132,7 @@
                                 <rect key="frame" x="0.0" y="86" width="320" height="55"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="m8J-t0-bnL" id="SqI-dO-645">
-                                    <rect key="frame" x="0.0" y="0.0" width="320.00000000000006" height="54"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="54"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="100" contentMode="left" text="Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LPL-hb-cHT">