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

Merge branch 'bugfix/label_refactor' into 'develop'

Browse Source 
label_refactor

See merge request BPHV_MIPS/mvm_core_ui!4
This commit is contained in:
Pfeil, Scott Robert 2019-03-13 09:30:10 -04:00
commit a9cfbf4e98
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,9 +40,7 @@
#pragma mark - 1.0 #pragma mark - 1.0
// Getters // Getters
+ (nonnull MFLabel *)label; + (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel());
// This is for swift files. Swift is not able to find MFLabel.label()
+ (nonnull MFLabel *)standardLabel;
+ (nonnull MFLabel *)commonLabelBodyWithSize:(CGFloat)size scale:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyWithSize:(CGFloat)size scale:(BOOL)scale;
+ (nonnull MFLabel *)commonLabelBodyBold:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyBold:(BOOL)scale;
+ (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale; + (nonnull MFLabel *)commonLabelBodyLighter:(BOOL)scale;

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

@ -33,7 +33,6 @@
self.numberOfLines = 0; self.numberOfLines = 0;
self.lineBreakMode = NSLineBreakByWordWrapping; self.lineBreakMode = NSLineBreakByWordWrapping;
self.translatesAutoresizingMaskIntoConstraints = NO; self.translatesAutoresizingMaskIntoConstraints = NO;
[self styleB2:YES];
} }
- (instancetype)init { - (instancetype)init {
@ -110,12 +109,6 @@
return [[MFLabel alloc] initWithFrame:CGRectZero]; return [[MFLabel alloc] initWithFrame:CGRectZero];
} }
// This is for swift files. Swift is not able to find MFLabel.label()
+ (nonnull MFLabel *)standardLabel {
MFLabel *label = [MFLabel label];
return label;
}
+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale { + (nonnull MFLabel *)commonLabelB2:(BOOL)scale {
MFLabel *label = [MFLabel label]; MFLabel *label = [MFLabel label];
[label styleB2:scale]; [label styleB2:scale];