Added completion block execution

BlockAlertsAnd-ActionSheets.podspec

@@ -1,15 +1,15 @@
 Pod::Spec.new do |s|
   s.name         = "BlockAlertsAnd-ActionSheets"
-  s.version      = "1.0.6"
+  s.version      = "1.0.11"
   s.summary  	 = 'Beautifully done UIAlertView and UIActionSheet replacements inspired by TweetBot.'
-  s.homepage     = "https://github.com/gpambrozio/BlockAlertsAnd-ActionSheets"
+  s.homepage     = "https://github.com/pventura1976/BlockAlertsAnd-ActionSheets"
   s.license      = 'MIT'
-  s.author       = { 'Gustavo Ambrozio' => '', "Barrett Jacobsen" => "[email protected]", "Jose Santiago Jr" => '' }
-  s.source       = { :git => 'https://github.com/gpambrozio/BlockAlertsAnd-ActionSheets.git', :tag => "#{s.version}" }
+  s.author       = { 'Gustavo Ambrozio' => '', "Barrett Jacobsen" => "[email protected]", "Jose Santiago Jr" => '', 'Taymer Ragazzini' => '[email protected]', 'Pedro Ventura' => '' }
+  s.source       = { :git => 'https://github.com/pventura1976/BlockAlertsAnd-ActionSheets.git', :tag => "#{s.version}" }
   s.platform     = :ios, '4.3'
-  s.source_files =  "BlockAlertsDemo/ToAddToYourProjects/BlockActionSheet.{h,m}", "BlockAlertsDemo/ToAddToYourProjects/BlockAlertView.{h,m}", "BlockAlertsDemo/ToAddToYourProjects/BlockBackground.{h,m}", "BlockAlertsDemo/ToAddToYourProjects/BlockTextPromptAlertView.{h,m}", 'BlockAlertsDemo/ProjectSpecific/BlockUI.h'
+  s.source_files =  "BlockAlertsDemo/ToAddToYourProjects/BlockActionSheet.{h,m}", "BlockAlertsDemo/ToAddToYourProjects/BlockAlertView.{h,m}", "BlockAlertsDemo/ToAddToYourProjects/BlockBackground.{h,m}", "BlockAlertsDemo/ToAddToYourProjects/BlockTextPromptAlertView.{h,m}", "BlockAlertsDemo/ProjectSpecific/BlockUI.h"
   s.resources = "BlockAlertsDemo/images/button*.png", "BlockAlertsDemo/images/ActionSheet/*.png", "BlockAlertsDemo/images/AlertView/*.png"
-
+  s.requires_arc     = false
   s.subspec 'TableAlertView' do |table|
     table.source_files = "BlockAlertsDemo/ToAddToYourProjects/BlockTableAlertView.{h,m}"
   end

BlockAlertsDemo.xcodeproj/project.pbxproj

@@ -296,7 +296,11 @@
 		EC90169114BB629F00EF52E1 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+<<<<<<< HEAD
+				LastUpgradeCheck = 0610;
+=======
 				LastUpgradeCheck = 0630;
+>>>>>>> gpambrozio/master
 				ORGANIZATIONNAME = "CodeCrop Software";
 			};
 			buildConfigurationList = EC90169414BB629F00EF52E1 /* Build configuration list for PBXProject "BlockAlertsDemo" */;

BlockAlertsDemo/ToAddToYourProjects/BlockActionSheet.h

@@ -12,24 +12,38 @@
 @private
     UIView *_view;
     NSMutableArray *_blocks;
+    NSMutableArray *_completionBlocks;
     CGFloat _height;
+	UIColor *_tintColor;
 }
 
-@property (nonatomic, readonly) UIView *view;
-@property (nonatomic, readwrite) BOOL vignetteBackground;
+@property(nonatomic, readonly) UIView *view;
+@property(nonatomic, readwrite) BOOL vignetteBackground;
 
 + (id)sheetWithTitle:(NSString *)title;
++ (id)sheetWithTitle:(NSString *)title tintColor:(UIColor *)tintColor textColor:(UIColor *)textColor;
+- (id)initWithTitle:(NSString *)title tintColor:(UIColor *)tintColor textColor:(UIColor *)textColor;
 
-- (id)initWithTitle:(NSString *)title;
-
-- (void)setCancelButtonWithTitle:(NSString *) title block:(void (^)()) block;
-- (void)setDestructiveButtonWithTitle:(NSString *) title block:(void (^)()) block;
-- (void)addButtonWithTitle:(NSString *) title block:(void (^)()) block;
+- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block;
+- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block;
+- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block;
+- (void)addButtonWithTitle:(NSString *)title color:(NSString *)color block:(void (^)())block atIndex:(NSInteger)index;
 
+// Add buttons at index with block
 - (void)setCancelButtonWithTitle:(NSString *) title atIndex:(NSInteger)index block:(void (^)()) block;
 - (void)setDestructiveButtonWithTitle:(NSString *) title atIndex:(NSInteger)index block:(void (^)()) block;
 - (void)addButtonWithTitle:(NSString *) title atIndex:(NSInteger)index block:(void (^)()) block;
 
