Merge pull request #1 from nimati/master

Merge from nimati/master
nimati · Jan 24, 2017 · 3233b25 · 3233b25
2 parents 7be9c35 + d9186e9
commit 3233b25
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 22 deletions.
diff --git a/Example/Pods/FCAlertView/FCAlertView/Classes/FCAlertView.h b/Example/Pods/FCAlertView/FCAlertView/Classes/FCAlertView.h
diff --git a/Example/Pods/FCAlertView/FCAlertView/Classes/FCAlertView.m b/Example/Pods/FCAlertView/FCAlertView/Classes/FCAlertView.m
diff --git a/FCAlertView.podspec b/FCAlertView.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FCAlertView'
-  s.version          = '1.2.8'
+  s.version          = '1.2.9'
   s.summary          = 'FCAlertView is a Flat Customizable AlertView'
 
 # This description is used to generate tags and improve search results.

diff --git a/FCAlertView/Classes/FCAlertView.h b/FCAlertView/Classes/FCAlertView.h
@@ -179,6 +179,7 @@ typedef void (^FCTextReturnBlock)(NSString *text);
 @property (nonatomic, retain) UIColor * colorScheme;
 @property (nonatomic, retain)  UIColor * titleColor;
 @property (nonatomic, retain)  UIColor * subTitleColor;
+@property (nonatomic, retain) UIColor *alertBackgroundColor;
 
 @property (nonatomic, retain)  UIColor * doneButtonTitleColor;
 
@@ -208,4 +209,4 @@ typedef void (^FCTextReturnBlock)(NSString *text);
 - (void)FCAlertViewWillAppear:(FCAlertView *)alertView;
 - (void)FCAlertDoneButtonClicked:(FCAlertView *)alertView;
 
-@end
+@end
diff --git a/FCAlertView/Classes/FCAlertView.m b/FCAlertView/Classes/FCAlertView.m
@@ -379,7 +379,6 @@ - (void)drawRect:(CGRect)rect {
     // Re-adjusting Frames based on height of text - Requirement is to not have over 6 lines of text
 
     CGSize constraint = CGSizeMake(descriptionLabel.frame.size.width, CGFLOAT_MAX);
-    CGSize sizeOfText;
 
     NSStringDrawingContext *context = [[NSStringDrawingContext alloc] init];
     CGSize boundingBox = [descriptionLabel.text boundingRectWithSize:constraint
@@ -416,7 +415,10 @@ - (void)drawRect:(CGRect)rect {
     if (alertViewWithVector) {
         alertView.backgroundColor = [UIColor clearColor];
     } else {
-        alertView.backgroundColor = [UIColor whiteColor];
+        if (!self.alertBackgroundColor)
+            alertView.backgroundColor = [UIColor whiteColor];
+        else
+            alertView.backgroundColor = _alertBackgroundColor;
         if (_darkTheme)
             alertView.backgroundColor = [UIColor colorWithWhite:48.0f/255.0f alpha:1.0];
     }
@@ -443,7 +445,10 @@ - (void)drawRect:(CGRect)rect {
     CAShapeLayer *fillLayer = [CAShapeLayer layer];
     fillLayer.path = rectPath.CGPath;
     fillLayer.fillRule = kCAFillRuleEvenOdd;
-    fillLayer.fillColor = [UIColor whiteColor].CGColor;
+    if (!self.alertBackgroundColor)
+        fillLayer.fillColor = [UIColor whiteColor].CGColor;
+    else
+        fillLayer.fillColor = _alertBackgroundColor.CGColor;
     if (_darkTheme)
         fillLayer.fillColor = [UIColor colorWithWhite:48.0f/255.0f alpha:1.0].CGColor;
     fillLayer.opacity = 1.0;
@@ -489,6 +494,10 @@ - (void)drawRect:(CGRect)rect {
         _textField.layer.borderWidth = 1.0f;
         _textField.delegate = self;
         _textField.placeholder = [[alertTextFields firstObject] objectForKey:@"placeholder"];
+        if (self.darkTheme)
+            _textField.backgroundColor = [UIColor colorWithWhite:227.0f/255.0f alpha:1.0];
+        else
+            _textField.backgroundColor = [UIColor whiteColor];
 
         UIView *paddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)];
         _textField.leftView = paddingView;
@@ -522,7 +531,7 @@ - (void)drawRect:(CGRect)rect {
                                           alertViewFrame.size.height - 50,
                                           alertViewFrame.size.width - 16,
                                           40);
-            doneButton.layer.cornerRadius = self.cornerRadius;
+            doneButton.layer.cornerRadius = MIN(self.cornerRadius, doneButton.frame.size.height/2);
             doneButton.layer.masksToBounds = YES;
         }
 
@@ -561,7 +570,7 @@ - (void)drawRect:(CGRect)rect {
                                           doneButton.frame.origin.y - 5,
                                           doneButton.frame.size.width - 16,
                                           40);
-            doneButton.layer.cornerRadius = self.cornerRadius;
+            doneButton.layer.cornerRadius = MIN(self.cornerRadius, doneButton.frame.size.height/2);
             doneButton.layer.masksToBounds = YES;
         }
 
@@ -599,7 +608,7 @@ - (void)drawRect:(CGRect)rect {
                                            otherButton.frame.origin.y - 5,
                                            otherButton.frame.size.width - 16,
                                            40);
-            otherButton.layer.cornerRadius = self.cornerRadius;
+            otherButton.layer.cornerRadius = MIN(self.cornerRadius, otherButton.frame.size.height/2);
             otherButton.layer.masksToBounds = YES;
         }
 
