mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x color fix

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-02-13 15:43:59 -05:00
parent 8d3dea90a8
commit c4c96dc4d4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m
View File

@ -170,7 +170,7 @@
if (closeButton && !self.closeButton) { if (closeButton && !self.closeButton) {
self.closeButton = [self addCloseButtonWithAnimationDelegate:animationDelegate]; self.closeButton = [self addCloseButtonWithAnimationDelegate:animationDelegate];
[self.closeButton setTintColor:self.contentColor ?:[UIColor whiteColor]]; [self.closeButton setTintColor:self.contentColor ?: [UIColor whiteColor]];
} else if (!closeButton && self.closeButton) { } else if (!closeButton && self.closeButton) {
[self.closeButton removeFromSuperview]; [self.closeButton removeFromSuperview];
self.closeButton = nil; self.closeButton = nil;
@ -241,11 +241,17 @@
- (void)setupWithMessage:(nullable NSString *)message subMessage:(nullable NSString *)subMessage color:(nullable UIColor *)color buttonTitle:(nullable NSString *)buttonTitle userActionHandler:(nullable void (^)(id _Nonnull sender))userActionHandler { - (void)setupWithMessage:(nullable NSString *)message subMessage:(nullable NSString *)subMessage color:(nullable UIColor *)color buttonTitle:(nullable NSString *)buttonTitle userActionHandler:(nullable void (^)(id _Nonnull sender))userActionHandler {
self.message = message; self.message = message;
self.subMessage = subMessage; self.subMessage = subMessage;
self.contentColor = color;
[MVMCoreDispatchUtility performBlockOnMainThread:^{ [MVMCoreDispatchUtility performBlockOnMainThread:^{
// Sets the string // Sets the string
self.label.attributedText = [MVMCoreUITopAlertBaseView getStringForMessage:message subMessage:subMessage color:color]; self.label.attributedText = [MVMCoreUITopAlertBaseView getStringForMessage:message subMessage:subMessage color:color];
// Sets the color
if (color) {
[self.closeButton setTintColor:color];
}
// Sets the button // Sets the button
[self setupButtonWithButtonTitle:buttonTitle userActionHandler:userActionHandler]; [self setupButtonWithButtonTitle:buttonTitle userActionHandler:userActionHandler];
}]; }];
@ -294,8 +300,8 @@
if ([self init]) { if ([self init]) {
self.backgroundColor = color; self.backgroundColor = color;
[self setupViewWithLabelAndImage:nil topImage:nil]; [self setupViewWithLabelAndImage:nil topImage:nil];
[self setupCloseButton:closeButton animationDelegate:animationDelegate];
[self setupWithMessage:message subMessage:subMessage color:contentColor buttonTitle:nil userActionHandler:NULL]; [self setupWithMessage:message subMessage:subMessage color:contentColor buttonTitle:nil userActionHandler:NULL];
[self setupCloseButton:closeButton animationDelegate:animationDelegate];
} }
return self; return self;
} }