Demo updated

Author: nicolaschengdev

WYPopoverController/WYPopoverController.m

@@ -2383,7 +2383,7 @@ - (void)didChangeDeviceOrientation:(NSNotification*)notification
 
 - (void)keyboardWillShow:(NSNotification *)notification
 {
-    NSDictionary* info = [notification userInfo];
+    NSDictionary *info = [notification userInfo];
     keyboardRect = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
     [self positionPopover];
     [containerView setNeedsDisplay];

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -17,6 +17,7 @@ @interface WYAllDirectionsViewController () <WYPopoverControllerDelegate>
 }
 
 - (IBAction)open:(id)sender;
+- (void)close:(id)sender;
 
 @end
 
@@ -43,8 +44,8 @@ - (void)viewDidLoad
         self.edgesForExtendedLayout = UIRectEdgeNone;
     }
 
-    UIImage* normal = [[UIImage imageNamed:@"button-normal"] stretchableImageWithLeftCapWidth:16 topCapHeight:0];
-    UIImage* highlighted = [[UIImage imageNamed:@"button-highlighted"] stretchableImageWithLeftCapWidth:16 topCapHeight:0];
+    UIImage *normal = [[UIImage imageNamed:@"button-normal"] stretchableImageWithLeftCapWidth:16 topCapHeight:0];
+    UIImage *highlighted = [[UIImage imageNamed:@"button-highlighted"] stretchableImageWithLeftCapWidth:16 topCapHeight:0];
 
     [topLeftButton setBackgroundImage:normal forState:UIControlStateNormal]; [topLeftButton setBackgroundImage:highlighted forState:UIControlStateHighlighted];
     [topButton setBackgroundImage:normal forState:UIControlStateNormal]; [topButton setBackgroundImage:highlighted forState:UIControlStateHighlighted];
@@ -59,7 +60,14 @@ - (void)viewDidLoad
 
 - (IBAction)open:(id)sender
 {
-    [self showmodal:sender];
+    [self showpopover:sender];
+}
+
+- (void)close:(id)sender
+{
+    [settingsPopoverController dismissPopoverAnimated:YES];
+    settingsPopoverController.delegate = nil;
+    settingsPopoverController = nil;
 }
 
 - (IBAction)showmodal:(id)sender
@@ -75,7 +83,7 @@ - (IBAction)showpopover:(id)sender
 {
     if (settingsPopoverController == nil)
     {
-        UIView* btn = (UIView*)sender;
+        UIView *btn = (UIView*)sender;
 
         WYSettingsViewController *settingsViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WYSettingsViewController"];
 
@@ -87,7 +95,7 @@ - (IBAction)showpopover:(id)sender
         }
 
         settingsViewController.title = @"Settings";
-        [settingsViewController.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(done:)]];
+        [settingsViewController.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(close:)]];
 
         settingsViewController.modalInPopover = NO;
 
@@ -105,6 +113,10 @@ - (IBAction)showpopover:(id)sender
                                                  animated:YES
                                                   options:WYPopoverAnimationOptionFadeWithScale];
     }
+    else
+    {
+        [self close:nil];
+    }
 }
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender

demos/Demo/WYPopoverDemo/WYStoryboard.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KSs-by-RAI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KSs-by-RAI">
     <dependencies>
         <deployment defaultVersion="1552" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
     </dependencies>
     <scenes>
         <!--All Directions View Controller - POPOVER-->