Merge pull request #87 from wordpress-mobile/no-more-open-sans

koke · koke · commit 3be0828c4c9f · 2016-03-04T07:59:50.000+01:00
No more open sans
diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m
@@ -96,7 +96,13 @@ - (NSArray *)fontDetails {
              @{@"title": NSLocalizedString(@"OpenSans Light Italic",nil), @"font": [WPFontManager openSansLightItalicFontOfSize:FontSize]},
              @{@"title": NSLocalizedString(@"OpenSans Semi-Bold",nil), @"font": [WPFontManager openSansSemiBoldFontOfSize:FontSize]},
              @{@"title": NSLocalizedString(@"OpenSans Semi-Bold Italic",nil), @"font": [WPFontManager openSansSemiBoldItalicFontOfSize:FontSize]},
-             
+
+             @{@"title": NSLocalizedString(@"System",nil), @"font": [WPFontManager systemRegularFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Bold",nil), @"font": [WPFontManager systemBoldFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Italic",nil), @"font": [WPFontManager systemItalicFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Light",nil), @"font": [WPFontManager systemLightFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Semi-Bold",nil), @"font": [WPFontManager systemSemiBoldFontOfSize:FontSize]},
+
              @{@"title": NSLocalizedString(@"Large Post Title Font", nil), @"font": [WPStyleGuide largePostTitleFont], @"attributes": [WPStyleGuide largePostTitleAttributes]},
              @{@"title": NSLocalizedString(@"Post Title Font", nil), @"font": [WPStyleGuide postTitleFont], @"attributes": [WPStyleGuide postTitleAttributes]},
              @{@"title": NSLocalizedString(@"Post Title Font Bold", nil), @"font": [WPStyleGuide postTitleFontBold], @"attributes": [WPStyleGuide postTitleAttributesBold]},
diff --git a/WordPress-iOS-Shared/Core/WPFontManager.h b/WordPress-iOS-Shared/Core/WPFontManager.h
@@ -2,14 +2,20 @@
 
 @interface WPFontManager : NSObject
 
-+ (UIFont *)openSansLightFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansLightItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansBoldFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansBoldItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansSemiBoldFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansSemiBoldItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansRegularFontOfSize:(CGFloat)size;
++ (UIFont *)openSansLightFontOfSize:(CGFloat)size __deprecated_msg("Use systemLightFontOfSize instead");
++ (UIFont *)openSansItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemItalicFontOfSize instead");
++ (UIFont *)openSansLightItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemLightItalicFontOfSize instead");
++ (UIFont *)openSansBoldFontOfSize:(CGFloat)size __deprecated_msg("Use systemBoldFontOfSize instead");
++ (UIFont *)openSansBoldItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemBoldItalicFontOfSize instead");
++ (UIFont *)openSansSemiBoldFontOfSize:(CGFloat)size __deprecated_msg("Use systemSemiBoldFontOfSize instead");
++ (UIFont *)openSansSemiBoldItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemSemiBoldItalicFontOfSize instead");
++ (UIFont *)openSansRegularFontOfSize:(CGFloat)size __deprecated_msg("Use systemRegularFontOfSize instead");
+
++ (UIFont *)systemLightFontOfSize:(CGFloat)size;
++ (UIFont *)systemItalicFontOfSize:(CGFloat)size;
++ (UIFont *)systemBoldFontOfSize:(CGFloat)size;
++ (UIFont *)systemSemiBoldFontOfSize:(CGFloat)size;
++ (UIFont *)systemRegularFontOfSize:(CGFloat)size;
 
 + (UIFont *)merriweatherBoldFontOfSize:(CGFloat)size;
 + (UIFont *)merriweatherBoldItalicFontOfSize:(CGFloat)size;
diff --git a/WordPress-iOS-Shared/Core/WPFontManager.m b/WordPress-iOS-Shared/Core/WPFontManager.m
@@ -65,6 +65,32 @@ + (UIFont *)openSansRegularFontOfSize:(CGFloat)size
     return [self fontNamed:fontName resourceName:resourceName fontType:FontTypeTTF size:size];
 }
 
+#pragma mark - System Fonts
+
++ (UIFont *)systemLightFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightLight];
+}
+
++ (UIFont *)systemItalicFontOfSize:(CGFloat)size
+{
+    return [UIFont italicSystemFontOfSize:size];
+}
+
++ (UIFont *)systemBoldFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightBold];
+}
+
++ (UIFont *)systemSemiBoldFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightSemibold];
+}
+
++ (UIFont *)systemRegularFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightRegular];
+}
 
 #pragma mark - Merryweather Fonts
 
