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

remove 1.0 fonts

Browse Source
This commit is contained in:
panxi 2019-03-28 10:39:02 -04:00
parent 5fa9bd1572
commit 3cc9750333
7 changed files with 91 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,41 +27,49 @@
- (BOOL)hasText; - (BOOL)hasText;
#pragma mark - 2.0 #pragma mark - 2.0
//75Bd 40pt
+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale;
+ (nonnull MFLabel *)commonLabelH1:(BOOL)scale; + (nonnull MFLabel *)commonLabelH1:(BOOL)scale;
//75Bd 25pt
+ (nonnull MFLabel *)commonLabelH2:(BOOL)scale; + (nonnull MFLabel *)commonLabelH2:(BOOL)scale;
//75Bd 18pt
+ (nonnull MFLabel *)commonLabelH3:(BOOL)scale; + (nonnull MFLabel *)commonLabelH3:(BOOL)scale;
//75Bd 13pt
+ (nonnull MFLabel *)commonLabelB1:(BOOL)scale; + (nonnull MFLabel *)commonLabelB1:(BOOL)scale;
//55Rg 13pt
+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale;
//55Rg 11pt gray
+ (nonnull MFLabel *)commonLabelB3:(BOOL)scale; + (nonnull MFLabel *)commonLabelB3:(BOOL)scale;
//75Bd 32pt
+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale;
//55Rg 20pt
+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale;
//55Rg 11pt
+ (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale; + (nonnull MFLabel *)commonLabelFeedSubMessage:(BOOL)scale;
#pragma mark - 1.0 #pragma mark - 1.0
// Getters // Getters
+ (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel());
+ (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale; //75Bd 15pt
+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; + (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale;
+ (nonnull MFLabel *)commonLabelHeadlineWithSize:(CGFloat)size scale:(BOOL)scale; //75Bd 16pt
+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale;
+ (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale; + (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale;
// Setters // Setters
+ (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html;
+ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData; + (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData;
- (void)styleB2:(BOOL)scale;
- (void)styleBodyWithSize:(CGFloat)size scale:(BOOL)scale;
- (void)styleBodyLarge:(BOOL)scale;
- (void)styleH1:(BOOL)scale; - (void)styleH1:(BOOL)scale;
- (void)styleH2:(BOOL)scale; - (void)styleH2:(BOOL)scale;
- (void)styleHeadlineLarge:(BOOL)scale;
- (void)styleHeadlineSmall:(BOOL)scale;
- (void)styleHeadlineWithSize:(CGFloat)size scale:(BOOL)scale;
- (void)styleH3:(BOOL)scale; - (void)styleH3:(BOOL)scale;
- (void)styleB1:(BOOL)scale;
- (void)styleB2:(BOOL)scale;
- (void)styleB3:(BOOL)scale; - (void)styleB3:(BOOL)scale;
- (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedHeadline:(BOOL)scale;
- (void)styleFeedMessage:(BOOL)scale;
- (void)styleFeedSubMessage:(BOOL)scale;
- (void)styleFeedTitle:(BOOL)scale; - (void)styleFeedTitle:(BOOL)scale;
- (void)styleB1:(BOOL)scale; - (void)styleHeadlineSmall:(BOOL)scale;
@end @end

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

@ -100,28 +100,11 @@
} }
} }
#pragma mark - Getters
- (BOOL)hasText { - (BOOL)hasText {
return self.text.length > 0 || self.attributedText.length > 0; return self.text.length > 0 || self.attributedText.length > 0;
} }
+ (nonnull MFLabel *)label { #pragma mark - 2.0
return [[MFLabel alloc] initWithFrame:CGRectZero];
}
+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleB2:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelBodyLarge:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleBodyLarge:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelH1:(BOOL)scale { + (nonnull MFLabel *)commonLabelH1:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
@ -135,30 +118,36 @@
return label; return label;
} }
+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleHeadlineSmall:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelHeadlineWithSize:(CGFloat)size scale:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleHeadlineWithSize:size scale:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelH3:(BOOL)scale { + (nonnull MFLabel *)commonLabelH3:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleH3:scale]; [label styleH3:scale];
return label; return label;
} }
+ (nonnull MFLabel *)commonLabelB1:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleB1:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleB2:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelB3:(BOOL)scale { + (nonnull MFLabel *)commonLabelB3:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleB3:scale]; [label styleB3:scale];
return label; return label;
} }
+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleFeedHeadline:scale];
return label;
}
+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale { + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleFeedMessage:scale]; [label styleFeedMessage:scale];
@ -171,15 +160,21 @@
return label; return label;
} }
+ (nonnull MFLabel *)commonLabelFeedHeadline:(BOOL)scale { #pragma mark - 1.0
+ (nonnull MFLabel *)label {
return [[MFLabel alloc] initWithFrame:CGRectZero];
}
+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleFeedHeadline:scale]; [label styleHeadlineSmall:scale];
return label; return label;
} }
+ (nonnull MFLabel *)commonLabelB1:(BOOL)scale { + (nonnull MFLabel *)commonLabelFeedTitle:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleB1:scale]; [label styleFeedTitle:scale];
return label; return label;
} }
@ -263,21 +258,6 @@
self.originalAttributedString = self.attributedText; self.originalAttributedString = self.attributedText;
} }
- (void)styleB2:(BOOL)scale {
[MFStyler styleLabelB2:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleBodyWithSize:(CGFloat)size scale:(BOOL)scale {
[MFStyler styleLabelB2:self size:size genericScaling:NO];
[self setScale:scale];
}
- (void)styleBodyLarge:(BOOL)scale {
[MFStyler styleLabelBodyLarge:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleH1:(BOOL)scale { - (void)styleH1:(BOOL)scale {
[MFStyler styleLabelH1:self genericScaling:NO]; [MFStyler styleLabelH1:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
@ -288,30 +268,31 @@
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleHeadlineLarge:(BOOL)scale {
[MFStyler styleLabelHeadlineLarge:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleHeadlineSmall:(BOOL)scale {
[MFStyler styleLabelHeadlineSmall:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleHeadlineWithSize:(CGFloat)size scale:(BOOL)scale {
[MFStyler styleLabelH2:self size:size genericScaling:NO];
[self setScale:scale];
}
- (void)styleH3:(BOOL)scale { - (void)styleH3:(BOOL)scale {
[MFStyler styleLabelH3:self genericScaling:NO]; [MFStyler styleLabelH3:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleB1:(BOOL)scale {
[MFStyler styleLabelB1:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleB2:(BOOL)scale {
[MFStyler styleLabelB2:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleB3:(BOOL)scale { - (void)styleB3:(BOOL)scale {
[MFStyler styleLabelB3:self genericScaling:NO]; [MFStyler styleLabelB3:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleFeedHeadline:(BOOL)scale {
[MFStyler styleLabelHeadlineFeed:self genericScaling:NO];
[self setScale:scale];
}
- (void)styleFeedMessage:(BOOL)scale { - (void)styleFeedMessage:(BOOL)scale {
[MFStyler styleLabelFeedMessage:self genericScaling:NO]; [MFStyler styleLabelFeedMessage:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
@ -322,13 +303,13 @@
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleFeedHeadline:(BOOL)scale { - (void)styleHeadlineSmall:(BOOL)scale {
[MFStyler styleLabelHeadlineFeed:self genericScaling:NO]; [MFStyler styleLabelHeadlineSmall:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleB1:(BOOL)scale { - (void)styleFeedTitle:(BOOL)scale {
[MFStyler styleLabelB1:self genericScaling:NO]; [MFStyler styleFeedCardTitleLabel:self genericScaling:NO];
[self setScale:scale]; [self setScale:scale];
} }

2
MVMCoreUI/Molecules/TopLabelsView.m
View File

@ -180,7 +180,7 @@
#pragma mark - Common styles #pragma mark - Common styles
- (void)setAsLargeHeadline { - (void)setAsLargeHeadline {
[MFStyler styleLabelHeadlineLarge:self.headlineLabel]; [MFStyler styleLabelH1:self.headlineLabel];
[self layoutIfNeeded]; [self layoutIfNeeded];
if (self.tableView) { if (self.tableView) {
[self.tableView showHeader]; [self.tableView showHeader];

34
MVMCoreUI/Styles/MFStyler.h
View File

@ -118,6 +118,10 @@ B3 -> Legal
+ (nullable UIFont *)fontB4:(BOOL)genericScaling; + (nullable UIFont *)fontB4:(BOOL)genericScaling;
+ (nullable UIFont *)fontB4; + (nullable UIFont *)fontB4;
//55Rg 20pt
+ (nullable UIFont *)fontForFeedMessage;
//55Rg 11pt
+ (nullable UIFont *)fontForFeedSubMessage;
#pragma mark - 1.0 fonts #pragma mark - 1.0 fonts
@ -125,29 +129,20 @@ B3 -> Legal
+ (nullable UIFont *)fontForPlan; + (nullable UIFont *)fontForPlan;
//75Bd 48pt //75Bd 48pt
+ (nullable UIFont *)fontForBiggerHeadline; + (nullable UIFont *)fontForBiggerHeadline;
//75Bd 26pt
+ (nullable UIFont *)fontForLoyaltySignUpHeadLine;
//75Bd 40pt //75Bd 40pt
+ (nullable UIFont *)fontForFeedHeadline; + (nullable UIFont *)fontForFeedHeadline;
//55Rg 20pt
+ (nullable UIFont *)fontForFeedMessage;
//55Rg 11pt
+ (nullable UIFont *)fontForFeedSubMessage;
//75Bd 15pt //75Bd 15pt
+ (nullable UIFont *)fontForHeadlineSmall; + (nullable UIFont *)fontForHeadlineSmall;
//75Bd 11pt //75Bd 11pt
+ (nullable UIFont *)fontForHeadlineTiny; + (nullable UIFont *)fontForHeadlineTiny;
//75Bd 16pt //75Bd 16pt
+ (nullable UIFont *)fontForHeadlineSmall2; + (nullable UIFont *)fontForHeadlineSmall2;
//75Bd 32pt
+ (nullable UIFont *)fontForHeadlineLarge;
//55Rg 14pt //55Rg 14pt
+ (nullable UIFont *)fontforChatText; + (nullable UIFont *)fontforChatText;
//55Rg 16pt //55Rg 16pt
+ (nullable UIFont *)fontForAccountLandingGreeting; + (nullable UIFont *)fontForAccountLandingGreeting;
//55Rg 20pt
+ (nullable UIFont *)fontForBodyLarge;
//55Rg 10pt //55Rg 10pt
+ (nullable UIFont *)fontForProgressBarBottomLabel; + (nullable UIFont *)fontForProgressBarBottomLabel;
@ -169,8 +164,6 @@ B3 -> Legal
+ (nullable UIFont *)fontForSupportDateStamp; + (nullable UIFont *)fontForSupportDateStamp;
//65Md 10pt //65Md 10pt
+ (nullable UIFont *)fontForProgressBarTopLabel; + (nullable UIFont *)fontForProgressBarTopLabel;
//75Bd 20pt
+ (nullable UIFont *)fontH3;
//75Bd 60pt //75Bd 60pt
+ (nullable UIFont *)fontForLargeLoyaltyHeaderTitle; + (nullable UIFont *)fontForLargeLoyaltyHeaderTitle;
//75Bd 42pt //75Bd 42pt
@ -181,21 +174,18 @@ B3 -> Legal
+ (nullable UIFont *)fontForUnreadMessageOnSupport; + (nullable UIFont *)fontForUnreadMessageOnSupport;
// Returns the fonts for these styles allowing to apply a generic scale by device or not. // Returns the fonts for these styles allowing to apply a generic scale by device or not.
+ (nullable UIFont *)fontForHeadlineWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling;
+ (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling;
+ (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedMessage:(BOOL)genericScaling;
+ (nullable UIFont *)fontForFeedSubMessage:(BOOL)genericScaling; + (nullable UIFont *)fontForFeedSubMessage:(BOOL)genericScaling;
+ (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall:(BOOL)genericScaling;
+ (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling; + (nullable UIFont *)fontForHeadlineSmall2:(BOOL)genericScaling;
+ (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size; + (nullable UIFont *)fontForHeadlineSmall2ForWidth:(CGFloat)size;
+ (nullable UIFont *)fontForHeadlineLarge:(BOOL)genericScaling;
+ (nullable UIFont *)fontB1ForWidth:(CGFloat)size; + (nullable UIFont *)fontB1ForWidth:(CGFloat)size;
+ (nullable UIFont *)fontForBodyWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling; + (nullable UIFont *)fontForBodyWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling;
+ (nullable UIFont *)fontB2ForWidth:(CGFloat)size; + (nullable UIFont *)fontB2ForWidth:(CGFloat)size;
+ (nullable UIFont *)fontForBodyWithSize:(CGFloat)size forWidth:(CGFloat)width; + (nullable UIFont *)fontForBodyWithSize:(CGFloat)size forWidth:(CGFloat)width;
+ (nullable UIFont *)fontforChatText:(BOOL)genericScaling; + (nullable UIFont *)fontforChatText:(BOOL)genericScaling;
+ (nullable UIFont *)fontForAccountLandingGreeting:(BOOL)genericScaling; + (nullable UIFont *)fontForAccountLandingGreeting:(BOOL)genericScaling;
+ (nullable UIFont *)fontForBodyLarge:(BOOL)genericScaling;
+ (nullable UIFont *)fontForPrimaryButton:(BOOL)genericScaling; + (nullable UIFont *)fontForPrimaryButton:(BOOL)genericScaling;
+ (nullable UIFont *)fontForPrimaryButtonForWidth:(CGFloat)size; + (nullable UIFont *)fontForPrimaryButtonForWidth:(CGFloat)size;
@ -252,12 +242,10 @@ B3 -> Legal
#pragma mark - 1.0 styles #pragma mark - 1.0 styles
+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label;
+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label; + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label;
+ (void)styleLabelFeedMessage:(nonnull UILabel *)label; + (void)styleLabelFeedMessage:(nonnull UILabel *)label;
+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label; + (void)styleLabelFeedSubMessage:(nonnull UILabel *)label;
+ (void)styleLabelB2:(nonnull UILabel *)label; + (void)styleLabelB2:(nonnull UILabel *)label;
+ (void)styleLabelBodyLarge:(nonnull UILabel *)label;
+ (void)styleFeedCardTitleLabel:(nonnull UILabel *)label; + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label;
@ -267,30 +255,19 @@ B3 -> Legal
+ (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)styleLabelHeadlineLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelFeedMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelFeedSubMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling; + (void)styleLabelFeedSubMessage:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling;
+ (void)styleLabelH2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling;
+ (void)styleLabelBodyLarge:(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;
//------------------------------------------------- //-------------------------------------------------
// Sets the text with strings attributed with these styles.
+ (void)styleSetLabelTextWithH2:(nonnull UILabel *)label text:(nullable NSString *)text;
+ (void)styleSetLabelTextWithHeadlineLarge:(nonnull UILabel *)label text:(nullable NSString *)text;
+ (void)styleSetLabelTextWithH3:(nonnull UILabel *)label text:(nullable NSString *)text;
+ (void)styleSetLabelTextWithB2:(nonnull UILabel *)label text:(nullable NSString *)text;
+ (void)styleSetLabelTextWithB3:(nonnull UILabel *)label text:(nullable NSString *)text;
#pragma mark - Attributed Strings #pragma mark - Attributed Strings
+ (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color; + (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color;
+ (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetHeadlineAttributedString:(nullable NSString *)string;
+ (nonnull NSAttributedString *)styleGetHeadlineLargeAttributedString:(nullable NSString *)string;
+ (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string;
+ (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetBodyAttributedString:(nullable NSString *)string;
+ (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string; + (nonnull NSAttributedString *)styleGetB1AttributedString:(nullable NSString *)string;
@ -306,6 +283,7 @@ B3 -> Legal
//------------------------------------------------- //-------------------------------------------------
// Returns colors for Gradient Text presets // Returns colors for Gradient Text presets
+ (nonnull NSArray *)gradientSpecialTicketGold; + (nonnull NSArray *)gradientSpecialTicketGold;
+ (nonnull NSArray *)gradientSpecialTicketGoldCGColor; + (nonnull NSArray *)gradientSpecialTicketGoldCGColor;

95
MVMCoreUI/Styles/MFStyler.m
View File

@ -128,13 +128,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
#pragma mark - Fonts #pragma mark - Fonts
+ (nullable UIFont *)fontForHeadlineWithSize:(CGFloat)size genericScaling:(BOOL)genericScaling {
if (genericScaling) {
size = [self sizeFontGenericForCurrentDevice:size];
}
return [MFFonts mfFont75Bd:size];
}
+ (nullable UIFont *)fontForPlan:(BOOL)genericScaling { + (nullable UIFont *)fontForPlan:(BOOL)genericScaling {
CGFloat size = 100; CGFloat size = 100;
if (genericScaling) { if (genericScaling) {
@ -151,14 +144,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [MFFonts mfFont75Bd:size]; return [MFFonts mfFont75Bd:size];
} }
+ (nullable UIFont *)fontForLoyaltySignUpHeadLine:(BOOL)genericScaling {
CGFloat size = 26;
if (genericScaling) {
size = [self sizeFontGenericForCurrentDevice:size];
}
return [MFFonts mfFont75Bd:size];
}
+ (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling { + (nullable UIFont *)fontForFeedHeadline:(BOOL)genericScaling {
CGFloat size = 32; CGFloat size = 32;
if (genericScaling) { if (genericScaling) {
@ -205,14 +190,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [MFFonts mfFont75Bd:pointSize]; return [MFFonts mfFont75Bd:pointSize];
} }
+ (nullable UIFont *)fontForHeadlineLarge:(BOOL)genericScaling {
CGFloat size = 40;
if (genericScaling) {
size = [self sizeFontGenericForCurrentDevice:size];
}
return [MFFonts mfFont75Bd:size];
}
+ (nullable UIFont *)commonLabelB1:(BOOL)genericScaling { + (nullable UIFont *)commonLabelB1:(BOOL)genericScaling {
CGFloat size = 13; CGFloat size = 13;
if (genericScaling) { if (genericScaling) {
@ -269,14 +246,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [MFFonts mfFont55Rg:size]; return [MFFonts mfFont55Rg:size];
} }
+ (nullable UIFont *)fontForBodyLarge:(BOOL)genericScaling {
CGFloat size = 20;
if (genericScaling) {
size = [self sizeFontGenericForCurrentDevice:size];
}
return [MFFonts mfFont55Rg:size];
}
+ (nullable UIFont *)fontB3:(BOOL)genericScaling { + (nullable UIFont *)fontB3:(BOOL)genericScaling {
CGFloat size = 11; CGFloat size = 11;
if (genericScaling) { if (genericScaling) {
@ -469,10 +438,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [self fontForBiggerHeadLine:YES]; return [self fontForBiggerHeadLine:YES];
} }
+ (nullable UIFont *)fontForLoyaltySignUpHeadLine {
return [self fontForLoyaltySignUpHeadLine:YES];
}
+ (nullable UIFont *)fontForFeedHeadline { + (nullable UIFont *)fontForFeedHeadline {
return [self fontForFeedHeadline:YES]; return [self fontForFeedHeadline:YES];
} }
@ -497,10 +462,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [self fontForHeadlineSmall2:YES]; return [self fontForHeadlineSmall2:YES];
} }
+ (nullable UIFont *)fontForHeadlineLarge {
return [self fontForHeadlineLarge:YES];
}
+ (nullable UIFont *)fontB2 { + (nullable UIFont *)fontB2 {
return [self fontB2:YES]; return [self fontB2:YES];
} }
@ -513,10 +474,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [self fontForAccountLandingGreeting:YES]; return [self fontForAccountLandingGreeting:YES];
} }
+ (nullable UIFont *)fontForBodyLarge {
return [self fontForBodyLarge:YES];
}
+ (nullable UIFont *)fontB3 { + (nullable UIFont *)fontB3 {
return [self fontB3:YES]; return [self fontB3:YES];
} }
@ -680,11 +637,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
#pragma mark - 1.0 Styles #pragma mark - 1.0 Styles
+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label {
label.font = [MFStyler fontForHeadlineLarge];
label.textColor = [UIColor blackColor];
}
+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label { + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label {
label.font = [MFStyler fontForFeedHeadline]; label.font = [MFStyler fontForFeedHeadline];
label.textColor = [UIColor mfRedColor]; label.textColor = [UIColor mfRedColor];
@ -695,13 +647,13 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelBodyLarge:(nonnull UILabel *)label { + (void)styleLabelB1:(nonnull UILabel *)label {
label.font = [MFStyler fontForBodyLarge]; label.font = [MFStyler fontB1];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelB1:(nonnull UILabel *)label { + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label {
label.font = [MFStyler fontB1]; label.font = [MFStyler fontForFeedCardTitle];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
@ -719,11 +671,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelHeadlineLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForHeadlineLarge:genericScaling];
label.textColor = [UIColor mfRedColor];
}
+ (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleLabelHeadlineFeed:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForFeedHeadline:genericScaling]; label.font = [MFStyler fontForFeedHeadline:genericScaling];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
@ -738,13 +685,9 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.font = [MFStyler fontForFeedSubMessage:genericScaling]; label.font = [MFStyler fontForFeedSubMessage:genericScaling];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
+ (void)styleLabelH2:(nonnull UILabel *)label size:(CGFloat)size genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForHeadlineWithSize:size genericScaling:genericScaling];
label.textColor = [UIColor mfRedColor];
}
+ (void)styleLabelBodyLarge:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling { + (void)styleFeedCardTitleLabel:(nonnull UILabel *)label genericScaling:(BOOL)genericScaling {
label.font = [MFStyler fontForBodyLarge:genericScaling]; label.font = [MFStyler fontForFeedCardTitle:genericScaling];
label.textColor = [UIColor blackColor]; label.textColor = [UIColor blackColor];
} }
@ -753,28 +696,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
label.textColor = [UIColor mfBrownishGrey]; label.textColor = [UIColor mfBrownishGrey];
} }
#pragma mark - Set Text With Styles
+ (void)styleSetLabelTextWithH2:(nonnull UILabel *)label text:(nullable NSString *)text {
[MFStyler styleLabelH2:label];
label.text = text;
}
+ (void)styleSetLabelTextWithHeadlineLarge:(nonnull UILabel *)label text:(nullable NSString *)text {
[MFStyler styleLabelHeadlineLarge:label];
label.text = text;
}
+ (void)styleSetLabelTextWithB2:(nonnull UILabel *)label text:(nullable NSString *)text {
[MFStyler styleLabelB2:label];
label.text = text;
}
+ (void)styleSetLabelTextWithB3:(nonnull UILabel *)label text:(nullable NSString *)text {
[MFStyler styleLabelB3:label];
label.text = text;
}
#pragma mark - Attributed Strings #pragma mark - Attributed Strings
+ (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color { + (nonnull NSAttributedString *)styleGetAttributedString:(nullable NSString *)string font:(nonnull UIFont *)font color:(nonnull UIColor *)color {
@ -795,10 +716,6 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor mfRedColor]]; return [MFStyler styleGetAttributedString:string font:[MFStyler fontH2] color:[UIColor mfRedColor]];
} }
+ (nonnull NSAttributedString *)styleGetHeadlineLargeAttributedString:(nullable NSString *)string {
return [MFStyler styleGetAttributedString:string font:[MFStyler fontForHeadlineLarge] color:[UIColor mfRedColor]];
}
+ (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string { + (nonnull NSAttributedString *)styleGetSubheadAttributedString:(nullable NSString *)string {
return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]]; return [MFStyler styleGetAttributedString:string font:[MFStyler fontH3] color:[UIColor blackColor]];
} }

4
MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h
View File

@ -20,6 +20,7 @@
#pragma mark - 2.0 labels #pragma mark - 2.0 labels
+ (nonnull UILabel *)commonLabelH1;
+ (nonnull UILabel *)commonLabelH2; + (nonnull UILabel *)commonLabelH2;
+ (nonnull UILabel *)commonLabelH3; + (nonnull UILabel *)commonLabelH3;
+ (nonnull UILabel *)commonLabelB1; + (nonnull UILabel *)commonLabelB1;
@ -31,9 +32,8 @@
// Creates and returns common labels // Creates and returns common labels
+ (nonnull UILabel *)label; + (nonnull UILabel *)label;
+ (nonnull UILabel *)commonLabelHeadlineLarge;
+ (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelHeadlineFeed;
+ (nonnull UILabel *)commonLabelBodyLarge; + (nonnull UILabel *)commonLabelFeedHeadline;
+ (nonnull UILabel *)commonLabelFeedTitle; + (nonnull UILabel *)commonLabelFeedTitle;
#pragma mark - Text Field #pragma mark - Text Field

16
MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
View File

@ -53,18 +53,18 @@ static const CGFloat VertialShadowOffset = 6;
return label; return label;
} }
+ (nonnull UILabel *)commonLabelHeadlineLarge {
UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelHeadlineLarge:label];
return label;
}
+ (nonnull UILabel *)commonLabelHeadlineFeed { + (nonnull UILabel *)commonLabelHeadlineFeed {
UILabel *label = [MVMCoreUICommonViewsUtility label]; UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelHeadlineFeed:label]; [MFStyler styleLabelHeadlineFeed:label];
return label; return label;
} }
+ (nonnull UILabel *)commonLabelH1 {
UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelH1:label];
return label;
}
+ (nonnull UILabel *)commonLabelH2 { + (nonnull UILabel *)commonLabelH2 {
UILabel *label = [MVMCoreUICommonViewsUtility label]; UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelH2:label]; [MFStyler styleLabelH2:label];
@ -83,9 +83,9 @@ static const CGFloat VertialShadowOffset = 6;
return label; return label;
} }
+ (nonnull UILabel *)commonLabelBodyLarge { + (nonnull UILabel *)commonLabelFeedHeadline {
UILabel *label = [MVMCoreUICommonViewsUtility label]; UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelBodyLarge:label]; [MFStyler styleLabelHeadlineFeed:label];
return label; return label;
} }