From d0f36fe75f8a208573974dc56a7436b61f246305 Mon Sep 17 00:00:00 2001 From: mparoni55 Date: Mon, 15 Feb 2016 10:19:20 -0800 Subject: [PATCH 1/2] Fix for missing button colors/resource Fix for missing button colors/resource when used as a framework --- SIAlertView/SIAlertView.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SIAlertView/SIAlertView.m b/SIAlertView/SIAlertView.m index 7a67df3..382e442 100644 --- a/SIAlertView/SIAlertView.m +++ b/SIAlertView/SIAlertView.m @@ -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: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; From 56e37d68e7905258b001f7cd2fb8942599e8bfa0 Mon Sep 17 00:00:00 2001 From: mparoni55 Date: Mon, 15 Feb 2016 10:23:35 -0800 Subject: [PATCH 2/2] Bug fix: added reference to bundle --- SIAlertView/SIAlertView.m | 1 + 1 file changed, 1 insertion(+) diff --git a/SIAlertView/SIAlertView.m b/SIAlertView/SIAlertView.m index 382e442..2ff0528 100644 --- a/SIAlertView/SIAlertView.m +++ b/SIAlertView/SIAlertView.m @@ -975,6 +975,7 @@ - (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" inBundle:bundle compatibleWithTraitCollection:nil];