diff --git a/WordPress-iOS-Shared/Core/WPNUXUtility.m b/WordPress-iOS-Shared/Core/WPNUXUtility.m
@@ -7,37 +7,37 @@ @implementation WPNUXUtility
 
 + (UIFont *)textFieldFont
 {
-    return [WPFontManager openSansRegularFontOfSize:16.0];
+    return [WPFontManager systemRegularFontOfSize:16.0];
 }
 
 + (UIFont *)descriptionTextFont
 {
-    return [WPFontManager openSansRegularFontOfSize:15.0];
+    return [WPFontManager systemRegularFontOfSize:15.0];
 }
 
 + (UIFont *)titleFont
 {
-    return [WPFontManager openSansLightFontOfSize:24.0];
+    return [WPFontManager systemLightFontOfSize:24.0];
 }
 
 + (UIFont *)swipeToContinueFont
 {
-    return [WPFontManager openSansRegularFontOfSize:10.0];
+    return [WPFontManager systemRegularFontOfSize:10.0];
 }
 
 + (UIFont *)tosLabelFont
 {
-    return [WPFontManager openSansRegularFontOfSize:12.0];
+    return [WPFontManager systemRegularFontOfSize:12.0];
 }
 
 + (UIFont *)tosLabelSmallerFont
 {
-    return [WPFontManager openSansRegularFontOfSize:9.0];
+    return [WPFontManager systemRegularFontOfSize:9.0];
 }
 
 + (UIFont *)confirmationLabelFont
 {
-    return [WPFontManager openSansRegularFontOfSize:14.0];
+    return [WPFontManager systemRegularFontOfSize:14.0];
 }
 
 #pragma mark - Colors
