Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ability to add, rename, move and delete selector options + option to choose selector options tint color #647

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Added ability to add, rename, move and delete selector options + option to choose selector options tint color #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
125f7cd
Added selectorOptionsTintColor
Nov 20, 2015
980b926
Add ability to add, rename, move and delete selector options
Nov 29, 2015
5812ef4
Add asserts and refactored some methods to clarify use
Nov 30, 2015
02064b8
Fix refactored delegate method
Dec 1, 2015
2f6f5e2
Fix asserts
Dec 2, 2015
62334e8
Add NSAsserts check for selectorOptionsAddNewOptionTitle and selector…
Dec 4, 2015
a77064e
Prevent user from deleting last selector option
Dec 7, 2015
20a72ca
Editing options management also for XLFormRowDescriptorTypeMultipleSe…
Dec 8, 2015
ae839cd
Back to original formatting of the row
Dec 8, 2015
6f7f405
Avoid editing XLFormRowDescriptorTypeMultipleSelectorPopover rows
Dec 8, 2015
0ff3ee3
Better handling of NSAsserts for editing option
Dec 8, 2015
d904aad
Avoid moving to the "add new" row position
Dec 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions XLForm/XL/Cell/XLFormLeftRightSelectorCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
if (option.rightOptions){
XLFormOptionsViewController * optionsViewController = [[XLFormOptionsViewController alloc] initWithStyle:UITableViewStyleGrouped];
optionsViewController.title = option.selectorTitle;
optionsViewController.tableView.tintColor = self.rowDescriptor.selectorOptionsTintColor;
optionsViewController.rowDescriptor = self.rowDescriptor;
[controller.navigationController pushViewController:optionsViewController animated:YES];
}
Expand Down
22 changes: 19 additions & 3 deletions XLForm/XL/Cell/XLFormSelectorCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,14 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
XLFormOptionsViewController * optionsViewController = [[XLFormOptionsViewController alloc] initWithStyle:UITableViewStyleGrouped titleHeaderSection:nil titleFooterSection:nil];
optionsViewController.rowDescriptor = self.rowDescriptor;
optionsViewController.title = self.rowDescriptor.selectorTitle;

optionsViewController.tableView.tintColor = self.rowDescriptor.selectorOptionsTintColor;
optionsViewController.editingOptionsEnabled = self.rowDescriptor.selectorOptionsEditingEnabled;
if (self.rowDescriptor.selectorOptionsEditingEnabled) {
NSAssert(![self.rowDescriptor.selectorOptionsAddNewOptionTitle isEqualToString:@""], @"selectorOptionsAddNewOptionTitle string must not be empty when selectorOptionsEditingEnabled is true");
optionsViewController.editingOptionsAddNewOptionTitle = self.rowDescriptor.selectorOptionsAddNewOptionTitle;
NSAssert(![self.rowDescriptor.selectorOptionsNewTextForOptionTitle isEqualToString:@""], @"selectorOptionsNewTextForOptionTitle string must not be empty when selectorOptionsEditingEnabled is true");
optionsViewController.editingOptionsNewTextForOptionTitle = self.rowDescriptor.selectorOptionsNewTextForOptionTitle;
}
if ([self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeSelectorPopover]) {
self.popoverController = [[UIPopoverController alloc] initWithContentViewController:optionsViewController];
self.popoverController.delegate = self;
Expand All @@ -211,11 +218,20 @@ -(void)formDescriptorCellDidSelectedWithFormController:(XLFormViewController *)c
}
else if ([self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeMultipleSelector] || [self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeMultipleSelectorPopover])
{
NSAssert(self.rowDescriptor.selectorOptions, @"selectorOptions property shopuld not be nil");
NSAssert(self.rowDescriptor.selectorOptions, @"selectorOptions property should not be nil");
XLFormOptionsViewController * optionsViewController = [[XLFormOptionsViewController alloc] initWithStyle:UITableViewStyleGrouped titleHeaderSection:nil titleFooterSection:nil];
optionsViewController.rowDescriptor = self.rowDescriptor;
optionsViewController.title = self.rowDescriptor.selectorTitle;

optionsViewController.tableView.tintColor = self.rowDescriptor.selectorOptionsTintColor;
if ([self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeMultipleSelector]) {
optionsViewController.editingOptionsEnabled = self.rowDescriptor.selectorOptionsEditingEnabled;
if (self.rowDescriptor.selectorOptionsEditingEnabled) {
NSAssert(![self.rowDescriptor.selectorOptionsAddNewOptionTitle isEqualToString:@""], @"selectorOptionsAddNewOptionTitle string must not be empty when selectorOptionsEditingEnabled is true");
optionsViewController.editingOptionsAddNewOptionTitle = self.rowDescriptor.selectorOptionsAddNewOptionTitle;
NSAssert(![self.rowDescriptor.selectorOptionsNewTextForOptionTitle isEqualToString:@""], @"selectorOptionsNewTextForOptionTitle string must not be empty when selectorOptionsEditingEnabled is true");
optionsViewController.editingOptionsNewTextForOptionTitle = self.rowDescriptor.selectorOptionsNewTextForOptionTitle;
}
}
if ([self.rowDescriptor.rowType isEqualToString:XLFormRowDescriptorTypeMultipleSelectorPopover]) {
self.popoverController = [[UIPopoverController alloc] initWithContentViewController:optionsViewController];
self.popoverController.delegate = self;
Expand Down
3 changes: 3 additions & 0 deletions XLForm/XL/Controllers/XLFormOptionsViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@
titleHeaderSection:(NSString *)titleHeaderSection
titleFooterSection:(NSString *)titleFooterSection;

@property (getter=isEditingEnabled, nonatomic) BOOL editingOptionsEnabled;
@property (nonatomic) NSString *editingOptionsNewTextForOptionTitle;
@property (nonatomic) NSString *editingOptionsAddNewOptionTitle;

@end
Loading