automatic use of edgesForExtendedLayout = UIRectEdgeNone with iOS7

Author: nicolaschengdev

WYPopoverController/WYPopoverController.h

@@ -113,8 +113,9 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
 @optional
 
 - (BOOL)popoverControllerShouldDismissPopover:(WYPopoverController *)popoverController;
+
 - (void)popoverControllerDidDismissPopover:(WYPopoverController *)popoverController;
+
 - (void)popoverController:(WYPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView **)view;
 
 @end
-

WYPopoverController/WYPopoverController.m

@@ -25,6 +25,8 @@ of this software and associated documentation files (the "Software"), to deal
 
 #import "WYPopoverController.h"
 
+#import <objc/runtime.h>
+
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000
     #define WY_BASE_SDK_7_ENABLED
 #endif
@@ -44,6 +46,63 @@ of this software and associated documentation files (the "Software"), to deal
 #define WY_IS_IOS_LESS_THAN(v)                 ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
 
 
+@interface UINavigationController (WYPopover)
+
+@property(nonatomic, assign, getter = isEmbedInPopover) BOOL embedInPopover;
+
+@end
+
+@implementation UINavigationController (WYPopover)
+
+static char const * const UINavigationControllerEmbedInPopoverTagKey = "UINavigationControllerEmbedInPopoverTagKey";
+
+@dynamic embedInPopover;
+
++ (void)load
+{
+    Method original, swizzle;
+    
+    original = class_getInstanceMethod(self, @selector(pushViewController:animated:));
+    
+    swizzle = class_getInstanceMethod(self, @selector(sizzled_pushViewController:animated:));
+    
+    method_exchangeImplementations(original, swizzle);
+}
+
+- (BOOL)isEmbedInPopover
+{
+    BOOL result = NO;
+    
+    NSNumber *value = objc_getAssociatedObject(self, UINavigationControllerEmbedInPopoverTagKey);
+    
+    if (value)
+    {
+        result = [value boolValue];
+    }
+    
+    return result;
+}
+
+- (void)setEmbedInPopover:(BOOL)value
+{
+    objc_setAssociatedObject(self, UINavigationControllerEmbedInPopoverTagKey, [NSNumber numberWithBool:value], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (void)sizzled_pushViewController:(UIViewController *)viewController animated:(BOOL)animated
+{
+    if (self.isEmbedInPopover && WY_IS_IOS_GREATER_THAN_OR_EQUAL_TO(@"7.0"))
+    {
+        viewController.edgesForExtendedLayout = UIRectEdgeNone;
+    }
+    
+    [self sizzled_pushViewController:viewController animated:animated];
+}
+
+@end
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 @interface WYPopoverArea : NSObject
 {
 }
@@ -1446,7 +1505,7 @@ - (void)presentPopoverFromRect:(CGRect)aRect inView:(UIView *)aView permittedArr
 
     [self positionPopover];
 
-    [self drawPopoverNavigationBar];
+    [self setPopoverNavigationBarBackgroundImage];
 
     containerView.hidden = NO;
 
@@ -1499,85 +1558,19 @@ - (void)presentPopoverFromRect:(CGRect)aRect inView:(UIView *)aView permittedArr
     }
 }
 
