Use default backgroundColor for button config, add buttonFormatBlock.

wzs · wzs · commit f6081fdfc729 · 2015-02-18T13:29:54.000+01:00
diff --git a/SCLAlertView/SCLAlertView.h b/SCLAlertView/SCLAlertView.h
@@ -108,13 +108,20 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
  */
 @property (nonatomic, copy) SCLAttributedFormatBlock attributedFormatBlock;
 
-/** Set button format block.
+/** Set Complete button format block.
  *
  * Holds the button format block. 
- * Support keys : backgroundColor, textColor
+ * Support keys : backgroundColor, borderColor, textColor
  */
 @property (nonatomic, copy) CompleteButtonFormatBlock completeButtonFormatBlock;
 
+/** Set button format block.
+ *
+ * Holds the button format block.
+ * Support keys : backgroundColor, borderColor, textColor
+ */
+@property (nonatomic, copy) ButtonFormatBlock buttonFormatBlock;
+
 /** Hide animation type
  *
  * Holds the hide animation type.
diff --git a/SCLAlertView/SCLAlertView.m b/SCLAlertView/SCLAlertView.m
@@ -529,6 +529,12 @@ - (SCLButton *)addDoneButtonWithTitle:(NSString *)title
 - (SCLButton *)addButton:(NSString *)title actionBlock:(SCLActionBlock)action
 {
     SCLButton *btn = [self addButton:title];
+    
+    if (_buttonFormatBlock != nil)
+    {
+        btn.buttonFormatBlock = _buttonFormatBlock;
+    }
+    
     btn.actionType = Block;
     btn.actionBlock = action;
     [btn addTarget:self action:@selector(buttonTapped:) forControlEvents:UIControlEventTouchUpInside];
@@ -774,6 +780,7 @@ -(SCLAlertViewResponder *)showTitle:(UIViewController *)vc image:(UIImage *)imag
         {
             [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
         }
+        btn.defaultBackgroundColor = viewColor;
         
         if (btn.completeButtonFormatBlock != nil)
         {
@@ -783,10 +790,6 @@ -(SCLAlertViewResponder *)showTitle:(UIViewController *)vc image:(UIImage *)imag
         {
             [btn parseConfig:btn.buttonFormatBlock()];
         }
-        else
-        {
-            btn.defaultBackgroundColor = viewColor;
-        }
     }
     
     // Adding duration

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,12 @@ - (SCLButton )addDoneButtonWithTitle:(NSString )title`
`529`	`529`	`- (SCLButton )addButton:(NSString )title actionBlock:(SCLActionBlock)action`
`530`	`530`	`{`
`531`	`531`	`SCLButton *btn = [self addButton:title];`
	`532`	`+`
	`533`	`+ if (_buttonFormatBlock != nil)`
	`534`	`+ {`
	`535`	`+ btn.buttonFormatBlock = _buttonFormatBlock;`
	`536`	`+ }`
	`537`	`+`
`532`	`538`	`btn.actionType = Block;`
`533`	`539`	`btn.actionBlock = action;`
`534`	`540`	`[btn addTarget:self action:@selector(buttonTapped:) forControlEvents:UIControlEventTouchUpInside];`
`@@ -774,6 +780,7 @@ -(SCLAlertViewResponder )showTitle:(UIViewController )vc image:(UIImage *)imag`
`774`	`780`	`{`
`775`	`781`	`[btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];`
`776`	`782`	`}`
	`783`	`+ btn.defaultBackgroundColor = viewColor;`
`777`	`784`
`778`	`785`	`if (btn.completeButtonFormatBlock != nil)`
`779`	`786`	`{`
`@@ -783,10 +790,6 @@ -(SCLAlertViewResponder )showTitle:(UIViewController )vc image:(UIImage *)imag`
`783`	`790`	`{`
`784`	`791`	`[btn parseConfig:btn.buttonFormatBlock()];`
`785`	`792`	`}`
`786`		`- else`
`787`		`- {`
`788`		`- btn.defaultBackgroundColor = viewColor;`
`789`		`- }`
`790`	`793`	`}`
`791`	`794`
`792`	`795`	`// Adding duration`