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

Merge branch 'bugfix/align_with_x_button_changes' into 'develop'

Browse Source 
Aligning with text to image change.

See merge request BPHV_MIPS/mvm_core_ui!122
This commit is contained in:
Pfeil, Scott Robert 2019-09-03 16:16:06 -04:00
commit cc75139860
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/TopAlert/MVMCoreUITopAlertMainView.m
View File

@ -235,7 +235,7 @@
if (color) { if (color) {
self.button.layer.borderColor = color.CGColor; self.button.layer.borderColor = color.CGColor;
[self.button setTitleColor:color forState:UIControlStateNormal]; [self.button setTitleColor:color forState:UIControlStateNormal];
[self.closeButton setTitleColor:color forState:UIControlStateNormal]; [self.closeButton setTintColor:color];
} }
}]; }];
} }

5
MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
View File

@ -181,8 +181,9 @@ static const CGFloat VertialShadowOffset = 6;
+ (nonnull MFCustomButton *)addCloseButtonToView:(UIView *)view action:(ButtonTapBlock)actionBlock verticalCentered:(BOOL)verticalCentered { + (nonnull MFCustomButton *)addCloseButtonToView:(UIView *)view action:(ButtonTapBlock)actionBlock verticalCentered:(BOOL)verticalCentered {
MFCustomButton *button = [[MFCustomButton alloc] initWithFrame:CGRectZero]; MFCustomButton *button = [[MFCustomButton alloc] initWithFrame:CGRectZero];
button.translatesAutoresizingMaskIntoConstraints = NO; button.translatesAutoresizingMaskIntoConstraints = NO;
[button setImage:[MVMCoreUIUtility imageNamed:@"closeXBlack"] forState:UIControlStateNormal]; UIImage *image = [[MVMCoreUIUtility imageNamed:@"closeXBlack"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
button.titleLabel.font = [MFStyler fontForHeadlineAlternative]; [button setImage:image forState:UIControlStateNormal];
[button setTintColor:[UIColor blackColor]];
//accessibility //accessibility
button.accessibilityLabel = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCloseButton"]; button.accessibilityLabel = [MVMCoreUIUtility hardcodedStringWithKey:@"AccCloseButton"];