-- (void)drawPopoverNavigationBar
+- (void)setPopoverNavigationBarBackgroundImage
 {
     if (wantsDefaultContentAppearance == NO && [viewController isKindOfClass:[UINavigationController class]])
     {
-        // UIBarMetricsDefault > navigationBarHeight = 44
-        // UIBarMetricsLandscapePhone > navigationBarHeight = 32
-        
         UINavigationController *navigationController = (UINavigationController *)viewController;
+        navigationController.embedInPopover = YES;
 
-        // UIBarMetricsDefault
-        
-        CGFloat navigationBarHeight = 44;
-        
-        CGRect rectPathRect = CGRectMake(0, 0, 20, navigationBarHeight);
-        
-        CGFloat cornerRadius = containerView.innerCornerRadius;
-        
-        UIBezierPath *rectPath = [UIBezierPath bezierPathWithRoundedRect:rectPathRect byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(cornerRadius, cornerRadius)];
-        
-        UIGraphicsBeginImageContextWithOptions(rectPath.bounds.size, NO, 0.0f);
-        
-        CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-        CGContextRef context = UIGraphicsGetCurrentContext();
-        
-        //// Gradient Declarations
-        NSArray* fillGradientColors = [NSArray arrayWithObjects:
-                                       (id)containerView.fillTopColor.CGColor,
-                                       (id)containerView.fillBottomColor.CGColor,
-                                       nil];
-        
-        CGFloat fillGradientLocations[] = {0, 1};
-        
-        CGGradientRef fillGradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)fillGradientColors, fillGradientLocations);
-        
-        //// Drawing
-        CGContextSaveGState(context);
+        if (WY_IS_IOS_GREATER_THAN_OR_EQUAL_TO(@"7.0") && [navigationController viewControllers] && [[navigationController viewControllers] count] > 0)
         {
-            //CGContextAddPath(context, [rectPath CGPath]);
-            //CGContextClip(context);
-            
-            [rectPath addClip];
-            
-            CGFloat gradientTopPosition = [containerView innerRect].origin.y - navigationBarHeight + containerView.outerShadowInsets.top;
-            CGFloat gradientBottomPosition = gradientTopPosition + [containerView outerRect].size.height;
-            
-            CGContextDrawLinearGradient(context, fillGradient,
-                                        CGPointMake(0, gradientTopPosition),
-                                        CGPointMake(0, gradientBottomPosition),
-                                        0);
+            [(UIViewController *)[[navigationController viewControllers] objectAtIndex:0] setEdgesForExtendedLayout:UIRectEdgeNone];
         }
-        CGContextRestoreGState(context);
-        
-        UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-        UIGraphicsEndImageContext();
-        
-        CGGradientRelease(fillGradient);
-        CGColorSpaceRelease(colorSpace);
-        
-        [navigationController.navigationBar setBackgroundImage:[image resizableImageWithCapInsets:UIEdgeInsetsMake(0, cornerRadius + 1, 0, cornerRadius + 1)] forBarMetrics:UIBarMetricsDefault];
-        
-        // UIBarMetricsLandscapePhone
-        
-        navigationBarHeight = 32;
-        
-        rectPath = [UIBezierPath bezierPathWithRect:CGRectMake(0, 0, 20, navigationBarHeight)];
-        
-        UIGraphicsBeginImageContextWithOptions(rectPath.bounds.size, NO, 0.0f);
 
-        context = UIGraphicsGetCurrentContext();
-        
-        CGContextClipToRect(context, CGRectMake(0, 0, rectPath.bounds.size.width, rectPath.bounds.size.height));
-        
-        [image drawInRect:rectPath.bounds];
-        
-        image = UIGraphicsGetImageFromCurrentImageContext();
-        
-        UIGraphicsEndImageContext();
-        
-        [navigationController.navigationBar setBackgroundImage:[image resizableImageWithCapInsets:UIEdgeInsetsMake(0, cornerRadius + 1, 0, cornerRadius + 1)] forBarMetrics:UIBarMetricsLandscapePhone];
+        [navigationController.navigationBar setBackgroundImage:[UIImage imageWithColor:[UIColor clearColor]] forBarMetrics:UIBarMetricsDefault];
     }
 
     viewController.view.clipsToBounds = YES;
@@ -1586,10 +1579,6 @@ - (void)drawPopoverNavigationBar
     {
         viewController.view.layer.cornerRadius = containerView.outerCornerRadius;
     }
