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

Use correct picker view when selecting index. #22

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

Use correct picker view when selecting index. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df2f40b
Use correct picker view when selecting index.
moi68 Sep 25, 2015
a52b4d6
Fix index selected before dismissal saving
moi68 Sep 29, 2015
4332a15
Toolbar style customizable
moi68 Nov 3, 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
2 changes: 2 additions & 0 deletions BSModalPickerView/BSModalPickerBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ typedef void (^BSModalPickerViewCallback)(BOOL madeChoice);

/* Override and return any additional buttons that you want on the toolbar. By default, this is just a flexible space item. */
- (NSArray *)additionalToolbarItems;

@property (nonatomic) UIBarStyle toolbarStyle;

@end
5 changes: 4 additions & 1 deletion BSModalPickerView/BSModalPickerBase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ @interface BSModalPickerBase ()

@implementation BSModalPickerBase

@synthesize toolbarStyle;

#pragma mark - Designated Initializer

- (id)init {
self = [super init];
if (self) {
self.toolbarStyle = UIBarStyleBlackTranslucent;
self.autoresizesSubviews = YES;
self.presentBackdropView = YES;
self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
Expand Down Expand Up @@ -65,7 +68,7 @@ - (NSArray *)additionalToolbarItems {
- (UIToolbar *)toolbar {
if (!_toolbar) {
_toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, BSMODALPICKER_TOOLBAR_HEIGHT)];
_toolbar.barStyle = UIBarStyleBlackTranslucent;
_toolbar.barStyle = toolbarStyle;
UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
target:self
action:@selector(onCancel:)];
Expand Down
5 changes: 3 additions & 2 deletions BSModalPickerView/BSModalPickerView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ - (void)setValues:(NSArray *)values {
- (void)setSelectedIndex:(NSUInteger)selectedIndex {
if (_selectedIndex != selectedIndex) {
_selectedIndex = selectedIndex;
if (self.picker) {
UIPickerView *pickerView = (UIPickerView *)self.picker;
self.indexSelectedBeforeDismissal = selectedIndex;
if (_picker) {
UIPickerView *pickerView = (UIPickerView *)_picker;
[pickerView selectRow:selectedIndex inComponent:0 animated:YES];
}
}
Expand Down