Merge pull request #523 from MuscleRumble/appextensions

Fixed #357 by adding XL_APP_EXTENSIONS macro so that XLForm can be used in App Extensions
xmartlabs · May 31, 2016 · d29275b · d29275b
2 parents 11f54ce + 756fdb9
commit d29275b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/XLForm/XL/Cell/XLFormLeftRightSelectorCell.m b/XLForm/XL/Cell/XLFormLeftRightSelectorCell.m
@@ -228,6 +228,7 @@ -(void)leftButtonPressed:(UIButton *)leftButton
 
         [self.formViewController presentViewController:alertController animated:YES completion:nil];
     }
+#ifndef XL_APP_EXTENSIONS
     else{
         UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:self.rowDescriptor.selectorTitle
                                                                   delegate:self cancelButtonTitle:nil
@@ -244,6 +245,7 @@ -(void)leftButtonPressed:(UIButton *)leftButton
 
     }
 #endif
+#endif
 }
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000

diff --git a/XLForm/XL/Cell/XLFormSelectorCell.m b/XLForm/XL/Cell/XLFormSelectorCell.m
@@ -269,6 +269,7 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
             }
             [formViewController presentViewController:alertController animated:YES completion:nil];
         }
+#ifndef XL_APP_EXTENSIONS
         else{
             UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:self.rowDescriptor.selectorTitle
                                                                       delegate:self
@@ -282,6 +283,7 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
             actionSheet.tag = [self.rowDescriptor hash];
             [actionSheet showInView:controller.view];
         }
+#endif
 #endif
         [controller.tableView deselectRowAtIndexPath:[controller.form indexPathOfFormRow:self.rowDescriptor] animated:YES];
     }
@@ -319,6 +321,7 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
             [controller presentViewController:alertController animated:YES completion:nil];
 
         }
+#ifndef XL_APP_EXTENSIONS
         else{
             UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:self.rowDescriptor.selectorTitle
                                                                  message:nil
@@ -332,6 +335,7 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
             alertView.tag = [self.rowDescriptor hash];
             [alertView show];
         }
+#endif
 #endif
         [controller.tableView deselectRowAtIndexPath:[controller.form indexPathOfFormRow:self.rowDescriptor] animated:YES];
     }

diff --git a/XLForm/XL/Controllers/XLFormViewController.m b/XLForm/XL/Controllers/XLFormViewController.m
@@ -479,6 +479,7 @@ -(void)showFormValidationError:(NSError *)error
                                                           handler:nil]];
         [self presentViewController:alertController animated:YES completion:nil];
     }
+#ifndef XL_APP_EXTENSIONS
     else{
         UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"XLFormViewController_ValidationErrorTitle", nil)
                                                              message:error.localizedDescription
@@ -488,6 +489,7 @@ -(void)showFormValidationError:(NSError *)error
         [alertView show];
     }
 #endif
+#endif
 }
 
 -(void)performFormSelector:(SEL)selector withObject:(id)sender