+// Add button with block and animation completion block
+- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block completion:(void (^)())completionBlock;
+- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block completion:(void (^)())completionBlock;
+- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block completion:(void (^)())completionBlock;
+
+// Add button at index with block and animation completion block
+- (void)setCancelButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block completion:(void (^)())completionBlock;
+- (void)setDestructiveButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block completion:(void (^)())completionBlock;
+- (void)addButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block completion:(void (^)())completionBlock;
+
 - (void)showInView:(UIView *)view;
 
 - (NSUInteger)buttonCount;

BlockAlertsDemo/ToAddToYourProjects/BlockActionSheet.m

@@ -18,26 +18,25 @@ @implementation BlockActionSheet
 
 #pragma mark - init
 
-+ (void)initialize
-{
-    if (self == [BlockActionSheet class])
-    {
++ (void)initialize {
+    if (self == [BlockActionSheet class]) {
         background = [UIImage imageNamed:kActionSheetBackground];
         background = [[background stretchableImageWithLeftCapWidth:0 topCapHeight:kActionSheetBackgroundCapHeight] retain];
         titleFont = [kActionSheetTitleFont retain];
         buttonFont = [kActionSheetButtonFont retain];
     }
 }
 
-+ (id)sheetWithTitle:(NSString *)title
-{
-    return [[[BlockActionSheet alloc] initWithTitle:title] autorelease];
++ (id)sheetWithTitle:(NSString *)title {
+    return [[[BlockActionSheet alloc] initWithTitle:title tintColor:nil textColor:nil] autorelease];
 }
 
-- (id)initWithTitle:(NSString *)title 
-{
-    if ((self = [super init]))
-    {
++ (id)sheetWithTitle:(NSString *)title tintColor:(UIColor *)tintColor textColor:(UIColor *)textColor {
+    return [[[BlockActionSheet alloc] initWithTitle:title tintColor:tintColor textColor:textColor] autorelease];
+}
+
+- (id)initWithTitle:(NSString *)title tintColor:(UIColor *)tintColor textColor:(UIColor *)textColor {
+    if ((self = [super init])) {
         UIWindow *parentView = [BlockBackground sharedInstance];
         CGRect frame = parentView.bounds;
 
@@ -47,27 +46,21 @@ - (id)initWithTitle:(NSString *)title
 
         _blocks = [[NSMutableArray alloc] init];
         _height = kActionSheetTopMargin;
-
-        if (title)
-        {
-            CGSize size;
-            if (IOS_LESS_THAN_7) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-                size = [title sizeWithFont:titleFont constrainedToSize:CGSizeMake(frame.size.width-kActionSheetBorder*2, 1000) lineBreakMode:NSLineBreakByWordWrapping];
-#pragma clang diagnostic pop
-            }
-            else {
-                NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-                paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping;
-                size = [title boundingRectWithSize:CGSizeMake(frame.size.width-kAlertViewBorder*2, 1000) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSParagraphStyleAttributeName : paragraphStyle, NSFontAttributeName : titleFont} context:nil].size;
-                size = CGSizeMake(ceilf(size.width), ceilf(size.height));
-            }
+        _tintColor = [tintColor retain];
+        if (title) {
+            CGSize size = [title sizeWithFont:titleFont
+                            constrainedToSize:CGSizeMake(frame.size.width - kActionSheetBorder * 2, 1000)
+                                lineBreakMode:NSLineBreakByWordWrapping];
 
-            UILabel *labelView = [[UILabel alloc] initWithFrame:CGRectMake(kActionSheetBorder, _height, frame.size.width-kActionSheetBorder*2, size.height)];
+            UILabel *labelView =
+            [[UILabel alloc] initWithFrame:CGRectMake(kActionSheetBorder, _height,
+                                                      frame.size.width - kActionSheetBorder * 2, size.height)];
             labelView.font = titleFont;
             labelView.numberOfLines = 0;
             labelView.lineBreakMode = NSLineBreakByWordWrapping;
+            if (textColor)
+            labelView.textColor = textColor;
+            else
             labelView.textColor = kActionSheetTitleTextColor;
             labelView.backgroundColor = [UIColor clearColor];
             labelView.textAlignment = NSTextAlignmentCenter;
@@ -76,7 +69,7 @@ - (id)initWithTitle:(NSString *)title
             labelView.text = title;
 
             labelView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-
+            
             [_view addSubview:labelView];
             [labelView release];
 
@@ -88,19 +81,31 @@ - (id)initWithTitle:(NSString *)title
     return self;
 }
 
-- (void) dealloc 
+- (void) dealloc
 {
     [_view release];
     [_blocks release];
+    [_completionBlocks release];
+    [_tintColor release];
     [super dealloc];
 }
 
-- (NSUInteger)buttonCount
-{
+- (NSUInteger)buttonCount {
     return _blocks.count;
 }
 
+#pragma mark - Add buttons
+
 - (void)addButtonWithTitle:(NSString *)title color:(NSString*)color block:(void (^)())block atIndex:(NSInteger)index
+{
+    [self addButtonWithTitle:title
+                       color:color
+                       block:block
+                     atIndex:index
+                  completion:nil];
+}
+
+- (void)addButtonWithTitle:(NSString *)title color:(NSString*)color block:(void (^)())block atIndex:(NSInteger)index completion:(void (^)())completionBlock
 {
     if (index >= 0)
     {
@@ -110,6 +115,12 @@ - (void)addButtonWithTitle:(NSString *)title color:(NSString*)color block:(void
                                color,
                                nil]
                       atIndex:index];
+        [_blocks insertObject:[NSArray arrayWithObjects:
+                               completionBlock ? [[completionBlock copy] autorelease] : [NSNull null],
+                               title,
+                               color,
+                               nil]
+                      atIndex:index];
     }
     else
     {
@@ -118,39 +129,74 @@ - (void)addButtonWithTitle:(NSString *)title color:(NSString*)color block:(void
                             title,
                             color,
                             nil]];
+        [_completionBlocks addObject:[NSArray arrayWithObjects:
+                                      completionBlock ? [[completionBlock copy] autorelease] : [NSNull null],
+                                      title,
+                                      color,
+                                      nil]];
     }
 }
 
-- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block
-{
+- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block {
     [self addButtonWithTitle:title color:@"red" block:block atIndex:-1];
 }
 
-- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block
-{
+- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block {
     [self addButtonWithTitle:title color:@"black" block:block atIndex:-1];
 }
 
-- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block 
-{
+- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block {
     [self addButtonWithTitle:title color:@"gray" block:block atIndex:-1];
 }
 
-- (void)setDestructiveButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block
-{
+- (void)setDestructiveButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block {
     [self addButtonWithTitle:title color:@"red" block:block atIndex:index];
 }
 
-- (void)setCancelButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block
-{
+- (void)setCancelButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block {
     [self addButtonWithTitle:title color:@"black" block:block atIndex:index];
 }
 
-- (void)addButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block 
-{
+- (void)addButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block {
     [self addButtonWithTitle:title color:@"gray" block:block atIndex:index];
 }
 
+#pragma mark - Add button with block and animation completion block
+
+- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block completion:(void (^)())completionBlock
+{
+    [self addButtonWithTitle:title color:@"red" block:block atIndex:-1 completion:completionBlock];
+}
+
+- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block completion:(void (^)())completionBlock
+{
+    [self addButtonWithTitle:title color:@"black" block:block atIndex:-1 completion:completionBlock];
+}
+
+- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block completion:(void (^)())completionBlock
+{
+    [self addButtonWithTitle:title color:@"gray" block:block atIndex:-1 completion:completionBlock];
+}
+
+#pragma mark - Add button at index with block and animation completion block
+
+- (void)setDestructiveButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block completion:(void (^)())completionBlock
+{
+    [self addButtonWithTitle:title color:@"red" block:block atIndex:index completion:completionBlock];
+}
+
+- (void)setCancelButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block completion:(void (^)())completionBlock
+{
+    [self addButtonWithTitle:title color:@"black" block:block atIndex:index completion:completionBlock];
+}
+
+- (void)addButtonWithTitle:(NSString *)title atIndex:(NSInteger)index block:(void (^)())block completion:(void (^)())completionBlock
+{
+    [self addButtonWithTitle:title color:@"gray" block:block atIndex:index completion:completionBlock];
+}
+
+# pragma mark - Show / Hide
+
 - (void)showInView:(UIView *)view
 {
     NSUInteger i = 1;
@@ -236,8 +282,9 @@ - (void)showInView:(UIView *)view
     [self retain];
 }
 
-- (void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)animated 
+- (void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)animated
 {
+    // Block Execution
     if (buttonIndex >= 0 && buttonIndex < [_blocks count])
     {
         id obj = [[_blocks objectAtIndex: buttonIndex] objectAtIndex:0];
@@ -258,9 +305,22 @@ - (void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)anim
                              _view.center = center;
                              [[BlockBackground sharedInstance] reduceAlphaIfEmpty];
                          } completion:^(BOOL finished) {
+
+                             //Completion block execution
+                             if (buttonIndex >= 0 && buttonIndex < [_completionBlocks count])
+                             {
+                                 id obj = [[_completionBlocks objectAtIndex: buttonIndex] objectAtIndex:0];
+                                 if (![obj isEqual:[NSNull null]])
+                                 {
+                                     ((void (^)())obj)();
+                                 }
+                             }
+
+                             // Release
                              [[BlockBackground sharedInstance] removeView:_view];
                              [_view release]; _view = nil;
                              [self autorelease];
+
                          }];
     }
     else
@@ -273,7 +333,7 @@ - (void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)anim
 
 #pragma mark - Action
 
-- (void)buttonClicked:(id)sender 
+- (void)buttonClicked:(id)sender
 {
     /* Run the button's block */
     NSInteger buttonIndex = [(UIButton *)sender tag] - 1;