Dr0ptp4kt has submitted this change and it was merged.
Change subject: Merged the 2 glyph fonts into one.
......................................................................
Merged the 2 glyph fonts into one.
Reduces the 2 glyph fonts to 1 eliminating unused/outdated glyphs.
Amended with category on UIFont conforming to prefix naming
convention.
Change-Id: Ib8c51d3f530e07c9da66d65cd82905d152a53f6d
---
M Wikipedia.xcodeproj/project.pbxproj
A wikipedia/Categories/UIFont+WMFStyle.h
A wikipedia/Categories/UIFont+WMFStyle.m
M wikipedia/Defines/WikiGlyph_Chars.h
D wikipedia/Defines/WikiGlyph_Chars_iOS.h
D wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
M wikipedia/Fonts/WikiFont-Glyphs.ttf
M wikipedia/MenuLabel/MenuLabel.m
M wikipedia/MenuLabel/WikiGlyphLabel.m
M wikipedia/View Controllers/Credits/CreditsViewController.m
M wikipedia/View Controllers/History/HistoryViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
M wikipedia/View Controllers/Preview/PreviewLicenseView.m
M wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
M wikipedia/View Controllers/References/ReferencesVC.m
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/Wikipedia-Info.plist
M www/less/langbutton.less
22 files changed, 111 insertions(+), 218 deletions(-)
Approvals:
Dr0ptp4kt: Verified; Looks good to me, approved
Fjalapeno: Looks good to me, but someone else must approve
Bgerstle: Looks good to me, but someone else must approve
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index a78fef7..24cc092 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -111,7 +111,6 @@
048A26771906268100395F53 /* PaddedLabel.m in Sources */ = {isa
= PBXBuildFile; fileRef = 048A26761906268100395F53 /* PaddedLabel.m */; };
0493C2CC1952373100EBB973 /* DataHousekeeping.m in Sources */ =
{isa = PBXBuildFile; fileRef = 0493C2CB1952373100EBB973 /* DataHousekeeping.m
*/; };
0493C2D419526A0100EBB973 /* WikiFont-Glyphs.ttf in Resources */
= {isa = PBXBuildFile; fileRef = 0493C2D319526A0100EBB973 /*
WikiFont-Glyphs.ttf */; };
- 0493C2D619526FFE00EBB973 /* WikiFont-Glyphs-iOS.ttf in
Resources */ = {isa = PBXBuildFile; fileRef = 0493C2D519526FFE00EBB973 /*
WikiFont-Glyphs-iOS.ttf */; };
049566C218F5F4CB0058EA12 /* ZeroConfigState.m in Sources */ =
{isa = PBXBuildFile; fileRef = 049566C118F5F4CB0058EA12 /* ZeroConfigState.m
*/; };
049B640C18AAF36200D98BD4 /*
UIViewController+SearchChildViewControllers.m in Sources */ = {isa =
PBXBuildFile; fileRef = 049B640B18AAF36200D98BD4 /*
UIViewController+SearchChildViewControllers.m */; };
04A70FD7185BB6C300E24515 /* URLCache.m in Sources */ = {isa =
PBXBuildFile; fileRef = 04A70FD6185BB6C300E24515 /* URLCache.m */; };
@@ -129,6 +128,8 @@
04B91AA718E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04B91AA618E34BBC00FFAA1C /*
UIView+TemporaryAnimatedXF.m */; };
04B91AAB18E3D9E200FFAA1C /*
NSString+FormattedAttributedString.m in Sources */ = {isa = PBXBuildFile;
fileRef = 04B91AAA18E3D9E200FFAA1C /* NSString+FormattedAttributedString.m */;
};
04B91AB718E4D5B200FFAA1C /* TabularScrollView.m in Sources */ =
{isa = PBXBuildFile; fileRef = 04B91AB618E4D5B200FFAA1C /* TabularScrollView.m
*/; };
+ 04BA48A11A80062F00CB5CAE /* UIFont+WMFStyle.m in Sources */ =
{isa = PBXBuildFile; fileRef = 04BA48A01A80062E00CB5CAE /* UIFont+WMFStyle.m
*/; };
+ 04BA48A21A80062F00CB5CAE /* UIFont+WMFStyle.m in Sources */ =
{isa = PBXBuildFile; fileRef = 04BA48A01A80062E00CB5CAE /* UIFont+WMFStyle.m
*/; };
04C0A0781936786000D55325 /* UIViewController+ModalPresent.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04C0A0771936786000D55325 /*
UIViewController+ModalPresent.m */; };
04C43AA4183440C1006C643B /* MWNetworkActivityIndicatorManager.m
in Sources */ = {isa = PBXBuildFile; fileRef = 04C43AA1183440C1006C643B /*
MWNetworkActivityIndicatorManager.m */; };
04C43AAE18344131006C643B /* CommunicationBridge.m in Sources */
= {isa = PBXBuildFile; fileRef = 04C43AAB18344131006C643B /*
CommunicationBridge.m */; };
@@ -455,9 +456,7 @@
048A26761906268100395F53 /* PaddedLabel.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
lineEnding = 0; path = PaddedLabel.m; sourceTree = "<group>";
xcLanguageSpecificationIdentifier = xcode.lang.objc; };
0493C2CA1952373100EBB973 /* DataHousekeeping.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
DataHousekeeping.h; sourceTree = "<group>"; };
0493C2CB1952373100EBB973 /* DataHousekeeping.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= DataHousekeeping.m; sourceTree = "<group>"; };
- 0493C2D219525F8E00EBB973 /* WikiGlyph_Chars_iOS.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WikiGlyph_Chars_iOS.h; sourceTree = "<group>"; };
0493C2D319526A0100EBB973 /* WikiFont-Glyphs.ttf */ = {isa =
PBXFileReference; lastKnownFileType = file; path = "WikiFont-Glyphs.ttf";
sourceTree = "<group>"; };
- 0493C2D519526FFE00EBB973 /* WikiFont-Glyphs-iOS.ttf */ = {isa =
PBXFileReference; lastKnownFileType = file; path = "WikiFont-Glyphs-iOS.ttf";
sourceTree = "<group>"; };
049566C018F5F4CB0058EA12 /* ZeroConfigState.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
ZeroConfigState.h; sourceTree = "<group>"; };
049566C118F5F4CB0058EA12 /* ZeroConfigState.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= ZeroConfigState.m; sourceTree = "<group>"; };
049B640A18AAF36200D98BD4 /*
UIViewController+SearchChildViewControllers.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"UIViewController+SearchChildViewControllers.h"; sourceTree = "<group>"; };
@@ -491,6 +490,8 @@
04B91AAA18E3D9E200FFAA1C /*
NSString+FormattedAttributedString.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path =
"NSString+FormattedAttributedString.m"; sourceTree = "<group>"; };
04B91AB518E4D5B200FFAA1C /* TabularScrollView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
TabularScrollView.h; sourceTree = "<group>"; };
04B91AB618E4D5B200FFAA1C /* TabularScrollView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= TabularScrollView.m; sourceTree = "<group>"; };
+ 04BA489F1A80062E00CB5CAE /* UIFont+WMFStyle.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"UIFont+WMFStyle.h"; sourceTree = "<group>"; };
+ 04BA48A01A80062E00CB5CAE /* UIFont+WMFStyle.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= "UIFont+WMFStyle.m"; sourceTree = "<group>"; };
04C0A0761936786000D55325 /* UIViewController+ModalPresent.h */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = "UIViewController+ModalPresent.h"; sourceTree =
"<group>"; };
04C0A0771936786000D55325 /* UIViewController+ModalPresent.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = "UIViewController+ModalPresent.m"; sourceTree =
"<group>"; };
04C43AA0183440C1006C643B /* MWNetworkActivityIndicatorManager.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = MWNetworkActivityIndicatorManager.h; sourceTree =
"<group>"; };
@@ -933,7 +934,6 @@
04292FFC185FC026002A13FC /* Defines.h */,
043F18F118DCDD3A00D8489A /* WMF_Colors.h */,
047528A3190F0C2900F2CDA8 /* WikiGlyph_Chars.h
*/,
- 0493C2D219525F8E00EBB973 /*
WikiGlyph_Chars_iOS.h */,
);
path = Defines;
sourceTree = "<group>";
@@ -1023,7 +1023,6 @@
isa = PBXGroup;
children = (
0493C2D319526A0100EBB973 /* WikiFont-Glyphs.ttf
*/,
- 0493C2D519526FFE00EBB973 /*
WikiFont-Glyphs-iOS.ttf */,
);
path = Fonts;
sourceTree = "<group>";
@@ -1448,6 +1447,8 @@
04B6924F18E77B2A00F88D8A /*
UIWebView+HideScrollGradient.m */,
0439317419FB092600386E8F /*
UIWebView+LoadAssetsHtml.h */,
0439317519FB092600386E8F /*
UIWebView+LoadAssetsHtml.m */,
+ 04BA489F1A80062E00CB5CAE /* UIFont+WMFStyle.h
*/,
+ 04BA48A01A80062E00CB5CAE /* UIFont+WMFStyle.m
*/,
04D149D818877343006B4104 /* Alerts */,
);
path = Categories;
@@ -2016,7 +2017,6 @@
D401C2C11A659E5000D4D127 /*
DataMigrationProgressViewController.xib in Resources */,
04EDEE251A20788700798076 /*
SearchResultPrototypeView.xib in Resources */,
04478631185145090050563B /*
HistoryResultPrototypeView.xib in Resources */,
- 0493C2D619526FFE00EBB973 /*
WikiFont-Glyphs-iOS.ttf in Resources */,
0493C2D419526A0100EBB973 /* WikiFont-Glyphs.ttf
in Resources */,
04F27B7618FE0F2E00EDD838 /*
PageHistoryResultPrototypeView.xib in Resources */,
04C91CF319554B310035ED1B /*
[email protected] in Resources */,
@@ -2212,6 +2212,7 @@
files = (
BC42735E1A7C73B300068882 /*
NSArray+PredicateTests.m in Sources */,
BC42735D1A7C73B300068882 /* NSArray+Predicate.m
in Sources */,
+ 04BA48A21A80062F00CB5CAE /* UIFont+WMFStyle.m
in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2306,6 +2307,7 @@
D401C2C01A659E5000D4D127 /*
DataMigrationProgressViewController.m in Sources */,
04CCCFF01935093A00E3F60C /*
SecondaryMenuViewController.m in Sources */,
D4B0AE0B19366A2C00F0AC90 /*
ReadingActionFunnel.m in Sources */,
+ 04BA48A11A80062F00CB5CAE /* UIFont+WMFStyle.m
in Sources */,
0452C810195D0F03007925A6 /*
UIViewController+ModalPop.m in Sources */,
0487049019F8262600B7D307 /*
WikiTextSectionUploader.m in Sources */,
041C55D21950B27D006CE0EF /*
EditSummaryViewController.m in Sources */,
diff --git a/wikipedia/Categories/UIFont+WMFStyle.h
b/wikipedia/Categories/UIFont+WMFStyle.h
new file mode 100644
index 0000000..4d262ab
--- /dev/null
+++ b/wikipedia/Categories/UIFont+WMFStyle.h
@@ -0,0 +1,10 @@
+// Created by Monte Hurd on 2/2/15.
+// Copyright (c) 2015 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
+
+#import <UIKit/UIKit.h>
+
+@interface UIFont (WMF_Style)
+
++(UIFont *)wmf_glyphFontOfSize:(CGFloat)fontSize;
+
+@end
diff --git a/wikipedia/Categories/UIFont+WMFStyle.m
b/wikipedia/Categories/UIFont+WMFStyle.m
new file mode 100644
index 0000000..48bf2b8
--- /dev/null
+++ b/wikipedia/Categories/UIFont+WMFStyle.m
@@ -0,0 +1,17 @@
+// Created by Monte Hurd on 2/2/15.
+// Copyright (c) 2015 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
+
+#import "UIFont+WMFStyle.h"
+
+@implementation UIFont (WMF_Style)
+
++(UIFont *)wmf_glyphFontOfSize:(CGFloat)fontSize;
+{
+ UIFont *font = [UIFont fontWithName:@"WikiFont-Glyphs" size:fontSize];
+
+ NSAssert(font, @"Unable to load glyph font");
+
+ return font;
+}
+
+@end
diff --git a/wikipedia/Defines/WikiGlyph_Chars.h
b/wikipedia/Defines/WikiGlyph_Chars.h
index 0e4941c..f2769f7 100644
--- a/wikipedia/Defines/WikiGlyph_Chars.h
+++ b/wikipedia/Defines/WikiGlyph_Chars.h
@@ -1,119 +1,27 @@
-
-/* UI ELEMENTS e000_023
-*/
-
-#define WIKIGLYPH_MAGNIFYING_GLASS @"\ue000"
-#define WIKIGLYPH_ARROW_LEFT @"\ue001"
-#define WIKIGLYPH_TICK @"\ue002"
-#define WIKIGLYPH_X @"\ue003"
-#define WIKIGLYPH_X_CIRCLE @"\ue004"
-#define WIKIGLYPH_UNSTAR @"\ue005"
-#define WIKIGLYPH_STAR @"\ue006"
-#define WIKIGLYPH_STAR_LIST @"\ue007"
-#define WIKIGLYPH_SUN @"\ue008"
-#define WIKIGLYPH_FUNNEL @"\ue009"
-#define WIKIGLYPH_EYE @"\ue010"
-#define WIKIGLYPH_EYE_LID @"\ue011"
-#define WIKIGLYPH_BOOKMARK @"\ue012"
-#define WIKIGLYPH_PRINTER @"\ue013"
-#define WIKIGLYPH_PUZZLE @"\ue014"
-#define WIKIGLYPH_CLOCK @"\ue015"
-#define WIKIGLYPH_DICE @"\ue016"
-#define WIKIGLYPH_MOVE @"\ue017"
-#define WIKIGLYPH_GEAR @"\ue018"
-#define WIKIGLYPH_ELLIPSIS @"\ue019"
-#define WIKIGLYPH_ENVELOPE @"\ue020"
-#define WIKIGLYPH_PIN @"\ue021"
-#define WIKIGLYPH_SHARE @"\ue022"
-#define WIKIGLYPH_DOWNLOAD @"\ue023"
-#define WIKIGLYPH_BELL @"\ue025"
-#define WIKIGLYPH_BELL_RING @"\ue026"
-#define WIKIGLYPH_CARET_LEFT @"\ue027"
-#define WIKIGLYPH_CARET_DOWN @"\ue028"
-
-
-/* EXPERIMENTS e300_301
-*/
-#define WIKIGLYPH_STAR_CIRCLE @"\ue300"
-#define WIKIGLYPH_ROCKET @"\ue301"
-
-
-/* STRIPES e040_043
-*/
-#define WIKIGLYPH_STRIPE_COMPACT @"\ue040"
-#define WIKIGLYPH_STRIPE_TOC @"\ue041"
-#define WIKIGLYPH_STRIPE_EXPANDED @"\ue042"
-
-
-/* UI MODERATION ELEMENTS e500_508
-*/
-
-#define WIKIGLYPH_ARTICLE @"\ue100"
-#define WIKIGLYPH_ARTICLE_CHECK @"\ue101"
-#define WIKIGLYPH_ARTICLE_SEARCH @"\ue102"
-
-#define WIKIGLYPH_TRASH @"\ue500"
-#define WIKIGLYPH_TRASH_SLASH @"\ue501"
-#define WIKIGLYPH_BLOCK @"\ue502"
-#define WIKIGLYPH_BLOCK_SLASH @"\ue503"
-#define WIKIGLYPH_FLAG @"\ue504"
-#define WIKIGLYPH_FLAG_SLASH @"\ue505"
-#define WIKIGLYPH_PLAY @"\ue506"
-#define WIKIGLYPH_STOP @"\ue507"
-#define WIKIGLYPH_LOCK @"\ue508"
-
-
-/* USER e600_602
-*/
-#define WIKIGLYPH_USER_BUST @"\ue600"
-#define WIKIGLYPH_USER_SMILE @"\ue601"
-#define WIKIGLYPH_USER_SLEEP @"\ue602"
-
-
-/* TRANSLATION e700
-*/
-#define WIKIGLYPH_TRANSLATE @"\ue700"
-
-
-/* CONTRIBUTION e800_845
-*/
-#define WIKIGLYPH_PENCIL @"\ue800"
-#define WIKIGLYPH_PENCIL_REVERT_FULL @"\ue801"
-#define WIKIGLYPH_PENCIL_REVERT_PT1 @"\ue802"
-#define WIKIGLYPH_PENCIL_REVERT_PT2 @"\ue803"
-#define WIKIGLYPH_PENCIL_LOCK_FULL @"\ue804"
-#define WIKIGLYPH_PENCIL_LOCK_PT1 @"\ue805"
-#define WIKIGLYPH_PENCIL_LOCK_PT2 @"\ue806"
-#define WIKIGLYPH_SPEECH_BUBBLE @"\ue810"
-#define WIKIGLYPH_SPEECH_BUBBLES @"\ue811"
-#define WIKIGLYPH_SPEECH_BUBBLE_ADD @"\ue812"
-#define WIKIGLYPH_SPEECH_BUBBLE_SMILE @"\ue813"
-#define WIKIGLYPH_LINK @"\ue820"
-#define WIKIGLYPH_QUOTES @"\ue830"
-#define WIKIGLYPH_QUOTES_ADD @"\ue831"
-#define WIKIGLYPH_IMAGE @"\ue840"
-#define WIKIGLYPH_IMAGE_LOCK_FULL @"\ue841"
-#define WIKIGLYPH_IMAGE_LOCK_PT1 @"\ue842"
-#define WIKIGLYPH_IMAGE_LOCK_PT2 @"\ue843"
-#define WIKIGLYPH_IMAGE_ADD_FULL @"\ue844"
-#define WIKIGLYPH_IMAGE_ADD_PT1 @"\ue845"
-#define WIKIGLYPH_IMAGE_ADD_PT2 @"\ue846"
-#define WIKIGLYPH_IMAGE_MAIN_PLACEHOLDER @"\ue847"
-#define WIKIGLYPH_FOLDER @"\ue848"
-#define WIKIGLYPH_FOLDER_MAIN_PLACEHOLDER @"\ue849"
-
-#define WIKIGLYPH_CC @"\ue870"
-#define WIKIGLYPH_BOOK @"\ue871"
-#define WIKIGLYPH_JOURNAL @"\ue872"
-#define WIKIGLYPH_WEB @"\ue873"
-#define WIKIGLYPH_NEWS @"\ue874"
-
-
-
-/* WIKI_X e900+
-*/
-#define WIKIGLYPH_WIKITRAIL @"\ue900"
-#define WIKIGLYPH_WIKICOMMONS @"\ue901"
-#define WIKIGLYPH_W @"\ue902"
-
+#define WIKIGLYPH_W @"\ue950"
+#define WIKIGLYPH_SHARE @"\ue951"
+#define WIKIGLYPH_MAGNIFY @"\ue952"
+#define WIKIGLYPH_MAGNIFY_BOLD @"\ue953"
+#define WIKIGLYPH_FORWARD @"\ue954"
+#define WIKIGLYPH_BACKWARD @"\ue955"
+#define WIKIGLYPH_DOWN @"\ue956"
+#define WIKIGLYPH_HEART @"\ue957"
+#define WIKIGLYPH_HEART_OUTLINE @"\ue958"
+#define WIKIGLYPH_TOC_COLLAPSED @"\ue959"
+#define WIKIGLYPH_TOC_EXPANDED @"\ue95a"
+#define WIKIGLYPH_STAR @"\ue95b"
+#define WIKIGLYPH_STAR_OUTLINE @"\ue95c"
+#define WIKIGLYPH_TICK @"\ue95d"
+#define WIKIGLYPH_X @"\ue95e"
+#define WIKIGLYPH_DICE @"\ue95f"
+#define WIKIGLYPH_ENVELOPE @"\ue960"
+#define WIKIGLYPH_CARET_LEFT @"\ue961"
+#define WIKIGLYPH_TRASH @"\ue962"
+#define WIKIGLYPH_FLAG @"\ue963"
+#define WIKIGLYPH_USER_SMILE @"\ue964"
+#define WIKIGLYPH_USER_SLEEP @"\ue965"
+#define WIKIGLYPH_TRANSLATE @"\ue966"
+#define WIKIGLYPH_PENCIL @"\ue967"
+#define WIKIGLYPH_LINK @"\ue968"
+#define WIKIGLYPH_CC @"\ue969"
diff --git a/wikipedia/Defines/WikiGlyph_Chars_iOS.h
b/wikipedia/Defines/WikiGlyph_Chars_iOS.h
deleted file mode 100644
index ff5af48..0000000
--- a/wikipedia/Defines/WikiGlyph_Chars_iOS.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-/* IOS TEMP SUPPLEMENT e950 */
-
-#define IOS_WIKIGLYPH_W @"\ue950"
-#define IOS_WIKIGLYPH_SHARE @"\ue951"
-#define IOS_WIKIGLYPH_MAGNIFY @"\ue952"
-#define IOS_WIKIGLYPH_FORWARD @"\ue953"
-#define IOS_WIKIGLYPH_BACKWARD @"\ue954"
-#define IOS_WIKIGLYPH_DOWN @"\ue955"
-#define IOS_WIKIGLYPH_HEART @"\ue956"
-#define IOS_WIKIGLYPH_HEART_OUTLINE @"\ue957"
-#define IOS_WIKIGLYPH_TOC_COLLAPSED @"\ue958"
-#define IOS_WIKIGLYPH_TOC_EXPANDED @"\ue959"
-#define IOS_WIKIGLYPH_RELOAD @"\ue95a"
-#define IOS_WIKIGLYPH_STAR @"\ue95b"
-#define IOS_WIKIGLYPH_STAR_OUTLINE @"\ue95c"
diff --git a/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
b/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
deleted file mode 100644
index b42026c..0000000
--- a/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Fonts/WikiFont-Glyphs.ttf
b/wikipedia/Fonts/WikiFont-Glyphs.ttf
index a78a98d..1671ec2 100644
--- a/wikipedia/Fonts/WikiFont-Glyphs.ttf
+++ b/wikipedia/Fonts/WikiFont-Glyphs.ttf
Binary files differ
diff --git a/wikipedia/MenuLabel/MenuLabel.m b/wikipedia/MenuLabel/MenuLabel.m
index d5e057b..7ca6f9e 100644
--- a/wikipedia/MenuLabel/MenuLabel.m
+++ b/wikipedia/MenuLabel/MenuLabel.m
@@ -4,6 +4,7 @@
#import "MenuLabel.h"
#import "WikiGlyph_Chars.h"
#import "Defines.h"
+#import "UIFont+WMFStyle.h"
@interface MenuLabel ()
@@ -78,7 +79,7 @@
// single character string was a WikiGlyph rather than using
isEqualToString.)
if ([text isEqualToString:WIKIGLYPH_TICK]) {
self.adjustsFontSizeToFitWidth = NO;
- attributes[NSFontAttributeName] = [UIFont
fontWithName:@"WikiFont-Glyphs" size:self.fontSize];
+ attributes[NSFontAttributeName] = [UIFont
wmf_glyphFontOfSize:self.fontSize];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle
alloc] init];
paragraphStyle.alignment = NSTextAlignmentCenter;
attributes[NSParagraphStyleAttributeName] = paragraphStyle;
diff --git a/wikipedia/MenuLabel/WikiGlyphLabel.m
b/wikipedia/MenuLabel/WikiGlyphLabel.m
index c1c1907..bc497d5 100644
--- a/wikipedia/MenuLabel/WikiGlyphLabel.m
+++ b/wikipedia/MenuLabel/WikiGlyphLabel.m
@@ -2,7 +2,8 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "WikiGlyphLabel.h"
-#import "WikiGlyph_Chars_iOS.h"
+#import "WikiGlyph_Chars.h"
+#import "UIFont+WMFStyle.h"
@interface WikiGlyphLabel()
@@ -44,34 +45,10 @@
self.color = color;
self.size = size;
self.baselineOffset = baselineOffset;
-
- // Temp hack for supplemental iOS wikifont.
- BOOL isIOSFontChar = NO;
-
- if (
- [text isEqualToString:IOS_WIKIGLYPH_W] ||
- [text isEqualToString:IOS_WIKIGLYPH_TOC_COLLAPSED] ||
- [text isEqualToString:IOS_WIKIGLYPH_TOC_EXPANDED] ||
- [text isEqualToString:IOS_WIKIGLYPH_SHARE] ||
- [text isEqualToString:IOS_WIKIGLYPH_MAGNIFY] ||
- [text isEqualToString:IOS_WIKIGLYPH_FORWARD] ||
- [text isEqualToString:IOS_WIKIGLYPH_BACKWARD] ||
- [text isEqualToString:IOS_WIKIGLYPH_STAR] ||
- [text isEqualToString:IOS_WIKIGLYPH_STAR_OUTLINE] ||
- [text isEqualToString:IOS_WIKIGLYPH_HEART_OUTLINE] ||
- [text isEqualToString:IOS_WIKIGLYPH_HEART] ||
- [text isEqualToString:IOS_WIKIGLYPH_RELOAD]
- ) {
- isIOSFontChar = YES;
- }
- NSString *fontName = isIOSFontChar ? @"WikiFontGlyphs-iOS":
@"WikiFont-Glyphs";
- //NSArray *array =[UIFont fontNamesForFamilyName:@"WikiFont-Glyphs"];
- //NSLog(@"array = %@", array);
-
NSDictionary *attributes =
@{
- NSFontAttributeName: [UIFont fontWithName:fontName size:size],
+ NSFontAttributeName: [UIFont wmf_glyphFontOfSize:size],
NSForegroundColorAttributeName : color,
NSBaselineOffsetAttributeName: @(baselineOffset)
};
diff --git a/wikipedia/View Controllers/Credits/CreditsViewController.m
b/wikipedia/View Controllers/Credits/CreditsViewController.m
index 02c5e1e..a10f477 100644
--- a/wikipedia/View Controllers/Credits/CreditsViewController.m
+++ b/wikipedia/View Controllers/Credits/CreditsViewController.m
@@ -8,11 +8,12 @@
#import "TopMenuViewController.h"
#import "UIViewController+ModalPop.h"
#import "TabularScrollView.h"
-#import "WikiGlyph_Chars_iOS.h"
+#import "WikiGlyph_Chars.h"
#import "Defines.h"
#import "PaddedLabel.h"
#import "SecondaryMenuRowView.h"
#import "UIView+TemporaryAnimatedXF.h"
+#import "UIFont+WMFStyle.h"
#define URL_APP_GITHUB @"https://github.com/wikimedia/apps-ios-wikipedia";
#define URL_APP_GERRIT
@"https://gerrit.wikimedia.org/r/#/q/project:apps/ios/wikipedia,n,z";
@@ -163,7 +164,7 @@
NSDictionary *attributes =
@{
- NSFontAttributeName: [UIFont fontWithName:@"WikiFontGlyphs-iOS"
size:MENU_ICON_FONT_SIZE],
+ NSFontAttributeName: [UIFont
wmf_glyphFontOfSize:MENU_ICON_FONT_SIZE],
NSForegroundColorAttributeName : MENU_ICON_COLOR,
NSBaselineOffsetAttributeName: @0
};
@@ -204,8 +205,6 @@
-(void)setRowData
{
- NSString *ltrSafeCaretCharacter = @""; //[WikipediaAppUtils
isDeviceLanguageRTL] ? IOS_WIKIGLYPH_BACKWARD : IOS_WIKIGLYPH_FORWARD;
-
NSMutableArray *rowData =
@[
@{
@@ -219,7 +218,7 @@
@{
@"title": MWLocalizedString(@"credits-gerrit-repo", nil),
@"tag": @(CREDITS_ROW_INDEX_APP_REPO_GERRIT),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_GERRIT,
}.mutableCopy
@@ -227,7 +226,7 @@
@{
@"title": MWLocalizedString(@"credits-github-mirror", nil),
@"tag": @(CREDITS_ROW_INDEX_APP_REPO_GITHUB),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_GITHUB,
}.mutableCopy
@@ -243,7 +242,7 @@
@{
@"title": @"Wikifont",
@"tag": @(CREDITS_ROW_INDEX_REPO_WIKIFONT),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_WIKIFONT,
}.mutableCopy
@@ -251,7 +250,7 @@
@{
@"title": @"Hpple",
@"tag": @(CREDITS_ROW_INDEX_REPO_HPPLE),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_HPPLE,
}.mutableCopy
@@ -259,7 +258,7 @@
@{
@"title": @"NSDate-Extensions",
@"tag": @(CREDITS_ROW_INDEX_REPO_NSDATE),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_NSDATE,
}.mutableCopy
@@ -267,7 +266,7 @@
@{
@"title": @"AFNetworking",
@"tag": @(CREDITS_ROW_INDEX_REPO_AFNETWORKING),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_AFNETWORKING,
}.mutableCopy
@@ -275,7 +274,7 @@
@{
@"title": @"Cocoapods",
@"tag": @(CREDITS_ROW_INDEX_REPO_COCOAPODS),
- @"icon": ltrSafeCaretCharacter,
+ @"icon": @"",
@"type": @(ROW_TYPE_SELECTION),
@"url": URL_APP_COCOAPODS,
}.mutableCopy
diff --git a/wikipedia/View Controllers/History/HistoryViewController.m
b/wikipedia/View Controllers/History/HistoryViewController.m
index 4719e31..161aa4f 100644
--- a/wikipedia/View Controllers/History/HistoryViewController.m
+++ b/wikipedia/View Controllers/History/HistoryViewController.m
@@ -20,6 +20,7 @@
#import "DataHousekeeping.h"
#import "NSObject+ConstraintsScale.h"
#import "SessionSingleton.h"
+#import "UIFont+WMFStyle.h"
#define HISTORY_RESULT_HEIGHT (80.0 * MENUS_SCALE_MULTIPLIER)
#define HISTORY_TEXT_COLOR [UIColor colorWithWhite:0.0f alpha:0.7f]
@@ -496,7 +497,7 @@
wikiFontCharacter = WIKIGLYPH_LINK;
break;
default:
- wikiFontCharacter = WIKIGLYPH_MAGNIFYING_GLASS;
+ wikiFontCharacter = WIKIGLYPH_MAGNIFY_BOLD;
break;
}
@@ -504,7 +505,7 @@
CGFloat fontSize = 20.0 * MENUS_SCALE_MULTIPLIER;
NSDictionary *attributes =
@{
- NSFontAttributeName: [UIFont fontWithName:@"WikiFont-Glyphs"
size:fontSize],
+ NSFontAttributeName: [UIFont wmf_glyphFontOfSize:fontSize],
NSForegroundColorAttributeName : iconColor,
NSBaselineOffsetAttributeName: @0
};
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index 79e4a98..d7289e6 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -5,7 +5,6 @@
#import "WebViewController.h"
#import "UINavigationController+SearchNavStack.h"
#import "SessionSingleton.h"
-#import "WikiGlyph_Chars_iOS.h"
#import "WikiGlyph_Chars.h"
#import "WikiGlyphButton.h"
#import "WikiGlyphLabel.h"
@@ -57,14 +56,14 @@
BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL];
- [self.backButton.label setWikiText: isRTL ? IOS_WIKIGLYPH_FORWARD :
IOS_WIKIGLYPH_BACKWARD
+ [self.backButton.label setWikiText: isRTL ? WIKIGLYPH_FORWARD :
WIKIGLYPH_BACKWARD
color: buttonColor
size: MENU_BOTTOM_GLYPH_FONT_SIZE
baselineOffset: 0];
self.backButton.accessibilityLabel =
MWLocalizedString(@"menu-back-accessibility-label", nil);
self.backButton.tag = BOTTOM_MENU_BUTTON_PREVIOUS;
- [self.forwardButton.label setWikiText: isRTL ? IOS_WIKIGLYPH_BACKWARD :
IOS_WIKIGLYPH_FORWARD
+ [self.forwardButton.label setWikiText: isRTL ? WIKIGLYPH_BACKWARD :
WIKIGLYPH_FORWARD
color: buttonColor
size: MENU_BOTTOM_GLYPH_FONT_SIZE
baselineOffset: 0
@@ -73,7 +72,7 @@
self.forwardButton.tag = BOTTOM_MENU_BUTTON_NEXT;
// self.forwardButton.label.transform = CGAffineTransformMakeScale(-1, 1);
- [self.rightButton.label setWikiText: IOS_WIKIGLYPH_SHARE
+ [self.rightButton.label setWikiText: WIKIGLYPH_SHARE
color: buttonColor
size: MENU_BOTTOM_GLYPH_FONT_SIZE
baselineOffset: 0
@@ -81,7 +80,7 @@
self.rightButton.tag = BOTTOM_MENU_BUTTON_SHARE;
self.rightButton.accessibilityLabel =
MWLocalizedString(@"menu-share-accessibility-label", nil);
- [self.saveButton.label setWikiText: IOS_WIKIGLYPH_HEART_OUTLINE
+ [self.saveButton.label setWikiText: WIKIGLYPH_HEART_OUTLINE
color: buttonColor
size: MENU_BOTTOM_GLYPH_FONT_SIZE
baselineOffset: 0
@@ -299,10 +298,10 @@
self.forwardButton.enabled = (self.adjacentHistoryEntries[@"after"]) ? YES
: NO;
self.backButton.enabled = (self.adjacentHistoryEntries[@"before"]) ? YES :
NO;
- NSString *saveIconString = IOS_WIKIGLYPH_HEART_OUTLINE;
+ NSString *saveIconString = WIKIGLYPH_HEART_OUTLINE;
UIColor *saveIconColor = [UIColor blackColor];
if([self isCurrentArticleSaved]){
- saveIconString = IOS_WIKIGLYPH_HEART;
+ saveIconString = WIKIGLYPH_HEART;
saveIconColor = UIColorFromRGBWithAlpha(0xf27072, 1.0);
}
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index b286309..526d798 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@ -13,7 +13,7 @@
#import "NSString+FormattedAttributedString.h"
#import "TabularScrollView.h"
#import "SecondaryMenuRowView.h"
-#import "WikiGlyph_Chars_iOS.h"
+#import "WikiGlyph_Chars.h"
#import "TopMenuContainerView.h"
#import "UIViewController+StatusBarHeight.h"
#import "Defines.h"
@@ -22,6 +22,7 @@
#import "UIViewController+ModalPop.h"
#import "LoginViewController.h"
#import "PaddedLabel.h"
+#import "UIFont+WMFStyle.h"
#pragma mark - Defines
@@ -273,7 +274,7 @@
NSDictionary *attributes =
@{
- NSFontAttributeName: [UIFont fontWithName:@"WikiFontGlyphs-iOS"
size:MENU_ICON_FONT_SIZE],
+ NSFontAttributeName: [UIFont
wmf_glyphFontOfSize:MENU_ICON_FONT_SIZE],
NSForegroundColorAttributeName : MENU_ICON_COLOR,
NSBaselineOffsetAttributeName: @2
};
@@ -311,7 +312,7 @@
-(void)setRowData
{
- //NSString *ltrSafeCaretCharacter = [WikipediaAppUtils
isDeviceLanguageRTL] ? IOS_WIKIGLYPH_BACKWARD : IOS_WIKIGLYPH_FORWARD;
+ //NSString *ltrSafeCaretCharacter = [WikipediaAppUtils
isDeviceLanguageRTL] ? WIKIGLYPH_BACKWARD : WIKIGLYPH_FORWARD;
//NSString *currentArticleTitle = [SessionSingleton
sharedInstance].currentArticleTitle;
@@ -380,7 +381,7 @@
@"domain": languageCode,
@"title": searchWikiTitle,
@"tag": @(SECONDARY_MENU_ROW_INDEX_SEARCH_LANGUAGE),
- @"icon": IOS_WIKIGLYPH_DOWN,
+ @"icon": WIKIGLYPH_DOWN,
@"type": @(ROW_TYPE_SELECTION),
}.mutableCopy
,
@@ -427,7 +428,7 @@
@"domain": [SessionSingleton sharedInstance].domain,
@"title": MWLocalizedString(@"main-menu-credits", nil),
@"tag": @(SECONDARY_MENU_ROW_INDEX_CREDITS),
- @"icon": IOS_WIKIGLYPH_DOWN,
+ @"icon": WIKIGLYPH_DOWN,
@"type": @(ROW_TYPE_SELECTION),
}.mutableCopy
,
@@ -436,7 +437,7 @@
@"domain": [SessionSingleton sharedInstance].searchSite.language,
@"title": MWLocalizedString(@"main-menu-about", nil),
@"tag": @(SECONDARY_MENU_ROW_INDEX_ABOUT),
- @"icon": IOS_WIKIGLYPH_DOWN,
+ @"icon": WIKIGLYPH_DOWN,
@"type": @(ROW_TYPE_SELECTION),
}.mutableCopy
,
diff --git a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
index 11fffd2..b4ad6d1 100644
--- a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
+++ b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
@@ -10,7 +10,6 @@
NAVBAR_BUTTON_ARROW_LEFT,
NAVBAR_BUTTON_ARROW_RIGHT,
NAVBAR_BUTTON_LOGO_W,
- NAVBAR_BUTTON_EYE,
NAVBAR_BUTTON_TOC,
NAVBAR_BUTTON_MAGNIFY,
NAVBAR_BUTTON_BLANK,
diff --git a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
index 1fb4533..ce5ddfa 100644
--- a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
@@ -19,7 +19,6 @@
#import "WikiGlyphLabel.h"
#import "PaddedLabel.h"
#import "WikiGlyph_Chars.h"
-#import "WikiGlyph_Chars_iOS.h"
#import "CenterNavController.h"
#import "RootViewController.h"
#import "TopMenuViewController.h"
@@ -42,7 +41,6 @@
@property (strong, nonatomic) WikiGlyphButton *buttonTOC;
@property (strong, nonatomic) WikiGlyphButton *buttonPencil;
@property (strong, nonatomic) WikiGlyphButton *buttonX;
-@property (strong, nonatomic) WikiGlyphButton *buttonEye;
@property (strong, nonatomic) WikiGlyphButton *buttonArrowLeft;
@property (strong, nonatomic) WikiGlyphButton *buttonArrowRight;
@property (strong, nonatomic) WikiGlyphButton *buttonMagnify;
@@ -247,15 +245,14 @@
CGFloat size = MENU_TOP_GLYPH_FONT_SIZE;
BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL];
- NSString *caret = !isRTL ? WIKIGLYPH_CARET_LEFT: IOS_WIKIGLYPH_FORWARD;
+ NSString *caret = !isRTL ? WIKIGLYPH_CARET_LEFT: WIKIGLYPH_FORWARD;
self.buttonX = getWikiGlyphButton(WIKIGLYPH_X,
MWLocalizedString(@"menu-close-accessibility-label", nil), NAVBAR_BUTTON_X,
size);
- self.buttonEye = getWikiGlyphButton(WIKIGLYPH_EYE,
MWLocalizedString(@"menu-preview-accessibility-label", nil), NAVBAR_BUTTON_EYE,
size);
self.buttonArrowLeft = getWikiGlyphButton(caret,
MWLocalizedString(@"menu-back-accessibility-label", nil),
NAVBAR_BUTTON_ARROW_LEFT, size);
self.buttonArrowRight = getWikiGlyphButton(caret,
MWLocalizedString(@"menu-forward-accessibility-label", nil),
NAVBAR_BUTTON_ARROW_RIGHT, size);
- self.buttonW = getWikiGlyphButton(IOS_WIKIGLYPH_W,
MWLocalizedString(@"menu-w-accessibility-label", nil),
NAVBAR_BUTTON_LOGO_W, size);
- self.buttonTOC = getWikiGlyphButton(IOS_WIKIGLYPH_TOC_COLLAPSED,
MWLocalizedString(@"menu-toc-accessibility-label", nil), NAVBAR_BUTTON_TOC,
size);
- self.buttonMagnify = getWikiGlyphButton(IOS_WIKIGLYPH_MAGNIFY,
MWLocalizedString(@"menu-search-accessibility-label", nil),
NAVBAR_BUTTON_MAGNIFY, size);
+ self.buttonW = getWikiGlyphButton(WIKIGLYPH_W,
MWLocalizedString(@"menu-w-accessibility-label", nil),
NAVBAR_BUTTON_LOGO_W, size);
+ self.buttonTOC = getWikiGlyphButton(WIKIGLYPH_TOC_COLLAPSED,
MWLocalizedString(@"menu-toc-accessibility-label", nil), NAVBAR_BUTTON_TOC,
size);
+ self.buttonMagnify = getWikiGlyphButton(WIKIGLYPH_MAGNIFY,
MWLocalizedString(@"menu-search-accessibility-label", nil),
NAVBAR_BUTTON_MAGNIFY, size);
self.buttonBlank = getWikiGlyphButton(@"", @"",
NAVBAR_BUTTON_BLANK, size);
self.buttonCancel = getWikiGlyphButton(@"",
MWLocalizedString(@"menu-cancel-accessibility-label", nil),
NAVBAR_BUTTON_CANCEL, size);
self.buttonTrash = getWikiGlyphButton(WIKIGLYPH_TRASH,
MWLocalizedString(@"menu-trash-accessibility-label", nil),
NAVBAR_BUTTON_TRASH, size);
@@ -312,7 +309,6 @@
[self.navBarContainer addSubview:self.buttonPencil];
[self.navBarContainer addSubview:self.buttonCheck];
[self.navBarContainer addSubview:self.buttonX];
- [self.navBarContainer addSubview:self.buttonEye];
[self.navBarContainer addSubview:self.buttonArrowLeft];
[self.navBarContainer addSubview:self.buttonArrowRight];
[self.navBarContainer addSubview:self.buttonW];
@@ -369,7 +365,6 @@
@"NAVBAR_BUTTON_NEXT": self.buttonNext,
@"NAVBAR_BUTTON_SAVE": self.buttonSave,
@"NAVBAR_BUTTON_DONE": self.buttonDone,
- @"NAVBAR_BUTTON_EYE": self.buttonEye,
@"NAVBAR_BUTTON_TRASH": self.buttonTrash,
@"NAVBAR_TEXT_FIELD": self.textFieldContainer,
@"NAVBAR_LABEL": self.label
@@ -779,7 +774,6 @@
case NAVBAR_BUTTON_ARROW_LEFT:
case NAVBAR_BUTTON_ARROW_RIGHT:
case NAVBAR_BUTTON_LOGO_W:
- case NAVBAR_BUTTON_EYE:
case NAVBAR_BUTTON_TOC:
case NAVBAR_BUTTON_MAGNIFY:
case NAVBAR_BUTTON_BLANK:
diff --git a/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
b/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
index 896ed77..0807f31 100644
--- a/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
+++ b/wikipedia/View Controllers/PageHistory/PageHistoryResultCell.m
@@ -6,6 +6,7 @@
#import "PageHistoryLabel.h"
#import "Defines.h"
#import "NSString+Extras.h"
+#import "UIFont+WMFStyle.h"
@interface PageHistoryResultCell()
@@ -46,7 +47,7 @@
NSDictionary *iconAttributes =
@{
- NSFontAttributeName: [UIFont fontWithName:@"WikiFont-Glyphs" size:23.0 *
MENUS_SCALE_MULTIPLIER],
+ NSFontAttributeName: [UIFont wmf_glyphFontOfSize:23.0 *
MENUS_SCALE_MULTIPLIER],
NSForegroundColorAttributeName : [UIColor colorWithRed:0.78 green:0.78
blue:0.78 alpha:1.0],
NSBaselineOffsetAttributeName: @1
};
diff --git a/wikipedia/View Controllers/Preview/PreviewLicenseView.m
b/wikipedia/View Controllers/Preview/PreviewLicenseView.m
index 5802f92..4ebba84 100644
--- a/wikipedia/View Controllers/Preview/PreviewLicenseView.m
+++ b/wikipedia/View Controllers/Preview/PreviewLicenseView.m
@@ -8,6 +8,7 @@
#import "RootViewController.h"
#import "Defines.h"
#import "NSObject+ConstraintsScale.h"
+#import "UIFont+WMFStyle.h"
#define PREVIEW_BLUE_COLOR [UIColor colorWithRed:0.2 green:0.4784 blue:1.0
alpha:1.0]
@@ -175,7 +176,7 @@
{
return [[NSAttributedString alloc] initWithString: WIKIGLYPH_CC
attributes: @{
- NSFontAttributeName:
[UIFont fontWithName:@"WikiFont-Glyphs" size:42.0 * MENUS_SCALE_MULTIPLIER],
+ NSFontAttributeName:
[UIFont wmf_glyphFontOfSize:42.0 * MENUS_SCALE_MULTIPLIER],
NSForegroundColorAttributeName : PREVIEW_BLUE_COLOR,
NSBaselineOffsetAttributeName: @1.5
}];
diff --git a/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
b/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
index 08eb1be..4bc50c9 100644
--- a/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
+++ b/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
@@ -6,11 +6,12 @@
#import "NSObject+ConstraintsScale.h"
#import "Defines.h"
#import "WikiGlyph_Chars.h"
+#import "UIFont+WMFStyle.h"
#define FONT_SIZE (16.0f * MENUS_SCALE_MULTIPLIER)
#define FONT_COLOR [UIColor grayColor]
#define ICON_SIZE (20.0f * MENUS_SCALE_MULTIPLIER)
-#define ICON_GLYPH WIKIGLYPH_MAGNIFYING_GLASS
+#define ICON_GLYPH WIKIGLYPH_MAGNIFY_BOLD
#define BORDER_COLOR [UIColor colorWithWhite:0.9 alpha:1.0]
#define MAGNIFY_ICON_COLOR [UIColor colorWithWhite:0.8 alpha:1.0]
@@ -52,7 +53,7 @@
{
return [[NSAttributedString alloc] initWithString: ICON_GLYPH
attributes: @{
- NSFontAttributeName:
[UIFont fontWithName:@"WikiFont-Glyphs" size:ICON_SIZE],
+ NSFontAttributeName:
[UIFont wmf_glyphFontOfSize:ICON_SIZE],
NSForegroundColorAttributeName : MAGNIFY_ICON_COLOR,
NSBaselineOffsetAttributeName: @0
}];
diff --git a/wikipedia/View Controllers/References/ReferencesVC.m
b/wikipedia/View Controllers/References/ReferencesVC.m
index a5d7017..a91ab3a 100644
--- a/wikipedia/View Controllers/References/ReferencesVC.m
+++ b/wikipedia/View Controllers/References/ReferencesVC.m
@@ -6,7 +6,6 @@
#import "WikiGlyphButton.h"
#import "WikiGlyphLabel.h"
#import "WikiGlyph_Chars.h"
-#import "WikiGlyph_Chars_iOS.h"
#import "WebViewController.h"
#import "WikipediaAppUtils.h"
#import "UIView+Debugging.h"
@@ -127,7 +126,7 @@
self.nextButton = [[WikiGlyphButton alloc] init];
self.nextButton.translatesAutoresizingMaskIntoConstraints = NO;
- [self.nextButton.label setWikiText: isRTL ? IOS_WIKIGLYPH_BACKWARD :
IOS_WIKIGLYPH_FORWARD
+ [self.nextButton.label setWikiText: isRTL ? WIKIGLYPH_BACKWARD :
WIKIGLYPH_FORWARD
color: [UIColor darkGrayColor]
size: 24.0 * MENUS_SCALE_MULTIPLIER
baselineOffset: 2.0];
@@ -136,7 +135,7 @@
self.prevButton = [[WikiGlyphButton alloc] init];
self.prevButton.translatesAutoresizingMaskIntoConstraints = NO;
- [self.prevButton.label setWikiText: isRTL ? IOS_WIKIGLYPH_FORWARD :
IOS_WIKIGLYPH_BACKWARD
+ [self.prevButton.label setWikiText: isRTL ? WIKIGLYPH_FORWARD :
WIKIGLYPH_BACKWARD
color: [UIColor darkGrayColor]
size: 24.0 * MENUS_SCALE_MULTIPLIER
baselineOffset: 2.0];
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index e8a3f4d..0cc2c42 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -45,7 +45,6 @@
#import "NSArray+Predicate.h"
#import "WikiGlyphButton.h"
#import "WikiGlyphLabel.h"
-#import "WikiGlyph_Chars_iOS.h"
#import "NSString+FormattedAttributedString.h"
#import "SavedPagesFunnel.h"
#import "ArticleFetcher.h"
@@ -53,6 +52,7 @@
#import "LeadImageContainer.h"
#import "DataMigrationProgressViewController.h"
+#import "UIFont+WMFStyle.h"
//#import "UIView+Debugging.h"
@@ -581,7 +581,7 @@
self.webView.scrollView.contentOffset =
origScrollPosition;
WikiGlyphButton *tocButton =
[ROOT.topMenuViewController getNavBarItem:NAVBAR_BUTTON_TOC];
- [tocButton.label setWikiText:
IOS_WIKIGLYPH_TOC_COLLAPSED
+ [tocButton.label setWikiText:
WIKIGLYPH_TOC_COLLAPSED
color:
tocButton.label.color
size: tocButton.label.size
baselineOffset:
tocButton.label.baselineOffset];
@@ -641,7 +641,7 @@
self.unsafeToToggleTOC = NO;
WikiGlyphButton *tocButton =
[ROOT.topMenuViewController getNavBarItem:NAVBAR_BUTTON_TOC];
- [tocButton.label setWikiText:
IOS_WIKIGLYPH_TOC_EXPANDED
+ [tocButton.label setWikiText: WIKIGLYPH_TOC_EXPANDED
color: tocButton.label.color
size: tocButton.label.size
baselineOffset:
tocButton.label.baselineOffset];
@@ -1079,13 +1079,13 @@
NSString *accessMessage = [NSString stringWithFormat:@"\n%@",
MWLocalizedString(@"share-menu-page-saved-access", nil)];
NSDictionary *d = @{
- NSFontAttributeName: [UIFont
fontWithName:@"WikiFontGlyphs-iOS" size:ALERT_FONT_SIZE],
+ NSFontAttributeName: [UIFont
wmf_glyphFontOfSize:ALERT_FONT_SIZE],
NSBaselineOffsetAttributeName : @2
};
NSAttributedString *attributedAccessMessage =
[accessMessage attributedStringWithAttributes: @{}
- substitutionStrings: @[IOS_WIKIGLYPH_W,
IOS_WIKIGLYPH_HEART]
+ substitutionStrings: @[WIKIGLYPH_W,
WIKIGLYPH_HEART]
substitutionAttributes: @[d, d]];
diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist
index e9c2cf5..c13bee5 100644
--- a/wikipedia/Wikipedia-Info.plist
+++ b/wikipedia/Wikipedia-Info.plist
@@ -28,7 +28,6 @@
<string></string>
<key>UIAppFonts</key>
<array>
- <string>WikiFont-Glyphs-iOS.ttf</string>
<string>WikiFont-Glyphs.ttf</string>
</array>
<key>UIMainStoryboardFile</key>
diff --git a/www/less/langbutton.less b/www/less/langbutton.less
index 82c953d..aae8b95 100644
--- a/www/less/langbutton.less
+++ b/www/less/langbutton.less
@@ -50,7 +50,7 @@
height: 44px;
border-radius: 22px;
- font-family: "WikiFont";
+ font-family: "WikiFont-Glyphs";
font-size: 26px;
color: white;
background-color: #333;
--
To view, visit https://gerrit.wikimedia.org/r/188026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8c51d3f530e07c9da66d65cd82905d152a53f6d
Gerrit-PatchSet: 7
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
Gerrit-Reviewer: Bgerstle <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Fjalapeno <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