diff --git a/WordPress-iOS-Shared/Core/WPNoResultsView.m b/WordPress-iOS-Shared/Core/WPNoResultsView.m
@@ -41,7 +41,7 @@ - (instancetype)init {
         
         // Message Label
         _messageLabel               = [[UILabel alloc] init];
-        _messageLabel.font          = [WPFontManager openSansRegularFontOfSize:14.0];
+        _messageLabel.font          = [WPFontManager systemRegularFontOfSize:14.0];
         _messageLabel.textColor     = [WPStyleGuide allTAllShadeGrey];
         _messageLabel.numberOfLines = 0;
         _messageLabel.textAlignment = NSTextAlignmentCenter;
diff --git a/WordPress-iOS-Shared/Core/WPStyleGuide.m b/WordPress-iOS-Shared/Core/WPStyleGuide.m
@@ -9,7 +9,7 @@ @implementation WPStyleGuide
 
 + (UIFont *)largePostTitleFont
 {
-    return [WPFontManager openSansLightFontOfSize:32.0];
+    return [WPFontManager systemLightFontOfSize:32.0];
 }
 
 + (NSDictionary *)largePostTitleAttributes
@@ -22,12 +22,12 @@ + (NSDictionary *)largePostTitleAttributes
 
 + (UIFont *)postTitleFont
 {
-    return [WPFontManager openSansRegularFontOfSize:16.0];
+    return [WPFontManager systemRegularFontOfSize:16.0];
 }
 
 + (UIFont *)postTitleFontBold
 {
-    return [WPFontManager openSansBoldFontOfSize:16.0];
+    return [WPFontManager systemBoldFontOfSize:16.0];
 }
 
 + (NSDictionary *)postTitleAttributes
@@ -47,7 +47,7 @@ + (NSDictionary *)postTitleAttributesBold {
 
 + (UIFont *)subtitleFont
 {
-    return [WPFontManager openSansRegularFontOfSize:12.0];
+    return [WPFontManager systemRegularFontOfSize:12.0];
 }
 
 + (NSDictionary *)subtitleAttributes
@@ -60,7 +60,7 @@ + (NSDictionary *)subtitleAttributes
 
 + (UIFont *)subtitleFontItalic
 {
-    return [WPFontManager openSansItalicFontOfSize:12.0];
+    return [WPFontManager systemItalicFontOfSize:12.0];
 }
 
 + (NSDictionary *)subtitleItalicAttributes
@@ -73,7 +73,7 @@ + (NSDictionary *)subtitleItalicAttributes
 
 + (UIFont *)subtitleFontBold
 {
-    return [WPFontManager openSansBoldFontOfSize:12.0];
+    return [WPFontManager systemBoldFontOfSize:12.0];
 }
 
 + (NSDictionary *)subtitleAttributesBold
@@ -86,12 +86,12 @@ + (NSDictionary *)subtitleAttributesBold
 
 + (UIFont *)labelFont
 {
-    return [WPFontManager openSansBoldFontOfSize:10.0];
+    return [WPFontManager systemBoldFontOfSize:10.0];
 }
 
 + (UIFont *)labelFontNormal
 {
-    return [WPFontManager openSansRegularFontOfSize:10.0];
+    return [WPFontManager systemRegularFontOfSize:10.0];
 }
 
 + (NSDictionary *)labelAttributes
@@ -104,17 +104,17 @@ + (NSDictionary *)labelAttributes
 
 + (UIFont *)regularTextFont
 {
-    return [WPFontManager openSansRegularFontOfSize:16.0];
+    return [WPFontManager systemRegularFontOfSize:16.0];
 }
 
 + (UIFont *)regularTextFontSemiBold
 {
-    return [WPFontManager openSansSemiBoldFontOfSize:16.0];
+    return [WPFontManager systemSemiBoldFontOfSize:16.0];
 }
 
 + (UIFont *)regularTextFontBold
 {
-    return [WPFontManager openSansBoldFontOfSize:16.0];
+    return [WPFontManager systemBoldFontOfSize:16.0];
 }
 
 + (NSDictionary *)regularTextAttributes
@@ -127,17 +127,17 @@ + (NSDictionary *)regularTextAttributes
 
 + (UIFont *)tableviewTextFont
 {
-    return [WPFontManager openSansRegularFontOfSize:17.0];
+    return [WPFontManager systemRegularFontOfSize:17.0];
 }
 
 + (UIFont *)tableviewSubtitleFont
 {
-    return [WPFontManager openSansRegularFontOfSize:17.0];
+    return [WPFontManager systemRegularFontOfSize:17.0];
 }
 
 + (UIFont *)tableviewSectionHeaderFont
 {
-    return [WPFontManager openSansRegularFontOfSize:13.0];
+    return [WPFontManager systemRegularFontOfSize:13.0];
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,37 +7,37 @@ @implementation WPNUXUtility`
`7`	`7`
`8`	`8`	`+ (UIFont *)textFieldFont`
`9`	`9`	`{`
`10`		`- return [WPFontManager openSansRegularFontOfSize:16.0];`
	`10`	`+ return [WPFontManager systemRegularFontOfSize:16.0];`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`+ (UIFont *)descriptionTextFont`
`14`	`14`	`{`
`15`		`- return [WPFontManager openSansRegularFontOfSize:15.0];`
	`15`	`+ return [WPFontManager systemRegularFontOfSize:15.0];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`+ (UIFont *)titleFont`
`19`	`19`	`{`
`20`		`- return [WPFontManager openSansLightFontOfSize:24.0];`
	`20`	`+ return [WPFontManager systemLightFontOfSize:24.0];`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`+ (UIFont *)swipeToContinueFont`
`24`	`24`	`{`
`25`		`- return [WPFontManager openSansRegularFontOfSize:10.0];`
	`25`	`+ return [WPFontManager systemRegularFontOfSize:10.0];`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`+ (UIFont *)tosLabelFont`
`29`	`29`	`{`
`30`		`- return [WPFontManager openSansRegularFontOfSize:12.0];`
	`30`	`+ return [WPFontManager systemRegularFontOfSize:12.0];`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`+ (UIFont *)tosLabelSmallerFont`
`34`	`34`	`{`
`35`		`- return [WPFontManager openSansRegularFontOfSize:9.0];`
	`35`	`+ return [WPFontManager systemRegularFontOfSize:9.0];`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`+ (UIFont *)confirmationLabelFont`
`39`	`39`	`{`
`40`		`- return [WPFontManager openSansRegularFontOfSize:14.0];`
	`40`	`+ return [WPFontManager systemRegularFontOfSize:14.0];`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`#pragma mark - Colors`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ @implementation WPStyleGuide`
`9`	`9`
`10`	`10`	`+ (UIFont *)largePostTitleFont`
`11`	`11`	`{`
`12`		`- return [WPFontManager openSansLightFontOfSize:32.0];`
	`12`	`+ return [WPFontManager systemLightFontOfSize:32.0];`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`+ (NSDictionary *)largePostTitleAttributes`
`@@ -22,12 +22,12 @@ + (NSDictionary *)largePostTitleAttributes`
`22`	`22`
`23`	`23`	`+ (UIFont *)postTitleFont`
`24`	`24`	`{`
`25`		`- return [WPFontManager openSansRegularFontOfSize:16.0];`
	`25`	`+ return [WPFontManager systemRegularFontOfSize:16.0];`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`+ (UIFont *)postTitleFontBold`
`29`	`29`	`{`
`30`		`- return [WPFontManager openSansBoldFontOfSize:16.0];`
	`30`	`+ return [WPFontManager systemBoldFontOfSize:16.0];`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`+ (NSDictionary *)postTitleAttributes`
`@@ -47,7 +47,7 @@ + (NSDictionary *)postTitleAttributesBold {`
`47`	`47`
`48`	`48`	`+ (UIFont *)subtitleFont`
`49`	`49`	`{`
`50`		`- return [WPFontManager openSansRegularFontOfSize:12.0];`
	`50`	`+ return [WPFontManager systemRegularFontOfSize:12.0];`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`+ (NSDictionary *)subtitleAttributes`
`@@ -60,7 +60,7 @@ + (NSDictionary *)subtitleAttributes`
`60`	`60`
`61`	`61`	`+ (UIFont *)subtitleFontItalic`
`62`	`62`	`{`
`63`		`- return [WPFontManager openSansItalicFontOfSize:12.0];`
	`63`	`+ return [WPFontManager systemItalicFontOfSize:12.0];`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`+ (NSDictionary *)subtitleItalicAttributes`
`@@ -73,7 +73,7 @@ + (NSDictionary *)subtitleItalicAttributes`
`73`	`73`
`74`	`74`	`+ (UIFont *)subtitleFontBold`
`75`	`75`	`{`
`76`		`- return [WPFontManager openSansBoldFontOfSize:12.0];`
	`76`	`+ return [WPFontManager systemBoldFontOfSize:12.0];`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`+ (NSDictionary *)subtitleAttributesBold`
`@@ -86,12 +86,12 @@ + (NSDictionary *)subtitleAttributesBold`
`86`	`86`
`87`	`87`	`+ (UIFont *)labelFont`
`88`	`88`	`{`
`89`		`- return [WPFontManager openSansBoldFontOfSize:10.0];`
	`89`	`+ return [WPFontManager systemBoldFontOfSize:10.0];`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`+ (UIFont *)labelFontNormal`
`93`	`93`	`{`
`94`		`- return [WPFontManager openSansRegularFontOfSize:10.0];`
	`94`	`+ return [WPFontManager systemRegularFontOfSize:10.0];`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`+ (NSDictionary *)labelAttributes`
`@@ -104,17 +104,17 @@ + (NSDictionary *)labelAttributes`
`104`	`104`
`105`	`105`	`+ (UIFont *)regularTextFont`
`106`	`106`	`{`
`107`		`- return [WPFontManager openSansRegularFontOfSize:16.0];`
	`107`	`+ return [WPFontManager systemRegularFontOfSize:16.0];`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`+ (UIFont *)regularTextFontSemiBold`
`111`	`111`	`{`
`112`		`- return [WPFontManager openSansSemiBoldFontOfSize:16.0];`
	`112`	`+ return [WPFontManager systemSemiBoldFontOfSize:16.0];`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`+ (UIFont *)regularTextFontBold`
`116`	`116`	`{`
`117`		`- return [WPFontManager openSansBoldFontOfSize:16.0];`
	`117`	`+ return [WPFontManager systemBoldFontOfSize:16.0];`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`+ (NSDictionary *)regularTextAttributes`
`@@ -127,17 +127,17 @@ + (NSDictionary *)regularTextAttributes`
`127`	`127`
`128`	`128`	`+ (UIFont *)tableviewTextFont`
`129`	`129`	`{`
`130`		`- return [WPFontManager openSansRegularFontOfSize:17.0];`
	`130`	`+ return [WPFontManager systemRegularFontOfSize:17.0];`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`+ (UIFont *)tableviewSubtitleFont`
`134`	`134`	`{`
`135`		`- return [WPFontManager openSansRegularFontOfSize:17.0];`
	`135`	`+ return [WPFontManager systemRegularFontOfSize:17.0];`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`+ (UIFont *)tableviewSectionHeaderFont`
`139`	`139`	`{`
`140`		`- return [WPFontManager openSansRegularFontOfSize:13.0];`
	`140`	`+ return [WPFontManager systemRegularFontOfSize:13.0];`
`141`	`141`	`}`
`142`	`142`
`143`	`143`