Fixed #357 by adding XL_APP_EXTENSIONS macro so that XLForm can be us…

…ed in App Extensions
xmartlabs · Aug 25, 2015 · 15a4ce9 · 15a4ce9
1 parent 1738fb8
commit 15a4ce9
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
@@ -215,6 +215,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
@@ -231,6 +232,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
@@ -266,6 +266,7 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
             }
             [self.formViewController presentViewController:alertController animated:YES completion:nil];
         }
+#ifndef XL_APP_EXTENSIONS
         else{
             UIActionSheet * actionSheet = [[UIActionSheet alloc] initWithTitle:self.rowDescriptor.selectorTitle
                                                                       delegate:self
@@ -279,6 +280,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];
     }
@@ -316,6 +318,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
@@ -329,6 +332,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
@@ -477,6 +477,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
@@ -486,6 +487,7 @@ -(void)showFormValidationError:(NSError *)error
         [alertView show];
     }
 #endif
+#endif
 }
 
 -(void)performFormSelector:(SEL)selector withObject:(id)sender