When you realize there's more than one cancel button

element-hq · Jan 19, 2018 · 21a716d · 21a716d
1 parent 3afc191
commit 21a716d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
@@ -2919,7 +2919,7 @@ - (void)enableInAppNotificationsForAccount:(MXKAccount*)account
                                                                                 preferredStyle:UIAlertControllerStyleAlert];
 
                         [self.mxInAppNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                                                     style:UIAlertActionStyleDefault
+                                                                                     style:UIAlertActionStyleCancel
                                                                                    handler:^(UIAlertAction * action) {
 
                                                                                        if (weakSelf)
@@ -3002,7 +3002,7 @@ - (void)selectMatrixAccount:(void (^)(MXKAccount *selectedAccount))onSelection
         }
 
         [accountPicker addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                          style:UIAlertActionStyleDefault
+                                                          style:UIAlertActionStyleCancel
                                                         handler:^(UIAlertAction * action) {
 
                                                             if (weakSelf)

diff --git a/Riot/ViewController/RecentsViewController.m b/Riot/ViewController/RecentsViewController.m
@@ -1709,7 +1709,7 @@ - (void)joinARoom
     }];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)

diff --git a/Riot/ViewController/RoomParticipantsViewController.m b/Riot/ViewController/RoomParticipantsViewController.m
@@ -1358,7 +1358,7 @@ - (void)onDeleteAt:(NSIndexPath*)path
                                                         preferredStyle:UIAlertControllerStyleAlert];
 
             [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                             style:UIAlertActionStyleDefault
+                                                             style:UIAlertActionStyleCancel
                                                            handler:^(UIAlertAction * action) {
 
                                                                if (weakSelf)
@@ -1445,7 +1445,7 @@ - (void)onDeleteAt:(NSIndexPath*)path
                                                                 preferredStyle:UIAlertControllerStyleAlert];
 
                     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                                     style:UIAlertActionStyleDefault
+                                                                     style:UIAlertActionStyleCancel
                                                                    handler:^(UIAlertAction * action) {
 
                                                                        if (weakSelf)
@@ -1497,7 +1497,7 @@ - (void)onDeleteAt:(NSIndexPath*)path
                                                                 preferredStyle:UIAlertControllerStyleAlert];
 
                     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                                     style:UIAlertActionStyleDefault
+                                                                     style:UIAlertActionStyleCancel
                                                                    handler:^(UIAlertAction * action) {
 
                                                                        if (weakSelf)
@@ -1535,7 +1535,7 @@ - (void)didSelectInvitableContact:(MXKContact*)contact
                                                 preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)

diff --git a/Riot/ViewController/RoomSettingsViewController.m b/Riot/ViewController/RoomSettingsViewController.m
@@ -649,7 +649,7 @@ - (void)promptUserToCopyRoomId:(UILabel*)roomIdLabel
                                                        }]];
 
         [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                         style:UIAlertActionStyleDefault
+                                                         style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
 
                                                            if (weakSelf)
@@ -781,7 +781,7 @@ - (void)promptUserOnSelectedRoomAlias:(UILabel*)roomAliasLabel
         }
 
         [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                         style:UIAlertActionStyleDefault
+                                                         style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
 
                                                            if (weakSelf)
@@ -1069,7 +1069,7 @@ - (void)onSaveFailed:(NSString*)message withKey:(NSString*)key
     currentAlert = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)
@@ -2914,7 +2914,7 @@ - (void)shouldChangeHistoryVisibility:(MXRoomHistoryVisibility)historyVisibility
     currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_history_section_prompt_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_details_history_section_prompt_msg", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)
@@ -2982,7 +2982,7 @@ - (void)shouldRemoveCanonicalAlias:(void (^)())didRemoveCanonicalAlias
     currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_addresses_disable_main_address_prompt_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_details_addresses_disable_main_address_prompt_msg", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)