@@ -675,7 +684,7 @@ - (void)drawRect:(CGRect)rect {
                                            firstButton.frame.origin.y - 5,
                                            firstButton.frame.size.width - 16,
                                            40);
-            firstButton.layer.cornerRadius = self.cornerRadius;
+            firstButton.layer.cornerRadius = MIN(self.cornerRadius, firstButton.frame.size.height/2);
             firstButton.layer.masksToBounds = YES;
         }
 
@@ -718,7 +727,7 @@ - (void)drawRect:(CGRect)rect {
                                             secondButton.frame.origin.y - 5,
                                             secondButton.frame.size.width - 16,
                                             40);
-            secondButton.layer.cornerRadius = self.cornerRadius;
+            secondButton.layer.cornerRadius = MIN(self.cornerRadius, secondButton.frame.size.height/2);
             secondButton.layer.masksToBounds = YES;
         }
 
@@ -757,7 +766,7 @@ - (void)drawRect:(CGRect)rect {
                                           alertViewFrame.size.height - 50,
                                           alertViewFrame.size.width - 16,
                                           40);
-            doneButton.layer.cornerRadius = self.cornerRadius;
+            doneButton.layer.cornerRadius = MIN(self.cornerRadius, doneButton.frame.size.height/2);
             doneButton.layer.masksToBounds = YES;
         }
 
@@ -837,7 +846,10 @@ - (void)drawRect:(CGRect)rect {
     if (!_fullCircleCustomImage) {
         circleLayer = [CAShapeLayer layer];
         [circleLayer setPath:[[UIBezierPath bezierPathWithOvalInRect:CGRectMake(alertViewContents.frame.size.width/2 - 30.0f, -30.0f, 60.0f, 60.0f)] CGPath]];
-        [circleLayer setFillColor:[UIColor whiteColor].CGColor];
+        if (!self.alertBackgroundColor)
+            [circleLayer setFillColor:[UIColor whiteColor].CGColor];
+        else
+            [circleLayer setFillColor:_alertBackgroundColor.CGColor];
     }
 
     if (_darkTheme)
@@ -1432,6 +1444,15 @@ - (void) dismissAlertView {
                     [backgroundVisualEffectView removeFromSuperview];
                     [self removeFromSuperview];
                 }];
+            } else {
+                id<FCAlertViewDelegate> strongDelegate = self.delegate;
+
+                if ([strongDelegate respondsToSelector:@selector(FCAlertViewDismissed:)]) {
+                    [strongDelegate FCAlertViewDismissed:self];
+                }
+
+                [backgroundVisualEffectView removeFromSuperview];
+                [self removeFromSuperview];
             }
         }