From 255cde58e67fe0ace988c75dd600f1bd86734290 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 3 Sep 2019 14:56:48 -0400 Subject: [PATCH 1/4] Aligning with text to image change. --- MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m index 8583cc2e..fa26a7f7 100644 --- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m +++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m @@ -235,7 +235,7 @@ if (color) { self.button.layer.borderColor = color.CGColor; [self.button setTitleColor:color forState:UIControlStateNormal]; - [self.closeButton setTitleColor:color forState:UIControlStateNormal]; + [self.closeButton setTintColor:color]; } }]; } From e75b0d6d9a9b1441fc062de526ac93c9bc990365 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 3 Sep 2019 15:49:43 -0400 Subject: [PATCH 2/4] Set UIImageRenderingModeAlwaysTemplate to allow the tint change. --- MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index 41237640..66aeaa06 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -181,7 +181,8 @@ static const CGFloat VertialShadowOffset = 6; + (nonnull MFCustomButton *)addCloseButtonToView:(UIView *)view action:(ButtonTapBlock)actionBlock verticalCentered:(BOOL)verticalCentered { MFCustomButton *button = [[MFCustomButton alloc] initWithFrame:CGRectZero]; button.translatesAutoresizingMaskIntoConstraints = NO; - [button setImage:[MVMCoreUIUtility imageNamed:@"closeXBlack"] forState:UIControlStateNormal]; + UIImage *image = [[MVMCoreUIUtility imageNamed:@"closeXBlack"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; + [button setImage:image forState:UIControlStateNormal]; button.titleLabel.font = [MFStyler fontForHeadlineAlternative]; //accessibility From 9b336dc2ece0421fb5352d644db4dc0d54f1e1c1 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 3 Sep 2019 16:09:01 -0400 Subject: [PATCH 3/4] remove unneeded method call and set default tint as black. --- MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index 66aeaa06..175714bc 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -183,7 +183,7 @@ static const CGFloat VertialShadowOffset = 6; button.translatesAutoresizingMaskIntoConstraints = NO; UIImage *image = [[MVMCoreUIUtility imageNamed:@"closeXBlack"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; [button setImage:image forState:UIControlStateNormal]; - button.titleLabel.font = [MFStyler fontForHeadlineAlternative]; + [button setTintColor:UIColor.blackColor]; //accessibility button.accessibilityLabel = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCloseButton"]; From b32cbd856617f07e96e995aeef42f517eff15282 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Tue, 3 Sep 2019 16:09:55 -0400 Subject: [PATCH 4/4] objc. --- MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index 175714bc..94c6ca85 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -183,7 +183,7 @@ static const CGFloat VertialShadowOffset = 6; button.translatesAutoresizingMaskIntoConstraints = NO; UIImage *image = [[MVMCoreUIUtility imageNamed:@"closeXBlack"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; [button setImage:image forState:UIControlStateNormal]; - [button setTintColor:UIColor.blackColor]; + [button setTintColor:[UIColor blackColor]]; //accessibility button.accessibilityLabel = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCloseButton"];