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

change font to B20 form feed message

Browse Source
This commit is contained in:
panxi 2019-04-01 15:05:42 -04:00
parent b70f27f67a
commit 1baa755cae
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atoms/Views/MFLabel.h
View File

@ -44,7 +44,7 @@
//55Rg 11pt gray //55Rg 11pt gray
+ (nonnull MFLabel *)commonLabelB3:(BOOL)scale; + (nonnull MFLabel *)commonLabelB3:(BOOL)scale;
//55Rg 20pt //55Rg 20pt
+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; + (nonnull MFLabel *)commonLabelB20:(BOOL)scale;
// Getters // Getters
+ (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel());
@ -60,6 +60,6 @@
- (void)styleB1:(BOOL)scale; - (void)styleB1:(BOOL)scale;
- (void)styleB2:(BOOL)scale; - (void)styleB2:(BOOL)scale;
- (void)styleB3:(BOOL)scale; - (void)styleB3:(BOOL)scale;
- (void)styleFeedMessage:(BOOL)scale; - (void)styleB20:(BOOL)scale;
@end @end

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

@ -149,9 +149,9 @@
return label; return label;
} }
+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale { + (nonnull MFLabel *)commonLabelB20:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleFeedMessage:scale]; [label styleB20:scale];
return label; return label;
} }
@ -283,8 +283,8 @@
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleFeedMessage:(BOOL)scale { - (void)styleB20:(BOOL)scale {
[MFStyler styleLabelFeedMessage:self genericScaling:NO]; [MFStyler styleLabelB20:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
} }

12
MVMCoreUI/Styles/MFStyler.h
View File

@ -117,10 +117,9 @@ B3 -> Legal
//55Rg 11pt //55Rg 11pt
+ (nullable UIFont *)fontB3:(BOOL)genericScaling; + (nullable UIFont *)fontB3:(BOOL)genericScaling;
+ (nullable UIFont *)fontB3; + (nullable UIFont *)fontB3;
//55Rg 20pt //55Rg 20pt
+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling; + (nullable UIFont *)fontB20:(BOOL)genericScaling;
+ (nullable UIFont *)fontForFeedMessage; + (nullable UIFont *)fontB20;
#pragma mark - 1.0 fonts #pragma mark - 1.0 fonts
@ -232,20 +231,21 @@ B3 -> Legal
+ (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelB3:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelB3:(nonnull UILabel *)label; + (void)styleLabelB3:(nonnull UILabel *)label;
+ (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelB20:(nonnull UILabel *)label;
+ (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelTextStyle2:(nonnull UILabel *)label; + (void)styleLabelTextStyle2:(nonnull UILabel *)label;
#pragma mark - 1.0 styles #pragma mark - 1.0 styles
+ (void)styleLabelFeedMessage:(nonnull UILabel *)label;
+ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label;
+ (void)styleFeedCardTagLabel:(nonnull UILabel *)label; + (void)styleFeedCardTagLabel:(nonnull UILabel *)label;
+ (void)styleStandardSeparatorView:(nonnull UIView *)view; + (void)styleStandardSeparatorView:(nonnull UIView *)view;
+ (void)styleLabelHeadlineSmall:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelHeadlineSmall:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleFeedCardTagLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleFeedCardTagLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;

29
MVMCoreUI/Styles/MFStyler.m
View File

@ -174,9 +174,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [self fontB3:YES]; return [self fontB3:YES];
} }
#pragma mark - Fonts + (nullable UIFont *)fontB20:(BOOL)genericScaling {
+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling {
CGFloat size = 20; CGFloat size = 20;
if (genericScaling) { if (genericScaling) {
size = [self sizeFontGenericForCurrentDevice:size]; size = [self sizeFontGenericForCurrentDevice:size];
@ -184,10 +182,12 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [MFFonts mfFont55Rg:size]; return [MFFonts mfFont55Rg:size];
} }
+ (nullable UIFont *)fontForFeedMessage { + (nullable UIFont *)fontB20 {
return [self fontForFeedMessage:YES]; return [self fontB20:YES];
} }
#pragma mark - 1.0 Fonts
+ (nullable UIFont *)fontForPlan:(BOOL)genericScaling { + (nullable UIFont *)fontForPlan:(BOOL)genericScaling {
CGFloat size = 100; CGFloat size = 100;
if (genericScaling) { if (genericScaling) {
@ -593,6 +593,16 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor mfBattleshipGrey]; label.textColor = [UIColor mfBattleshipGrey];
} }
+ (void)styleLabelB20:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontB20:genericScaling];
label.textColor = [UIColor blackColor];
}
+ (void)styleLabelB20:(nonnull UILabel *)label {
label.font = [MFStyler fontB20];
label.textColor = [UIColor blackColor];
}
+ (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelTextStyle2:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontB2:genericScaling]; label.font = [MFStyler fontB2:genericScaling];
label.textColor = [UIColor mfBattleshipGrey]; label.textColor = [UIColor mfBattleshipGrey];
@ -603,10 +613,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor mfBattleshipGrey]; label.textColor = [UIColor mfBattleshipGrey];
} }
+ (void)styleLabelFeedMessage:(nonnull UILabel *)label {
label.font = [MFStyler fontForFeedMessage];
label.textColor = [UIColor blackColor];
}
#pragma mark - 1.0 Styles #pragma mark - 1.0 Styles
@ -629,11 +635,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForFeedMessage:genericScaling];
label.textColor = [UIColor blackColor];
}
+ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForFeedCardTitle:genericScaling]; label.font = [MFStyler fontForFeedCardTitle:genericScaling];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];