Merge branch 'develop' into ios5

lanbozhang · Jun 10, 2013 · 10e5e73 · 10e5e73
2 parents ff42f0c + 47422a6
commit 10e5e73
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/SIAlertView/SIAlertView.h b/SIAlertView/SIAlertView.h
@@ -50,6 +50,7 @@ typedef void(^SIAlertViewHandler)(SIAlertView *alertView);
 
 @property (nonatomic, readonly, getter = isVisible) BOOL visible;
 
+@property (nonatomic, strong) UIColor *viewBackgroundColor NS_AVAILABLE_IOS(5_0) UI_APPEARANCE_SELECTOR;
 @property (nonatomic, strong) UIColor *titleColor NS_AVAILABLE_IOS(5_0) UI_APPEARANCE_SELECTOR;
 @property (nonatomic, strong) UIColor *messageColor NS_AVAILABLE_IOS(5_0) UI_APPEARANCE_SELECTOR;
 @property (nonatomic, strong) UIFont *titleFont NS_AVAILABLE_IOS(5_0) UI_APPEARANCE_SELECTOR;

diff --git a/SIAlertView/SIAlertView.m b/SIAlertView/SIAlertView.m
@@ -172,6 +172,7 @@ + (void)initialize
         return;
 
     SIAlertView *appearance = [self appearance];
+    appearance.viewBackgroundColor = [UIColor whiteColor];
     appearance.titleColor = [UIColor blackColor];
     appearance.messageColor = [UIColor darkGrayColor];
     appearance.titleFont = [UIFont boldSystemFontOfSize:20];
@@ -577,7 +578,8 @@ - (void)transitionOutCompletion:(void(^)(void))completion
                                 options:UIViewAnimationOptionCurveEaseIn
                              animations:^{
                                  self.containerView.center = point;
-                                 self.containerView.transform = CGAffineTransformMakeRotation(0.3);
+                                 CGFloat angle = ((CGFloat)arc4random_uniform(100) - 50.f) / 100.f;
+                                 self.containerView.transform = CGAffineTransformMakeRotation(angle);
                              }
                              completion:^(BOOL finished) {
                                  if (completion) {
@@ -891,6 +893,15 @@ - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
 
 #pragma mark - UIAppearance setters
 
+- (void)setViewBackgroundColor:(UIColor *)viewBackgroundColor
+{
+    if (_viewBackgroundColor == viewBackgroundColor) {
+        return;
+    }
+    _viewBackgroundColor = viewBackgroundColor;
+    self.containerView.backgroundColor = viewBackgroundColor;
+}
+
 - (void)setTitleFont:(UIFont *)titleFont
 {
     if (_titleFont == titleFont) {

diff --git a/SIAlertViewExample/SIAlertViewExample/ViewController.m b/SIAlertViewExample/SIAlertViewExample/ViewController.m
@@ -9,6 +9,8 @@
 #import "ViewController.h"
 #import "SIAlertView.h"
 
+#define TEST_UIAPPEARANCE 0
+
 @interface ViewController ()
 
 @end
@@ -18,12 +20,14 @@ @implementation ViewController
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	
+#if TEST_UIAPPEARANCE
     [[SIAlertView appearance] setMessageFont:[UIFont systemFontOfSize:13]];
     [[SIAlertView appearance] setTitleColor:[UIColor greenColor]];
     [[SIAlertView appearance] setMessageColor:[UIColor purpleColor]];
     [[SIAlertView appearance] setCornerRadius:12];
     [[SIAlertView appearance] setShadowRadius:20];
+    [[SIAlertView appearance] setViewBackgroundColor:[UIColor colorWithRed:0.891 green:0.936 blue:0.978 alpha:1.000]];
+#endif
 }
 
 #pragma mark - Actions