Skip to content

Updates to work with Swift and Cocoapods 0.36.0-beta2 #93

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
kimar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates to work with Swift and Cocoapods 0.36.0-beta2 #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions SIAlertView/SIAlertView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,21 +977,21 @@ - (UIButton *)buttonForItemIndex:(NSUInteger)index
UIImage *highlightedImage = nil;
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:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-cancel-d" inBundle:[NSBundle bundleForClass:self.class] 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:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-destructive-d" inBundle:[NSBundle bundleForClass:self.class] 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:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];
highlightedImage = [UIImage imageNamed:@"SIAlertView.bundle/button-default-d" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];
[button setTitleColor:self.buttonColor forState:UIControlStateNormal];
[button setTitleColor:[self.buttonColor colorWithAlphaComponent:0.8] forState:UIControlStateHighlighted];
break;
Expand Down