Fixed some bugs, added new features

Friend-LGA · Nov 3, 2015 · 2135bc6 · 2135bc6
1 parent 1cc440f
commit 2135bc6
Show file tree

Hide file tree

Showing 9 changed files with 475 additions and 401 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ Pods/
 ._*
 
 .hgignore
+
+.DS_Store
diff --git a/Demo/LGAlertViewDemo/TableViewControllerActionSheet.m b/Demo/LGAlertViewDemo/TableViewControllerActionSheet.m
@@ -35,7 +35,8 @@ - (id)init
                          @"LGAlertView + A lot of buttons short",
                          @"LGAlertView + UIView",
                          @"LGAlertView + ActivityIndicator",
-                         @"LGAlertView + ProgressView"];
+                         @"LGAlertView + ActivityIndicator cancel",
+                         @"LGAlertView + ProgressView cancel"];
 
         [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"cell"];
         UIEdgeInsets contentInset = self.tableView.contentInset;
@@ -261,7 +262,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                                                                                 message:@"Waiting please"
                                                                                   style:LGAlertViewStyleActionSheet
                                                                            buttonTitles:nil
-                                                                      cancelButtonTitle:@"I'm hurry"
+                                                                      cancelButtonTitle:nil
                                                                  destructiveButtonTitle:nil
                                                                           actionHandler:nil
                                                                           cancelHandler:nil
@@ -274,6 +275,24 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                        });
     }
     else if (indexPath.row == 11)
+    {
+        LGAlertView *alertView = [[LGAlertView alloc] initWithActivityIndicatorAndTitle:@"Loading"
+                                                                                message:@"Waiting please"
+                                                                                  style:LGAlertViewStyleActionSheet
+                                                                           buttonTitles:nil
+                                                                      cancelButtonTitle:@"I'm hurry"
+                                                                 destructiveButtonTitle:nil
+                                                                          actionHandler:nil
+                                                                          cancelHandler:nil
+                                                                     destructiveHandler:nil];
+        [alertView showAnimated:YES completionHandler:nil];
+
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^(void)
+                       {
+                           [alertView dismissAnimated:YES completionHandler:nil];
+                       });
+    }
+    else if (indexPath.row == 12)
     {
         LGAlertView *alertView = [[LGAlertView alloc] initWithProgressViewAndTitle:@"Loading"
                                                                            message:@"Waiting please"

diff --git a/Demo/LGAlertViewDemo/TableViewControllerAlert.m b/Demo/LGAlertViewDemo/TableViewControllerAlert.m
@@ -41,7 +41,8 @@ - (id)init
                          @"LGAlertView + A lot of textFields",
                          @"LGAlertView + UIView",
                          @"LGAlertView + ActivityIndicator",
-                         @"LGAlertView + ProgressView"];
+                         @"LGAlertView + ActivityIndicator cancel",
+                         @"LGAlertView + ProgressView cancel"];
 
         [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"cell"];
         UIEdgeInsets contentInset = self.tableView.contentInset;
@@ -317,7 +318,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                                                               numberOfTextFields:25
                                                           textFieldsSetupHandler:^(UITextField *textField, NSUInteger index)
                                   {
-                                      textField.placeholder = [NSString stringWithFormat:@"Placeholder %lu", index+1];
+                                      textField.placeholder = [NSString stringWithFormat:@"Placeholder %lu", (long unsigned)index+1];
                                   }
                                                                     buttonTitles:@[@"Done"]
                                                                cancelButtonTitle:@"Cancel"
@@ -351,7 +352,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                                                                                 message:@"Waiting please"
                                                                                   style:LGAlertViewStyleAlert
                                                                            buttonTitles:nil
-                                                                      cancelButtonTitle:@"I'm hurry"
+                                                                      cancelButtonTitle:nil
                                                                  destructiveButtonTitle:nil
                                                                           actionHandler:nil
                                                                           cancelHandler:nil
@@ -364,6 +365,24 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                        });
     }
     else if (indexPath.row == 16)