-    else
-    {
-        viewController.view.layer.cornerRadius = containerView.innerCornerRadius;
-    }
 }
 
 - (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections animated:(BOOL)aAnimated
@@ -1878,7 +1867,9 @@ - (void)dismissPopoverAnimated:(BOOL)aAnimated callDelegate:(BOOL)callDelegate
                                                       object:nil];
 
         [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
+        [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                        name:UIDeviceOrientationDidChangeNotification
+                                                      object:nil];
 
         [[NSNotificationCenter defaultCenter] removeObserver:self
                                                         name:UIKeyboardWillShowNotification

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -13,7 +13,6 @@ @interface WYAllDirectionsViewController () <WYPopoverControllerDelegate>
 {
     WYPopoverController* settingsPopoverController;
     WYPopoverController* anotherPopoverController;
-    WYPopoverController* datePopoverController;
 }
 
 - (IBAction)showPopover:(id)sender;
@@ -63,7 +62,6 @@ - (IBAction)showPopover:(id)sender
     {
         UIView* btn = (UIView*)sender;
 
-        /*
         WYSettingsViewController *settingsViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WYSettingsViewController"];
 
         if ([settingsViewController respondsToSelector:@selector(setPreferredContentSize:)]) {
@@ -86,31 +84,6 @@ - (IBAction)showPopover:(id)sender
         settingsPopoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 10, 10, 10);
         settingsPopoverController.wantsDefaultContentAppearance = NO;
         [settingsPopoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
-        */
-        
-        UIViewController *vc = [[UIViewController alloc] init];
-        
-        vc.view = [[UIDatePicker alloc] init];
-        vc.title = @"Data";
-        
-        datePopoverController = [[WYPopoverController alloc] initWithContentViewController:[[UINavigationController alloc] initWithRootViewController:vc]];
-        
-        CGSize viewSize = vc.view.bounds.size;
-        
-        NSLog(@"viewSize = %@", NSStringFromCGSize(viewSize)); // ---> height is 216 instead of 162
-        
-        if ([vc respondsToSelector:@selector(setPreferredContentSize:)])
-        {
-            viewSize.height = 162;
-            vc.edgesForExtendedLayout = UIRectEdgeNone;
-            vc.preferredContentSize = viewSize;
-        }
-        else
-        {
-            vc.contentSizeForViewInPopover = viewSize;
-        }
-        
-        [datePopoverController presentPopoverFromRect:btn.bounds inView:btn permittedArrowDirections:WYPopoverArrowDirectionAny animated:YES];
     }
     else
     {

demos/Demo/WYPopoverDemo/WYAppDelegate.m

@@ -21,12 +21,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     //
 
     WYPopoverBackgroundView* popoverAppearance = [WYPopoverBackgroundView appearance];
-    [popoverAppearance setTintColor:[UIColor whiteColor]];
-    [popoverAppearance setFillBottomColor:[UIColor colorWithWhite:0.75 alpha:1]];
-    [popoverAppearance setOuterStrokeColor:[UIColor colorWithWhite:0.5 alpha:1]];
-    [popoverAppearance setInnerStrokeColor:[UIColor colorWithWhite:0.5 alpha:1]];
-    [popoverAppearance setOuterCornerRadius:8];
-    [popoverAppearance setMinOuterCornerRadius:8];
+    [popoverAppearance setTintColor:[UIColor colorWithRed:235./255. green:235./255. blue:235./255. alpha:1]];
+    [popoverAppearance setOuterStrokeColor:[UIColor darkGrayColor]];
+    [popoverAppearance setInnerStrokeColor:[UIColor darkGrayColor]];
+    [popoverAppearance setOuterCornerRadius:10];
+    [popoverAppearance setMinOuterCornerRadius:10];
 
     [popoverAppearance setOuterShadowBlurRadius:6];
     [popoverAppearance setOuterShadowColor:[UIColor colorWithWhite:0 alpha:0.65]];
@@ -39,7 +38,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [popoverAppearance setArrowHeight:20];
     [popoverAppearance setArrowBase:42];
 
-    [popoverAppearance setInnerCornerRadius:4];
+    [popoverAppearance setInnerCornerRadius:10];
     [popoverAppearance setInnerShadowBlurRadius:3];
     [popoverAppearance setInnerShadowColor:[UIColor colorWithWhite:0 alpha:0.75]];
     [popoverAppearance setInnerShadowOffset:CGSizeMake(0, 1)];
@@ -50,7 +49,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [navBarAppearance setTitleTextAttributes:@{
                    UITextAttributeTextColor : [UIColor darkGrayColor],
               UITextAttributeTextShadowColor: [UIColor whiteColor],
-             UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetMake(0, -1)]
+             UITextAttributeTextShadowOffset: [NSValue valueWithUIOffset:UIOffsetMake(0, 0)]
     }];
 
     //Appearance 2 (orange popover)

demos/DemoSegue/WYPopoverDemoSegue/MainStoryboard_iPad.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="bet-px-Lfz">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="bet-px-Lfz">
     <dependencies>
         <deployment defaultVersion="1280" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
@@ -61,9 +61,7 @@
                         </barButtonItem>
                         <barButtonItem key="rightBarButtonItem" systemItem="add" id="ifR-TL-AmP">
                             <connections>
-                                <segue destination="Dc6-DE-IUa" kind="popover" identifier="AddPlayer" popoverAnchorBarButtonItem="ifR-TL-AmP" id="CqR-cw-hG7">
-                                    <popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
-                                </segue>
+                                <segue destination="Dc6-DE-IUa" kind="custom" identifier="AddPlayer" customClass="WYStoryboardPopoverSegue" id="CqR-cw-hG7"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>