Merge branch 'merge-1.8' into barz-master

Conflicts:
	WYPopoverController/WYPopoverController.h
	WYPopoverController/WYPopoverController.m

Author: hsoi

README.md

@@ -129,13 +129,13 @@ WYPopoverController uses ARC.
 
 #### Cocoapods
 
-Add this line `pod 'WYPopoverController', '~> 0.1.7'` to your PodFile.
+Add this line `pod 'WYPopoverController', '~> 0.1.8'` to your PodFile.
 
 Your PodFile should look like :
 
 ```Ruby
 platform :ios, '6.0'
-pod 'WYPopoverController', '~> 0.1.7'
+pod 'WYPopoverController', '~> 0.1.8'
 ```
 
 To use the `master` branch of the repo :
@@ -280,7 +280,6 @@ A brief summary of each WYPopoverController release can be found on the [wiki](h
 
 * [@mikl_jeo](https://twitter.com/mikl_jeo) on Twitter
 * [@nicolaschengdev](https://github.com/nicolaschengdev) on Github
-* <a href="mailTo:nicolas.cheng.dev@gmail.com">nicolas.cheng.dev [at] gmail [dot] com</a>
 
 ### License
 

WYPopoverController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'WYPopoverController'
-  s.version      = '0.1.7-beta'
+  s.version      = '0.1.8'
   s.summary      = 'An iOS Popover for iPhone and iPad. Very customizable.'
   s.description  = <<-DESC
                     WYPopoverController is for the presentation of content in popover on iPhone / iPad devices. Very customizable.
@@ -14,6 +14,6 @@ Pod::Spec.new do |s|
   s.source_files = 'WYPopoverController/*.{h,m}'
   s.requires_arc = true
 
-  s.ios.deployment_target = '5.1'
+  s.ios.deployment_target = '6.0'
   s.ios.frameworks = 'QuartzCore', 'UIKit', 'CoreGraphics'
 end

WYPopoverController/WYPopoverController.h

@@ -1,5 +1,5 @@
 /*
- Version 0.1.7
+ Version 0.1.8
  
  WYPopoverController is available under the MIT license.
  
@@ -30,7 +30,11 @@
 @protocol WYPopoverControllerDelegate;
 
 #ifndef WY_POPOVER_DEFAULT_ANIMATION_DURATION
-    #define WY_POPOVER_DEFAULT_ANIMATION_DURATION    .20f
+    #define WY_POPOVER_DEFAULT_ANIMATION_DURATION    .25f
+#endif
+
+#ifndef WY_POPOVER_MIN_SIZE
+    #define WY_POPOVER_MIN_SIZE                      CGSizeMake(200, 100)
 #endif
 
 typedef NS_OPTIONS(NSUInteger, WYPopoverArrowDirection) {
@@ -88,19 +92,22 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-@interface WYPopoverController : NSObject
+@interface WYPopoverController : NSObject <UIAppearanceContainer>
 
 @property (nonatomic, weak) id <WYPopoverControllerDelegate> delegate;
 
-@property (nonatomic, copy) NSArray *passthroughViews;
-@property (nonatomic, assign) BOOL wantsDefaultContentAppearance;
-@property (nonatomic, assign) UIEdgeInsets popoverLayoutMargins;
-@property (nonatomic, assign, readonly, getter = isPopoverVisible) BOOL popoverVisible;
-@property (nonatomic, strong, readonly) UIViewController* contentViewController;
-@property (nonatomic, assign) CGSize popoverContentSize;
+@property (nonatomic, copy) NSArray                         *passthroughViews;
+@property (nonatomic, assign) BOOL                           wantsDefaultContentAppearance;
+@property (nonatomic, assign) UIEdgeInsets                   popoverLayoutMargins;
+@property (nonatomic, assign, readonly, getter=isPopoverVisible) BOOL popoverVisible;
+@property (nonatomic, strong, readonly) UIViewController    *contentViewController;
+@property (nonatomic, assign) CGSize                         popoverContentSize;
+@property (nonatomic, assign) CGFloat                        animationDuration;
 
 - (id)initWithContentViewController:(UIViewController *)viewController;
 
+//
+
 - (void)presentPopoverFromRect:(CGRect)rect
                         inView:(UIView *)view
       permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
@@ -112,11 +119,13 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
 
 - (void)presentPopoverAsDialogAnimated:(BOOL)animated;
 
-- (void)presentPopoverFromRect:(CGRect)aRect
-                        inView:(UIView *)aView
+//
+
+- (void)presentPopoverFromRect:(CGRect)rect
+                        inView:(UIView *)view
       permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
-                      animated:(BOOL)aAnimated
-                       options:(WYPopoverAnimationOptions)aOptions;
+                      animated:(BOOL)animated
+                       options:(WYPopoverAnimationOptions)options;
 
 - (void)presentPopoverFromRect:(CGRect)rect
                         inView:(UIView *)view
@@ -125,6 +134,7 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
                        options:(WYPopoverAnimationOptions)options
                     completion:(void (^)(void))completion;
 
+
 - (void)presentPopoverFromBarButtonItem:(UIBarButtonItem *)item
                permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections
                                animated:(BOOL)animated
@@ -133,6 +143,8 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
 - (void)presentPopoverAsDialogAnimated:(BOOL)animated
                                options:(WYPopoverAnimationOptions)options;
 
+//
+
 - (void)dismissPopoverAnimated:(BOOL)animated;
 
 @end
@@ -146,6 +158,6 @@ typedef NS_OPTIONS(NSUInteger, WYPopoverAnimationOptions) {
 
 - (void)popoverControllerDidDismissPopover:(WYPopoverController *)popoverController;
 
-- (void)popoverController:(WYPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView * __autoreleasing *)view;
+- (void)popoverController:(WYPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView **)view;
 
 @end