+    {
+        LGAlertView *alertView = [[LGAlertView alloc] initWithActivityIndicatorAndTitle:@"Loading"
+                                                                                message:@"Waiting please"
+                                                                                  style:LGAlertViewStyleAlert
+                                                                           buttonTitles:nil
+                                                                      cancelButtonTitle:@"I'm hurry"
+                                                                 destructiveButtonTitle:nil
+                                                                          actionHandler:nil
+                                                                          cancelHandler:nil
+                                                                     destructiveHandler:nil];
+        [alertView showAnimated:YES completionHandler:nil];
+
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^(void)
+                       {
+                           [alertView dismissAnimated:YES completionHandler:nil];
+                       });
+    }
+    else if (indexPath.row == 17)
     {
         LGAlertView *alertView = [[LGAlertView alloc] initWithProgressViewAndTitle:@"Loading"
                                                                            message:@"Waiting please"

diff --git a/Demo/LGAlertViewDemo/TableViewControllerCustomAlert.m b/Demo/LGAlertViewDemo/TableViewControllerCustomAlert.m
@@ -167,6 +167,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         alertView.width = MIN(self.view.bounds.size.width, self.view.bounds.size.height);
         alertView.titleTextAlignment = NSTextAlignmentLeft;
         alertView.messageTextAlignment = NSTextAlignmentLeft;
+        alertView.oneRowOneButton = YES;
         alertView.buttonsTextAlignment = NSTextAlignmentRight;
         alertView.cancelButtonTextAlignment = NSTextAlignmentRight;
         alertView.destructiveButtonTextAlignment = NSTextAlignmentRight;
@@ -194,6 +195,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         alertView.width = MIN(self.view.bounds.size.width, self.view.bounds.size.height);
         alertView.titleTextAlignment = NSTextAlignmentLeft;
         alertView.messageTextAlignment = NSTextAlignmentLeft;
+        alertView.oneRowOneButton = YES;
         alertView.destructiveButtonTextAlignment = NSTextAlignmentRight;
         alertView.buttonsTextAlignment = NSTextAlignmentRight;
         alertView.cancelButtonTextAlignment = NSTextAlignmentRight;
@@ -222,6 +224,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         alertView.width = MIN(self.view.bounds.size.width, self.view.bounds.size.height);
         alertView.titleTextAlignment = NSTextAlignmentLeft;
         alertView.messageTextAlignment = NSTextAlignmentLeft;
+        alertView.oneRowOneButton = YES;
         alertView.destructiveButtonTextAlignment = NSTextAlignmentRight;
         alertView.buttonsTextAlignment = NSTextAlignmentRight;
         alertView.cancelButtonTextAlignment = NSTextAlignmentRight;

diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  LGAlertView: 859226b0f4bf097819e04b9ab309277d17aae324
+  LGAlertView: a70295bb08ecb940da71b6009b14199a3b580453
 
 COCOAPODS: 0.39.0
diff --git a/Demo/podsInstall.command b/Demo/podsInstall.command
diff --git a/Demo/podsUpdate.command b/Demo/podsUpdate.command
diff --git a/LGAlertView/LGAlertView.h b/LGAlertView/LGAlertView.h
@@ -163,6 +163,9 @@ LGAlertViewWindowLevel;
 
 @property (strong, nonatomic, readonly) NSMutableArray *textFieldsArray;
 
+@property (assign, nonatomic, getter=isPadShowActionSheetFromBottom) BOOL padShowActionSheetFromBottom;
+@property (assign, nonatomic, getter=isOneRowOneButton) BOOL oneRowOneButton;
+
 /** Do not forget about weak referens to self */
 @property (strong, nonatomic) void (^willShowHandler)(LGAlertView *alertView);
 /** Do not forget about weak referens to self */
@@ -175,7 +178,7 @@ LGAlertViewWindowLevel;
 /** Do not forget about weak referens to self */
 @property (strong, nonatomic) void (^actionHandler)(LGAlertView *alertView, NSString *title, NSUInteger index);
 /** Do not forget about weak referens to self */
-@property (strong, nonatomic) void (^cancelHandler)(LGAlertView *alertView, BOOL onButton);
+@property (strong, nonatomic) void (^cancelHandler)(LGAlertView *alertView);
 /** Do not forget about weak referens to self */
 @property (strong, nonatomic) void (^destructiveHandler)(LGAlertView *alertView);
 
@@ -267,7 +270,7 @@ LGAlertViewWindowLevel;
             cancelButtonTitle:(NSString *)cancelButtonTitle
        destructiveButtonTitle:(NSString *)destructiveButtonTitle
                 actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
            destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -279,7 +282,7 @@ LGAlertViewWindowLevel;
                    cancelButtonTitle:(NSString *)cancelButtonTitle
               destructiveButtonTitle:(NSString *)destructiveButtonTitle
                        actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                       cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                       cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                   destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -290,7 +293,7 @@ LGAlertViewWindowLevel;
                                 cancelButtonTitle:(NSString *)cancelButtonTitle
                            destructiveButtonTitle:(NSString *)destructiveButtonTitle
                                     actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                                    cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                                    cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                                destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -302,7 +305,7 @@ LGAlertViewWindowLevel;
                            cancelButtonTitle:(NSString *)cancelButtonTitle
                       destructiveButtonTitle:(NSString *)destructiveButtonTitle
                                actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                               cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                               cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                           destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -314,7 +317,7 @@ LGAlertViewWindowLevel;
                          cancelButtonTitle:(NSString *)cancelButtonTitle
                     destructiveButtonTitle:(NSString *)destructiveButtonTitle
                              actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                             cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                             cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                         destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -325,7 +328,7 @@ LGAlertViewWindowLevel;
                  cancelButtonTitle:(NSString *)cancelButtonTitle
             destructiveButtonTitle:(NSString *)destructiveButtonTitle
                      actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                     cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                     cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                 destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -337,7 +340,7 @@ LGAlertViewWindowLevel;
                         cancelButtonTitle:(NSString *)cancelButtonTitle
                    destructiveButtonTitle:(NSString *)destructiveButtonTitle
                             actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                            cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                            cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                        destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -348,7 +351,7 @@ LGAlertViewWindowLevel;
                                      cancelButtonTitle:(NSString *)cancelButtonTitle
                                 destructiveButtonTitle:(NSString *)destructiveButtonTitle
                                          actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                                         cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                                         cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                                     destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -360,7 +363,7 @@ LGAlertViewWindowLevel;
                                 cancelButtonTitle:(NSString *)cancelButtonTitle
                            destructiveButtonTitle:(NSString *)destructiveButtonTitle
                                     actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                                    cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                                    cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                                destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 /** Do not forget about weak referens to self for actionHandler, cancelHandler and destructiveHandler blocks */
@@ -372,7 +375,7 @@ LGAlertViewWindowLevel;
                               cancelButtonTitle:(NSString *)cancelButtonTitle
                          destructiveButtonTitle:(NSString *)destructiveButtonTitle
                                   actionHandler:(void(^)(LGAlertView *alertView, NSString *title, NSUInteger index))actionHandler
-                                  cancelHandler:(void(^)(LGAlertView *alertView, BOOL onButton))cancelHandler
+                                  cancelHandler:(void(^)(LGAlertView *alertView))cancelHandler
                              destructiveHandler:(void(^)(LGAlertView *alertView))destructiveHandler;
 
 #pragma mark -
@@ -477,6 +480,12 @@ LGAlertViewWindowLevel;
 
 - (void)layoutInvalidateWithSize:(CGSize)size;
 
+- (void)forceCancel;
+- (void)forceDestructive;
+- (void)forceActionAtIndex:(NSUInteger)index;
+
++ (void)setTintColor:(UIColor *)color;
+
 #pragma mark -
 
 /** Unavailable, use +alertViewWithTitle... instead */