@@ -3086,7 +3086,7 @@ - (void)onLeave:(id)sender
                                                 preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)
@@ -3181,7 +3181,7 @@ - (void)toggleEncryption:(UISwitch*)theSwitch
                                                     preferredStyle:UIAlertControllerStyleAlert];
 
         [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                         style:UIAlertActionStyleDefault
+                                                         style:UIAlertActionStyleCancel
                                                        handler:^(UIAlertAction * action) {
 
                                                            if (weakSelf)

diff --git a/Riot/ViewController/RoomViewController.m b/Riot/ViewController/RoomViewController.m
@@ -2411,7 +2411,7 @@ - (void)showEditButtonAlertMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXKCe
 
                                                                    }]];
 
-                                                                   [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+                                                                   [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
 
                                                                        if (weakSelf)
                                                                        {
@@ -2466,7 +2466,7 @@ - (void)showEditButtonAlertMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXKCe
     }
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil)
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)
@@ -3918,7 +3918,7 @@ -(BOOL)checkUnsentMessages
                                                                }]];
 
                 [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil)
-                                                                 style:UIAlertActionStyleDefault
+                                                                 style:UIAlertActionStyleCancel
                                                                handler:^(UIAlertAction * action) {
 
                                                                    if (weakSelf)
@@ -4282,7 +4282,7 @@ - (void)contactsTableViewController:(ContactsTableViewController *)contactsTable
                                                 preferredStyle:UIAlertControllerStyleAlert];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)

diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
@@ -2558,7 +2558,7 @@ - (void)onSignout:(id)sender
                                                    }]];
 
     [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                     style:UIAlertActionStyleDefault
+                                                     style:UIAlertActionStyleCancel
                                                    handler:^(UIAlertAction * action) {
 
                                                        if (weakSelf)
@@ -2625,7 +2625,7 @@ - (void)onRemove3PID:(NSIndexPath*)path
             currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_remove_prompt_title", @"Vector", nil) message:promptMsg preferredStyle:UIAlertControllerStyleAlert];
 
             [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                             style:UIAlertActionStyleDefault
+                                                             style:UIAlertActionStyleCancel
                                                            handler:^(UIAlertAction * action) {
 
                                                                if (weakSelf)
@@ -3616,7 +3616,7 @@ - (void)showThemePicker
 
     // Cancel button
     [themePicker addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                        style:UIAlertActionStyleDefault
+                                                        style:UIAlertActionStyleCancel
                                                       handler:nil]];
 
     UIView *fromCell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:USER_INTERFACE_THEME_INDEX inSection:SETTINGS_SECTION_USER_INTERFACE_INDEX]];
@@ -3848,7 +3848,7 @@ - (void)displayPasswordAlert
     // check if the textfields have the right value
     savePasswordAction.enabled = NO;
 
-    UIAlertAction* cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+    UIAlertAction* cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
 
         if (weakSelf)
         {

diff --git a/Riot/Views/RoomInputToolbar/RoomInputToolbarView.m b/Riot/Views/RoomInputToolbar/RoomInputToolbarView.m
@@ -289,7 +289,7 @@ - (IBAction)onTouchUpInside:(UIButton*)button
                                                               }]];
 
             [callActionSheet addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                                style:UIAlertActionStyleDefault
+                                                                style:UIAlertActionStyleCancel
                                                               handler:^(UIAlertAction * action) {
 
                                                                   if (weakSelf)

diff --git a/RiotShareExtension/Model/ShareExtensionManager.m b/RiotShareExtension/Model/ShareExtensionManager.m
@@ -442,7 +442,7 @@ - (UIAlertController *)compressionPromptForImage:(NSData *)imageData shareBlock:
         }
 
         [compressionPrompt addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"]
-                                                              style:UIAlertActionStyleDefault
+                                                              style:UIAlertActionStyleCancel
                                                             handler:^(UIAlertAction * action) {
 
                                                                 if (weakSelf)