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

reduce fonts

Browse Source
This commit is contained in:
panxi 2019-03-28 12:01:57 -04:00
parent b43690d10e
commit 0db36c1405
5 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,12 +44,8 @@
//55Rg 20pt //55Rg 20pt
+ (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale; + (nonnull MFLabel *)commonLabelFeedMessage:(BOOL)scale;
#pragma mark - 1.0
// Getters // Getters
+ (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel()); + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel());
//75Bd 15pt
+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale;
// Setters // Setters
+ (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html; + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html;
@ -64,6 +60,4 @@
- (void)styleFeedHeadline:(BOOL)scale; - (void)styleFeedHeadline:(BOOL)scale;
- (void)styleFeedMessage:(BOOL)scale; - (void)styleFeedMessage:(BOOL)scale;
- (void)styleHeadlineSmall:(BOOL)scale;
@end @end

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

@ -154,18 +154,10 @@
return label; return label;
} }
#pragma mark - 1.0
+ (nonnull MFLabel *)label { + (nonnull MFLabel *)label {
return [[MFLabel alloc] initWithFrame:CGRectZero]; return [[MFLabel alloc] initWithFrame:CGRectZero];
} }
+ (nonnull MFLabel *)commonLabelHeadlineSmall:(BOOL)scale {
MFLabel *label = [MFLabel label];
[label styleHeadlineSmall:scale];
return label;
}
#pragma mark - Setters #pragma mark - Setters
+ (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html { + (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html {
@ -286,11 +278,6 @@
[self setScale:scale]; [self setScale:scale];
} }
- (void)styleHeadlineSmall:(BOOL)scale {
[MFStyler styleLabelHeadlineSmall:self genericScaling:NO];
[self setScale:scale];
}
- (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits { - (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits {
if (accessibilityTraits& UIAccessibilityTraitHeader) { if (accessibilityTraits& UIAccessibilityTraitHeader) {

4
MVMCoreUI/Styles/MFStyler.h
View File

@ -125,14 +125,10 @@ B3 -> Legal
+ (nullable UIFont *)fontForPlan; + (nullable UIFont *)fontForPlan;
//75Bd 48pt //75Bd 48pt
+ (nullable UIFont *)fontForBiggerHeadline; + (nullable UIFont *)fontForBiggerHeadline;
//75Bd 32pt
+ (nullable UIFont *)fontForFeedHeadline;
//75Bd 15pt //75Bd 15pt
+ (nullable UIFont *)fontForHeadlineSmall; + (nullable UIFont *)fontForHeadlineSmall;
//75Bd 11pt //75Bd 11pt
+ (nullable UIFont *)fontForHeadlineTiny; + (nullable UIFont *)fontForHeadlineTiny;
//75Bd 16pt
+ (nullable UIFont *)fontForHeadlineSmall2;
//55Rg 14pt //55Rg 14pt
+ (nullable UIFont *)fontforChatText; + (nullable UIFont *)fontforChatText;

2
MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.h
View File

@ -31,9 +31,7 @@
// Creates and returns common labels // Creates and returns common labels
+ (nonnull UILabel *)label; + (nonnull UILabel *)label;
+ (nonnull UILabel *)commonLabelHeadlineFeed;
+ (nonnull UILabel *)commonLabelFeedHeadline; + (nonnull UILabel *)commonLabelFeedHeadline;
+ (nonnull UILabel *)commonLabelHeadlineSmall;
#pragma mark - Text Field #pragma mark - Text Field

24
MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
View File

@ -53,12 +53,6 @@ static const CGFloat VertialShadowOffset = 6;
return label; return label;
} }
+ (nonnull UILabel *)commonLabelHeadlineFeed {
UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelHeadlineFeed:label];
return label;
}
+ (nonnull UILabel *)commonLabelH1 { + (nonnull UILabel *)commonLabelH1 {
UILabel *label = [MVMCoreUICommonViewsUtility label]; UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelH1:label]; [MFStyler styleLabelH1:label];
@ -77,18 +71,6 @@ static const CGFloat VertialShadowOffset = 6;
return label; 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 { + (nonnull UILabel *)commonLabelB1 {
UILabel *label = [MVMCoreUICommonViewsUtility label]; UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelB1:label]; [MFStyler styleLabelB1:label];
@ -107,6 +89,12 @@ static const CGFloat VertialShadowOffset = 6;
return label; return label;
} }
+ (nonnull UILabel *)commonLabelFeedHeadline {
UILabel *label = [MVMCoreUICommonViewsUtility label];
[MFStyler styleLabelHeadlineFeed:label];
return label;
}
#pragma mark - Text Field #pragma mark - Text Field
+ (nonnull UIPickerView *)addPickerToTextField:(nonnull UITextField *)textField delegate:(nullable id <UITextFieldDelegate,UIPickerViewDelegate,UIPickerViewDataSource>)delegate { + (nonnull UIPickerView *)addPickerToTextField:(nonnull UITextField *)textField delegate:(nullable id <UITextFieldDelegate,UIPickerViewDelegate,UIPickerViewDataSource>)delegate {