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

update label and styler

Browse Source
This commit is contained in:
panxi 2019-04-03 15:46:06 -04:00
parent 7d7284bd8d
commit 4e328eeb83
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCoreUI/Atoms/Views/MFLabel.m
View File

@ -226,16 +226,10 @@
if (font) { if (font) {
[attributedString addAttribute:NSFontAttributeName value:font range:range]; [attributedString addAttribute:NSFontAttributeName value:font range:range];
} }
} else if ([type isEqualToString:@"link"]) {
label.userInteractionEnabled = YES;
} }
} }
} }
label.attributedText = attributedString; label.attributedText = attributedString;
if ([label isKindOfClass:[MFLabel class]]) {
MFLabel *mflabel = (MFLabel *)label;
}
} }
} }
} }

34
MVMCoreUI/Styles/MFStyler.m
View File

@ -498,19 +498,13 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
[self styleLabelH2:label genericScaling:YES]; [self styleLabelH2:label genericScaling:YES];
} }
+ (void)styleLabelH3:(nonnull UILabel *)label {
label.font = [MFStyler fontH3];
label.textColor = [UIColor blackColor];
}
+ (void)styleLabelH3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelH3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontH3:genericScaling]; label.font = [MFStyler fontH3:genericScaling];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelH32:(nonnull UILabel *)label { + (void)styleLabelH3:(nonnull UILabel *)label {
label.font = [MFStyler fontH32]; [self styleLabelH3:label genericScaling:YES];
label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelH32:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelH32:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
@ -518,9 +512,8 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB1:(nonnull UILabel *)label { + (void)styleLabelH32:(nonnull UILabel *)label {
label.font = [MFStyler fontB1]; [self styleLabelH32:label genericScaling:YES];
label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB1:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelB1:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
@ -528,9 +521,8 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB2:(nonnull UILabel *)label { + (void)styleLabelB1:(nonnull UILabel *)label {
label.font = [MFStyler fontB2]; [self styleLabelB1:label genericScaling:YES];
label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelB2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
@ -538,9 +530,12 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB2:(nonnull UILabel *)label {
[self styleLabelB2:label genericScaling:YES];
}
+ (void)styleLabelB2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling { + (void)styleLabelB2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForBodyWithSize:size genericScaling:genericScaling]; label.font = [MFStyler fontForBodyWithSize:size genericScaling:genericScaling];
label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
@ -549,8 +544,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
} }
+ (void)styleLabelB3:(nonnull UILabel *)label { + (void)styleLabelB3:(nonnull UILabel *)label {
label.font = [MFStyler fontB3]; [self styleLabelB3:label genericScaling:YES];
label.textColor = [UIColor mfBattleshipGrey];
} }
+ (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
@ -559,8 +553,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
} }
+ (void)styleLabelB20:(nonnull UILabel *)label { + (void)styleLabelB20:(nonnull UILabel *)label {
label.font = [MFStyler fontB20]; [self styleLabelB20:label genericScaling:YES];
label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
@ -569,8 +562,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
} }
+ (void)styleLabelTextStyle2:(nonnull UILabel *)label { + (void)styleLabelTextStyle2:(nonnull UILabel *)label {
label.font = [MFStyler fontB2]; [self styleLabelTextStyle2:label genericScaling:YES];
label.textColor = [UIColor mfBattleshipGrey];
} }