diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h index 4b2d6f37..a5ca49ab 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.h +++ b/MVMCoreUI/Atoms/Views/MFLabel.h @@ -44,12 +44,8 @@ //55Rg 20pt + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; -#pragma mark - 1.0 - // Getters + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); -//75Bd 15pt -+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale; // Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; @@ -64,6 +60,4 @@ - (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedMessage:(BOOL)scale; -- (void)styleHeadlineSmall:(BOOL)scale; - @end diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m index 9714fc57..0370e23f 100644 --- a/MVMCoreUI/Atoms/Views/MFLabel.m +++ b/MVMCoreUI/Atoms/Views/MFLabel.m @@ -154,18 +154,10 @@ return label; } -#pragma mark - 1.0 - + (nonnull MFLabel *)label { return [[MFLabel alloc] initWithFrame:CGRectZero]; } -+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale { - MFLabel *label = [MFLabel label]; - [label styleHeadlineSmall:scale]; - return label; -} - #pragma mark - Setters + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html { @@ -286,11 +278,6 @@ [self setScale:scale]; } -- (void)styleHeadlineSmall:(BOOL)scale { - [MFStyler styleLabelHeadlineSmall:self genericScaling:NO]; - [self setScale:scale]; -} - - (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits { if (accessibilityTraits& UIAccessibilityTraitHeader) { diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h index f58610ab..41177f14 100644 --- a/MVMCoreUI/Styles/MFStyler.h +++ b/MVMCoreUI/Styles/MFStyler.h @@ -125,14 +125,10 @@ B3 -> Legal + (nullable UIFont *)fontForPlan; //75Bd 48pt + (nullable UIFont *)fontForBiggerHeadline; -//75Bd 32pt -+ (nullable UIFont *)fontForFeedHeadline; //75Bd 15pt + (nullable UIFont *)fontForHeadlineSmall; //75Bd 11pt + (nullable UIFont *)fontForHeadlineTiny; -//75Bd 16pt -+ (nullable UIFont *)fontForHeadlineSmall2; //55Rg 14pt + (nullable UIFont *)fontforChatText; diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h index 5220205b..d8d5c27d 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h @@ -31,9 +31,7 @@ // Creates and returns common labels + (nonnull UILabel *)label; -+ (nonnull UILabel *)commonLabelHeadlineFeed; + (nonnull UILabel *)commonLabelFeedHeadline; -+ (nonnull UILabel *)commonLabelHeadlineSmall; #pragma mark - Text Field diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m index e870f1e7..dfae6b26 100644 --- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m +++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m @@ -53,12 +53,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelHeadlineFeed { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineFeed:label]; - return label; -} - + (nonnull UILabel *)commonLabelH1 { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelH1:label]; @@ -77,18 +71,6 @@ static const CGFloat VertialShadowOffset = 6; return label; } -+ (nonnull UILabel *)commonLabelFeedHeadline { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineFeed:label]; - return label; -} - -+ (nonnull UILabel *)commonLabelHeadlineSmall { - UILabel *label = [MVMCoreUICommonViewsUtility label]; - [MFStyler styleLabelHeadlineSmall:label genericScaling:YES]; - return label; -} - + (nonnull UILabel *)commonLabelB1 { UILabel *label = [MVMCoreUICommonViewsUtility label]; [MFStyler styleLabelB1:label]; @@ -107,6 +89,12 @@ static const CGFloat VertialShadowOffset = 6; return label; } ++ (nonnull UILabel *)commonLabelFeedHeadline { + UILabel *label = [MVMCoreUICommonViewsUtility label]; + [MFStyler styleLabelHeadlineFeed:label]; + return label; +} + #pragma mark - Text Field + (nonnull UIPickerView *)addPickerToTextField:(nonnull UITextField *)textField delegate:(nullable id )delegate {