Skip to content

Fix for missing button colors/resource when used as a framework #119

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

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

Fix for missing button colors/resource when used as a framework #119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0f36fe
Fix for missing button colors/resource
Feb 15, 2016
56e37d6
Bug fix: added reference to bundle
Feb 15, 2016
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
13 changes: 7 additions & 6 deletions SIAlertView/SIAlertView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,23 +975,24 @@ - (UIButton *)buttonForItemIndex:(NSUInteger)index
[button setTitle:item.title forState:UIControlStateNormal];
UIImage *normalImage = nil;
UIImage *highlightedImage = nil;
NSBundle* bundle = [NSBundle bundleForClass:[self class]];
switch (item.type) {
case SIAlertViewButtonTypeCancel:
normalImage = [UIImage imageNamed:@"SIAlertView.bundle/button-cancel"];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-cancel-d"];
normalImage = [UIImage imageNamed:@"SIAlertView.bundle/button-cancel" inBundle:bundle compatibleWithTraitCollection:nil];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-cancel-d" inBundle:bundle compatibleWithTraitCollection:nil];
[button setTitleColor:self.cancelButtonColor forState:UIControlStateNormal];
[button setTitleColor:[self.cancelButtonColor colorWithAlphaComponent:0.8] forState:UIControlStateHighlighted];
break;
case SIAlertViewButtonTypeDestructive:
normalImage = [UIImage imageNamed:@"SIAlertView.bundle/button-destructive"];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-destructive-d"];
normalImage = [UIImage imageNamed:@"SIAlertView.bundle/button-destructive" inBundle:bundle compatibleWithTraitCollection:nil];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-destructive-d" inBundle:bundle compatibleWithTraitCollection:nil];
[button setTitleColor:self.destructiveButtonColor forState:UIControlStateNormal];
[button setTitleColor:[self.destructiveButtonColor colorWithAlphaComponent:0.8] forState:UIControlStateHighlighted];
break;
case SIAlertViewButtonTypeDefault:
default:
normalImage = [UIImage imageNamed:@"SIAlertView.bundle/button-default"];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-default-d"];
normalImage = [UIImage imageNamed:@"SIAlertView.bundle/button-default" inBundle:bundle compatibleWithTraitCollection:nil];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-default-d" inBundle:bundle compatibleWithTraitCollection:nil];
[button setTitleColor:self.buttonColor forState:UIControlStateNormal];
[button setTitleColor:[self.buttonColor colorWithAlphaComponent:0.8] forState:UIControlStateHighlighted];
break;
Expand Down