Version 0.2.0

Author: Carson Perrotti

CNPPopupController.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "CNPPopupController"
-  s.version      = "0.1.2"
+  s.version      = "0.2.0"
   s.summary      = "A versatile popup for iOS"
 
   s.description  = <<-DESC
@@ -77,7 +77,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/carsonperrotti/CNPPopupController.git", :tag => "0.1.2" }
+  s.source       = { :git => "https://github.com/carsonperrotti/CNPPopupController.git", :tag => "0.2.0" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

CNPPopupController/CNPPopupController.h

@@ -9,22 +9,14 @@
 #import <UIKit/UIKit.h>
 
 @protocol CNPPopupControllerDelegate;
-@class CNPPopupTheme, CNPPopupButtonItem;
+@class CNPPopupTheme, CNPPopupButton;
 
 @interface CNPPopupController : NSObject
 
-@property (nonatomic, strong) NSAttributedString *popupTitle;
-@property (nonatomic, strong) NSArray *contents;
-@property (nonatomic, strong) NSArray *buttonItems;
-@property (nonatomic, strong) CNPPopupButtonItem *destructiveButtonItem;
 @property (nonatomic, strong) CNPPopupTheme *theme;
-
 @property (nonatomic, weak) id <CNPPopupControllerDelegate> delegate;
 
-- (instancetype)initWithTitle:(NSAttributedString *)popupTitle
-                     contents:(NSArray *)contents
-                 buttonItems:(NSArray *)buttonItems
-       destructiveButtonItem:(CNPPopupButtonItem *)destructiveButtonItem;
+- (instancetype)initWithContents:(NSArray *)contents;
 
 - (void)presentPopupControllerAnimated:(BOOL)flag;
 - (void)dismissPopupControllerAnimated:(BOOL)flag;
@@ -36,8 +28,16 @@
 @optional
 - (void)popupControllerWillPresent:(CNPPopupController *)controller;
 - (void)popupControllerDidPresent:(CNPPopupController *)controller;
-- (void)popupController:(CNPPopupController *)controller willDismissWithButtonTitle:(NSString *)title;
-- (void)popupController:(CNPPopupController *)controller didDismissWithButtonTitle:(NSString *)title;
+- (void)popupControllerWillDismiss:(CNPPopupController *)controller;
+- (void)popupControllerDidDismiss:(CNPPopupController *)controller;
+
+@end
+
+typedef void(^SelectionHandler) (CNPPopupButton *button);
+
+@interface CNPPopupButton : UIButton
+
+@property (nonatomic, strong) SelectionHandler selectionHandler;
 
 @end
 
@@ -59,38 +59,23 @@ typedef NS_ENUM(NSInteger, CNPPopupPresentationStyle) {
 
 // CNPPopupMaskType
 typedef NS_ENUM(NSInteger, CNPPopupMaskType) {
-    CNPPopupMaskTypeNone = 0, // Allow interaction with underlying views.
-    CNPPopupMaskTypeClear, // Don't allow interaction with underlying views.
-    CNPPopupMaskTypeDimmed, // Don't allow interaction with underlying views, dim background.
+    CNPPopupMaskTypeClear,
+    CNPPopupMaskTypeDimmed
 };
 
-typedef void(^SelectionHandler) (CNPPopupButtonItem *item);
-
-@interface CNPPopupButtonItem : NSObject
-
-@property (nonatomic, strong) NSAttributedString *buttonTitle;
-@property (nonatomic, strong) UIColor *backgroundColor;
-@property (nonatomic, strong) UIColor *borderColor;
-@property (nonatomic, assign) CGFloat borderWidth;
-@property (nonatomic, assign) CGFloat cornerRadius;
-@property (nonatomic, assign) CGFloat buttonHeight;
-@property (nonatomic, strong) SelectionHandler selectionHandler;
-
-+ (CNPPopupButtonItem *)defaultButtonItemWithTitle:(NSAttributedString *)title backgroundColor:(UIColor *)color;
-
-@end
-
 @interface CNPPopupTheme : NSObject
 
 @property (nonatomic, strong) UIColor *backgroundColor; // Background color of the popup content view (Default white)
-@property (nonatomic, assign) CGFloat cornerRadius; // Corner radius of the popup content view (Default 6.0)
+@property (nonatomic, assign) CGFloat cornerRadius; // Corner radius of the popup content view (Default 4.0)
 @property (nonatomic, assign) UIEdgeInsets popupContentInsets; // Inset of labels, images and buttons on the popup content view (Default 16.0 on all sides)
 @property (nonatomic, assign) CNPPopupStyle popupStyle; // How the popup looks once presented (Default centered)
-@property (nonatomic, assign) CNPPopupPresentationStyle presentationStyle; // How the popup is presented (Defauly slide in from bottom)
-@property (nonatomic, assign) BOOL dismissesOppositeDirection; // If presented from a direction, should it dismiss in the opposite? (Defaults to NO. i.e. Goes back the way it came in)
+@property (nonatomic, assign) CNPPopupPresentationStyle presentationStyle; // How the popup is presented (Defauly slide in from bottom. NOTE: Only applicable to CNPPopupStyleCentered)
 @property (nonatomic, assign) CNPPopupMaskType maskType; // Backgound mask of the popup (Default dimmed)
+@property (nonatomic, assign) BOOL dismissesOppositeDirection; // If presented from a direction, should it dismiss in the opposite? (Defaults to NO. i.e. Goes back the way it came in)
 @property (nonatomic, assign) BOOL shouldDismissOnBackgroundTouch; // Popup should dismiss on tapping on background mask (Default yes)
+@property (nonatomic, assign) BOOL movesAboveKeyboard; // Popup should move up when the keyboard appears (Default yes)
 @property (nonatomic, assign) CGFloat contentVerticalPadding; // Spacing between each vertical element (Default 12.0)
+@property (nonatomic, assign) CGFloat maxPopupWidth; // Maxiumum width that the popup should be (Default 300)
 
 // Factory method to help build a default theme
 + (CNPPopupTheme *)defaultTheme;