Brion VIBBER has submitted this change and it was merged.
Change subject: Wikifont now used for main menu icons.
......................................................................
Wikifont now used for main menu icons.
So many fewer pngs! :)
Change-Id: I9f55eef4a6d8d7f08471a41025c78bdc0c8dab4f
---
M Wikipedia.xcodeproj/project.pbxproj
D wikipedia/Images/main_menu_bookmark_white.png
D wikipedia/Images/main_menu_bookmark_wh...@2x.png
D wikipedia/Images/main_menu_clock_white.png
D wikipedia/Images/main_menu_clock_wh...@2x.png
D wikipedia/Images/main_menu_dice_white.png
D wikipedia/Images/main_menu_dice_wh...@2x.png
D wikipedia/Images/main_menu_envelope_white.png
D wikipedia/Images/main_menu_envelope_wh...@2x.png
D wikipedia/Images/main_menu_face_sleep_white.png
D wikipedia/Images/main_menu_face_sleep_wh...@2x.png
D wikipedia/Images/main_menu_face_smile_white.png
D wikipedia/Images/main_menu_face_smile_wh...@2x.png
D wikipedia/Images/main_menu_flag_white.png
D wikipedia/Images/main_menu_flag_wh...@2x.png
D wikipedia/Images/main_menu_foreign_characters_gray.png
D wikipedia/Images/main_menu_foreign_characters_g...@2x.png
D wikipedia/Images/main_menu_gear_white.png
D wikipedia/Images/main_menu_gear_wh...@2x.png
D wikipedia/Images/main_menu_save.png
D wikipedia/Images/main_menu_s...@2x.png
M wikipedia/View Controllers/MainMenu/MainMenuRowView.h
M wikipedia/View Controllers/MainMenu/MainMenuRowView.m
M wikipedia/View Controllers/MainMenu/MainMenuRowView.xib
M wikipedia/View Controllers/MainMenu/MainMenuViewController.m
25 files changed, 55 insertions(+), 148 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 708eaee..d9e7786 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -51,24 +51,6 @@
0433542618A093C5009305F0 /* UIView+RemoveConstraints.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0433542518A093C5009305F0 /*
UIView+RemoveConstraints.m */; };
0433543518A1A7AE009305F0 /* NavBarTextField.m in Sources */ =
{isa = PBXBuildFile; fileRef = 0433542E18A1A7AE009305F0 /* NavBarTextField.m
*/; };
0433543718A1A7AE009305F0 /* NavController.m in Sources */ =
{isa = PBXBuildFile; fileRef = 0433543018A1A7AE009305F0 /* NavController.m */;
};
- 043649C018E2573E00B528DB /* main_menu_bookmark_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649AE18E2573E00B528DB /*
main_menu_bookmark_white.png */; };
- 043649C218E2573E00B528DB /* main_menu_bookmark_wh...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649AF18E2573E00B528DB /*
main_menu_bookmark_wh...@2x.png */; };
- 043649C418E2573E00B528DB /* main_menu_clock_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B018E2573E00B528DB /*
main_menu_clock_white.png */; };
- 043649C618E2573E00B528DB /* main_menu_clock_wh...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B118E2573E00B528DB /*
main_menu_clock_wh...@2x.png */; };
- 043649C818E2573E00B528DB /* main_menu_dice_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B218E2573E00B528DB /*
main_menu_dice_white.png */; };
- 043649CA18E2573E00B528DB /* main_menu_dice_wh...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B318E2573E00B528DB /*
main_menu_dice_wh...@2x.png */; };
- 043649CC18E2573E00B528DB /* main_menu_envelope_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B418E2573E00B528DB /*
main_menu_envelope_white.png */; };
- 043649CE18E2573E00B528DB /* main_menu_envelope_wh...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B518E2573E00B528DB /*
main_menu_envelope_wh...@2x.png */; };
- 043649D018E2573E00B528DB /* main_menu_face_sleep_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B618E2573E00B528DB /*
main_menu_face_sleep_white.png */; };
- 043649D218E2573E00B528DB /* main_menu_face_sleep_wh...@2x.png
in Resources */ = {isa = PBXBuildFile; fileRef = 043649B718E2573E00B528DB /*
main_menu_face_sleep_wh...@2x.png */; };
- 043649D418E2573E00B528DB /* main_menu_face_smile_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649B818E2573E00B528DB /*
main_menu_face_smile_white.png */; };
- 043649D618E2573E00B528DB /* main_menu_face_smile_wh...@2x.png
in Resources */ = {isa = PBXBuildFile; fileRef = 043649B918E2573E00B528DB /*
main_menu_face_smile_wh...@2x.png */; };
- 043649D818E2573E00B528DB /*
main_menu_foreign_characters_gray.png in Resources */ = {isa = PBXBuildFile;
fileRef = 043649BA18E2573E00B528DB /* main_menu_foreign_characters_gray.png */;
};
- 043649DA18E2573E00B528DB /*
main_menu_foreign_characters_g...@2x.png in Resources */ = {isa = PBXBuildFile;
fileRef = 043649BB18E2573E00B528DB /* main_menu_foreign_characters_g...@2x.png
*/; };
- 043649DC18E2573E00B528DB /* main_menu_gear_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649BC18E2573E00B528DB /*
main_menu_gear_white.png */; };
- 043649DE18E2573E00B528DB /* main_menu_gear_wh...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 043649BD18E2573E00B528DB /*
main_menu_gear_wh...@2x.png */; };
- 043649E018E2573E00B528DB /* main_menu_save.png in Resources */
= {isa = PBXBuildFile; fileRef = 043649BE18E2573E00B528DB /* main_menu_save.png
*/; };
- 043649E218E2573E00B528DB /* main_menu_s...@2x.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 043649BF18E2573E00B528DB /*
main_menu_s...@2x.png */; };
043C668A18BE9A8E00580E9B /* PreviewWikiTextOp.m in Sources */ =
{isa = PBXBuildFile; fileRef = 043C668918BE9A8E00580E9B /* PreviewWikiTextOp.m
*/; };
043DAC4B1901C3EE001CD17C /* CreditsViewController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 043DAC4A1901C3EE001CD17C /*
CreditsViewController.m */; };
043F18E118D9691D00D8489A /* TopActionSheetLabel.m in Sources */
= {isa = PBXBuildFile; fileRef = 043F18DC18D9691D00D8489A /*
TopActionSheetLabel.m */; };
@@ -126,8 +108,6 @@
04B6925018E77B2A00F88D8A /* UIWebView+HideScrollGradient.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04B6924F18E77B2A00F88D8A /*
UIWebView+HideScrollGradient.m */; };
04B78A5318A580AF0050EBF5 /* LoginOp.m in Sources */ = {isa =
PBXBuildFile; fileRef = 04B78A5218A580AF0050EBF5 /* LoginOp.m */; };
04B7B9BD18B5570E00A63551 /* CaptchaViewController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 04B7B9BC18B5570E00A63551 /*
CaptchaViewController.m */; };
- 04B91AA118E26C9E00FFAA1C /* main_menu_flag_white.png in
Resources */ = {isa = PBXBuildFile; fileRef = 04B91A9F18E26C9E00FFAA1C /*
main_menu_flag_white.png */; };
- 04B91AA318E26C9E00FFAA1C /* main_menu_flag_wh...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = 04B91AA018E26C9E00FFAA1C /*
main_menu_flag_wh...@2x.png */; };
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 */;
};
04B91AAE18E4056D00FFAA1C /* MainMenuRowView.xib in Resources */
= {isa = PBXBuildFile; fileRef = 04B91AAD18E4056D00FFAA1C /*
MainMenuRowView.xib */; };
@@ -267,24 +247,6 @@
0433542E18A1A7AE009305F0 /* NavBarTextField.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= NavBarTextField.m; sourceTree = "<group>"; };
0433542F18A1A7AE009305F0 /* NavController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
NavController.h; sourceTree = "<group>"; };
0433543018A1A7AE009305F0 /* NavController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= NavController.m; sourceTree = "<group>"; };
- 043649AE18E2573E00B528DB /* main_menu_bookmark_white.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
main_menu_bookmark_white.png; sourceTree = "<group>"; };
- 043649AF18E2573E00B528DB /* main_menu_bookmark_wh...@2x.png */
= {isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_bookmark_wh...@2x.png"; sourceTree = "<group>"; };
- 043649B018E2573E00B528DB /* main_menu_clock_white.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; path =
main_menu_clock_white.png; sourceTree = "<group>"; };
- 043649B118E2573E00B528DB /* main_menu_clock_wh...@2x.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_clock_wh...@2x.png"; sourceTree = "<group>"; };
- 043649B218E2573E00B528DB /* main_menu_dice_white.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; path =
main_menu_dice_white.png; sourceTree = "<group>"; };
- 043649B318E2573E00B528DB /* main_menu_dice_wh...@2x.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_dice_wh...@2x.png"; sourceTree = "<group>"; };
- 043649B418E2573E00B528DB /* main_menu_envelope_white.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
main_menu_envelope_white.png; sourceTree = "<group>"; };
- 043649B518E2573E00B528DB /* main_menu_envelope_wh...@2x.png */
= {isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_envelope_wh...@2x.png"; sourceTree = "<group>"; };
- 043649B618E2573E00B528DB /* main_menu_face_sleep_white.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
main_menu_face_sleep_white.png; sourceTree = "<group>"; };
- 043649B718E2573E00B528DB /* main_menu_face_sleep_wh...@2x.png
*/ = {isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_face_sleep_wh...@2x.png"; sourceTree = "<group>"; };
- 043649B818E2573E00B528DB /* main_menu_face_smile_white.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
main_menu_face_smile_white.png; sourceTree = "<group>"; };
- 043649B918E2573E00B528DB /* main_menu_face_smile_wh...@2x.png
*/ = {isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_face_smile_wh...@2x.png"; sourceTree = "<group>"; };
- 043649BA18E2573E00B528DB /*
main_menu_foreign_characters_gray.png */ = {isa = PBXFileReference;
lastKnownFileType = image.png; path = main_menu_foreign_characters_gray.png;
sourceTree = "<group>"; };
- 043649BB18E2573E00B528DB /*
main_menu_foreign_characters_g...@2x.png */ = {isa = PBXFileReference;
lastKnownFileType = image.png; path =
"main_menu_foreign_characters_g...@2x.png"; sourceTree = "<group>"; };
- 043649BC18E2573E00B528DB /* main_menu_gear_white.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; path =
main_menu_gear_white.png; sourceTree = "<group>"; };
- 043649BD18E2573E00B528DB /* main_menu_gear_wh...@2x.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_gear_wh...@2x.png"; sourceTree = "<group>"; };
- 043649BE18E2573E00B528DB /* main_menu_save.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = main_menu_save.png;
sourceTree = "<group>"; };
- 043649BF18E2573E00B528DB /* main_menu_s...@2x.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_s...@2x.png"; sourceTree = "<group>"; };
043C668818BE9A8E00580E9B /* PreviewWikiTextOp.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
PreviewWikiTextOp.h; sourceTree = "<group>"; };
043C668918BE9A8E00580E9B /* PreviewWikiTextOp.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= PreviewWikiTextOp.m; sourceTree = "<group>"; };
043DAC491901C3EE001CD17C /* CreditsViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
CreditsViewController.h; sourceTree = "<group>"; };
@@ -382,8 +344,6 @@
04B78A5218A580AF0050EBF5 /* LoginOp.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= LoginOp.m; sourceTree = "<group>"; };
04B7B9BB18B5570E00A63551 /* CaptchaViewController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
CaptchaViewController.h; sourceTree = "<group>"; };
04B7B9BC18B5570E00A63551 /* CaptchaViewController.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= CaptchaViewController.m; sourceTree = "<group>"; };
- 04B91A9F18E26C9E00FFAA1C /* main_menu_flag_white.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; path =
main_menu_flag_white.png; sourceTree = "<group>"; };
- 04B91AA018E26C9E00FFAA1C /* main_menu_flag_wh...@2x.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; path =
"main_menu_flag_wh...@2x.png"; sourceTree = "<group>"; };
04B91AA518E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = "UIView+TemporaryAnimatedXF.h"; sourceTree = "<group>"; };
04B91AA618E34BBC00FFAA1C /* UIView+TemporaryAnimatedXF.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = "UIView+TemporaryAnimatedXF.m"; sourceTree =
"<group>"; };
04B91AA918E3D9E200FFAA1C /*
NSString+FormattedAttributedString.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; path =
"NSString+FormattedAttributedString.h"; sourceTree = "<group>"; };
@@ -859,26 +819,6 @@
0447864C185159700050563B /* history-l...@2x.png
*/,
0447864D185159700050563B /* history-random.png
*/,
0447864E185159700050563B /*
history-ran...@2x.png */,
- 043649AE18E2573E00B528DB /*
main_menu_bookmark_white.png */,
- 043649AF18E2573E00B528DB /*
main_menu_bookmark_wh...@2x.png */,
- 043649B018E2573E00B528DB /*
main_menu_clock_white.png */,
- 043649B118E2573E00B528DB /*
main_menu_clock_wh...@2x.png */,
- 043649B218E2573E00B528DB /*
main_menu_dice_white.png */,
- 043649B318E2573E00B528DB /*
main_menu_dice_wh...@2x.png */,
- 043649B418E2573E00B528DB /*
main_menu_envelope_white.png */,
- 043649B518E2573E00B528DB /*
main_menu_envelope_wh...@2x.png */,
- 04B91A9F18E26C9E00FFAA1C /*
main_menu_flag_white.png */,
- 04B91AA018E26C9E00FFAA1C /*
main_menu_flag_wh...@2x.png */,
- 043649B618E2573E00B528DB /*
main_menu_face_sleep_white.png */,
- 043649B718E2573E00B528DB /*
main_menu_face_sleep_wh...@2x.png */,
- 043649B818E2573E00B528DB /*
main_menu_face_smile_white.png */,
- 043649B918E2573E00B528DB /*
main_menu_face_smile_wh...@2x.png */,
- 043649BA18E2573E00B528DB /*
main_menu_foreign_characters_gray.png */,
- 043649BB18E2573E00B528DB /*
main_menu_foreign_characters_g...@2x.png */,
- 043649BC18E2573E00B528DB /*
main_menu_gear_white.png */,
- 043649BD18E2573E00B528DB /*
main_menu_gear_wh...@2x.png */,
- 043649BE18E2573E00B528DB /* main_menu_save.png
*/,
- 043649BF18E2573E00B528DB /*
main_menu_s...@2x.png */,
0466F44D183A30CC00EA1FD7 /*
logo-search-placeholder.png */,
0466F44E183A30CC00EA1FD7 /*
logo-search-placehol...@2x.png */,
04090A32187F53E400577EDF /* clear.png */,
@@ -1464,32 +1404,23 @@
files = (
0412362A189C29EA00E0CF8E /*
abuse-filter-check.png in Resources */,
D469889518B52DA200DBE014 /* Main_iPhone.strings
in Resources */,
- 043649DC18E2573E00B528DB /*
main_menu_gear_white.png in Resources */,
04CF1CB6187C8F4400E9516F /* Languages in
Resources */,
042C6FBF18A350C2003712D7 /*
button_arrow_ri...@2x.png in Resources */,
04478653185159700050563B /* history-link.png in
Resources */,
- 043649C818E2573E00B528DB /*
main_menu_dice_white.png in Resources */,
- 043649E218E2573E00B528DB /*
main_menu_s...@2x.png in Resources */,
042C6FC318A350C2003712D7 /*
button_cancel_g...@2x.png in Resources */,
0466F44F183A30CC00EA1FD7 /*
logo-search-placeholder.png in Resources */,
- 043649DA18E2573E00B528DB /*
main_menu_foreign_characters_g...@2x.png in Resources */,
- 043649C418E2573E00B528DB /*
main_menu_clock_white.png in Resources */,
D46CD8C418A1AC4F0042959E /* InfoPlist.strings
in Resources */,
- 043649CE18E2573E00B528DB /*
main_menu_envelope_wh...@2x.png in Resources */,
04478655185159700050563B /* history-l...@2x.png
in Resources */,
- 043649C218E2573E00B528DB /*
main_menu_bookmark_wh...@2x.png in Resources */,
D4991454181D51DE00E6073C /* Images.xcassets in
Resources */,
D499144C181D51DE00E6073C /*
Main_iPhone.storyboard in Resources */,
D46CD8C518A1AC4F0042959E /* Localizable.strings
in Resources */,
04082B5318ADA25A00FAF3D6 /*
text_field_x_circle_gray.png in Resources */,
048A266D1905E12E00395F53 /*
PreviewChoicesMenuView.xib in Resources */,
042C6FBB18A350C2003712D7 /*
button_arrow_l...@2x.png in Resources */,
- 043649E018E2573E00B528DB /* main_menu_save.png
in Resources */,
04478631185145090050563B /*
HistoryResultPrototypeView.xib in Resources */,
04478659185159700050563B /*
history-ran...@2x.png in Resources */,
042C6FC718A350C2003712D7 /*
button_preview_wh...@2x.png in Resources */,
04F27B7618FE0F2E00EDD838 /*
PageHistoryResultPrototypeView.xib in Resources */,
- 04B91AA318E26C9E00FFAA1C /*
main_menu_flag_wh...@2x.png in Resources */,
04292FF4185FBA70002A13FC /*
SearchResultPrototypeView.xib in Resources */,
C9928B8818AD5E1000FCCA9A /* Settings.bundle in
Resources */,
04123632189C29EA00E0CF8E /*
abuse-filter-edit-black.png in Resources */,
@@ -1498,34 +1429,23 @@
043F18EF18DA3D9B00D8489A /*
button_cc_bl...@2x.png in Resources */,
04A47629183EF835009C0D82 /* w.png in Resources
*/,
04123630189C29EA00E0CF8E /*
abuse-filter-disallo...@2x.png in Resources */,
- 043649D418E2573E00B528DB /*
main_menu_face_smile_white.png in Resources */,
04123634189C29EA00E0CF8E /*
abuse-filter-edit-bl...@2x.png in Resources */,
042C6FC118A350C2003712D7 /*
button_cancel_grey.png in Resources */,
- 043649C018E2573E00B528DB /*
main_menu_bookmark_white.png in Resources */,
D4BC22B4181E9E6300CAC673 /* empty.png in
Resources */,
04123636189C29EA00E0CF8E /*
abuse-filter-flag-white.png in Resources */,
- 043649CC18E2573E00B528DB /*
main_menu_envelope_white.png in Resources */,
04B91AAE18E4056D00FFAA1C /* MainMenuRowView.xib
in Resources */,
04090A33187F53E400577EDF /* clear.png in
Resources */,
- 043649CA18E2573E00B528DB /*
main_menu_dice_wh...@2x.png in Resources */,
0412362E189C29EA00E0CF8E /*
abuse-filter-disallowed.png in Resources */,
04478645185155750050563B /* history-search.png
in Resources */,
043F18ED18DA3D9B00D8489A /* button_cc_black.png
in Resources */,
- 043649DE18E2573E00B528DB /*
main_menu_gear_wh...@2x.png in Resources */,
- 043649D618E2573E00B528DB /*
main_menu_face_smile_wh...@2x.png in Resources */,
0412362C189C29EA00E0CF8E /*
abuse-filter-ch...@2x.png in Resources */,
0442F57E190071A100F55DF9 /* WikiFont.ttf in
Resources */,
- 043649D818E2573E00B528DB /*
main_menu_foreign_characters_gray.png in Resources */,
- 04B91AA118E26C9E00FFAA1C /*
main_menu_flag_white.png in Resources */,
04082B5518ADA25A00FAF3D6 /*
text_field_x_circle_g...@2x.png in Resources */,
04478651185159700050563B /*
history-exter...@2x.png in Resources */,
0447864F185159700050563B /*
history-external.png in Resources */,
042C6FBD18A350C2003712D7 /*
button_arrow_right.png in Resources */,
- 043649D018E2573E00B528DB /*
main_menu_face_sleep_white.png in Resources */,
0466F450183A30CC00EA1FD7 /*
logo-search-placehol...@2x.png in Resources */,
04478647185155750050563B /*
history-sea...@2x.png in Resources */,
- 043649C618E2573E00B528DB /*
main_menu_clock_wh...@2x.png in Resources */,
- 043649D218E2573E00B528DB /*
main_menu_face_sleep_wh...@2x.png in Resources */,
045A9F0D18F6090E0057EA85 /* assets in Resources
*/,
042C6FC518A350C2003712D7 /*
button_preview_white.png in Resources */,
04478657185159700050563B /* history-random.png
in Resources */,
diff --git a/wikipedia/Images/main_menu_bookmark_white.png
b/wikipedia/Images/main_menu_bookmark_white.png
deleted file mode 100644
index fa4f904..0000000
--- a/wikipedia/Images/main_menu_bookmark_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_bookmark_wh...@2x.png
b/wikipedia/Images/main_menu_bookmark_wh...@2x.png
deleted file mode 100644
index 2019f11..0000000
--- a/wikipedia/Images/main_menu_bookmark_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_clock_white.png
b/wikipedia/Images/main_menu_clock_white.png
deleted file mode 100644
index 3893ffb..0000000
--- a/wikipedia/Images/main_menu_clock_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_clock_wh...@2x.png
b/wikipedia/Images/main_menu_clock_wh...@2x.png
deleted file mode 100644
index a1983b3..0000000
--- a/wikipedia/Images/main_menu_clock_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_dice_white.png
b/wikipedia/Images/main_menu_dice_white.png
deleted file mode 100644
index 12da418..0000000
--- a/wikipedia/Images/main_menu_dice_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_dice_wh...@2x.png
b/wikipedia/Images/main_menu_dice_wh...@2x.png
deleted file mode 100644
index 4717fe3..0000000
--- a/wikipedia/Images/main_menu_dice_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_envelope_white.png
b/wikipedia/Images/main_menu_envelope_white.png
deleted file mode 100644
index 752cafb..0000000
--- a/wikipedia/Images/main_menu_envelope_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_envelope_wh...@2x.png
b/wikipedia/Images/main_menu_envelope_wh...@2x.png
deleted file mode 100644
index ee40eea..0000000
--- a/wikipedia/Images/main_menu_envelope_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_face_sleep_white.png
b/wikipedia/Images/main_menu_face_sleep_white.png
deleted file mode 100644
index b52b3df..0000000
--- a/wikipedia/Images/main_menu_face_sleep_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_face_sleep_wh...@2x.png
b/wikipedia/Images/main_menu_face_sleep_wh...@2x.png
deleted file mode 100644
index ddd1b57..0000000
--- a/wikipedia/Images/main_menu_face_sleep_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_face_smile_white.png
b/wikipedia/Images/main_menu_face_smile_white.png
deleted file mode 100644
index eb505c3..0000000
--- a/wikipedia/Images/main_menu_face_smile_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_face_smile_wh...@2x.png
b/wikipedia/Images/main_menu_face_smile_wh...@2x.png
deleted file mode 100644
index a8b9f39..0000000
--- a/wikipedia/Images/main_menu_face_smile_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_flag_white.png
b/wikipedia/Images/main_menu_flag_white.png
deleted file mode 100644
index c17e1f5..0000000
--- a/wikipedia/Images/main_menu_flag_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_flag_wh...@2x.png
b/wikipedia/Images/main_menu_flag_wh...@2x.png
deleted file mode 100644
index 8458fdd..0000000
--- a/wikipedia/Images/main_menu_flag_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_foreign_characters_gray.png
b/wikipedia/Images/main_menu_foreign_characters_gray.png
deleted file mode 100644
index 3454f02..0000000
--- a/wikipedia/Images/main_menu_foreign_characters_gray.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_foreign_characters_g...@2x.png
b/wikipedia/Images/main_menu_foreign_characters_g...@2x.png
deleted file mode 100644
index 34359dd..0000000
--- a/wikipedia/Images/main_menu_foreign_characters_g...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_gear_white.png
b/wikipedia/Images/main_menu_gear_white.png
deleted file mode 100644
index 56c0737..0000000
--- a/wikipedia/Images/main_menu_gear_white.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_gear_wh...@2x.png
b/wikipedia/Images/main_menu_gear_wh...@2x.png
deleted file mode 100644
index 5287ec3..0000000
--- a/wikipedia/Images/main_menu_gear_wh...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_save.png
b/wikipedia/Images/main_menu_save.png
deleted file mode 100644
index 9a1e118..0000000
--- a/wikipedia/Images/main_menu_save.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images/main_menu_s...@2x.png
b/wikipedia/Images/main_menu_s...@2x.png
deleted file mode 100644
index d3f4570..0000000
--- a/wikipedia/Images/main_menu_s...@2x.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/View Controllers/MainMenu/MainMenuRowView.h
b/wikipedia/View Controllers/MainMenu/MainMenuRowView.h
index 2b860a1..1f60dcb 100644
--- a/wikipedia/View Controllers/MainMenu/MainMenuRowView.h
+++ b/wikipedia/View Controllers/MainMenu/MainMenuRowView.h
@@ -6,9 +6,8 @@
@interface MainMenuRowView : UIView
@property (strong, nonatomic) IBOutlet UILabel *textLabel;
-@property (strong, nonatomic) IBOutlet UIImageView *thumbnailImageView;
+@property (strong, nonatomic) IBOutlet UILabel *iconLabel;
-@property (strong, nonatomic) NSString *imageName;
@property (nonatomic) BOOL highlighted;
@end
diff --git a/wikipedia/View Controllers/MainMenu/MainMenuRowView.m
b/wikipedia/View Controllers/MainMenu/MainMenuRowView.m
index ab051a0..2e81896 100644
--- a/wikipedia/View Controllers/MainMenu/MainMenuRowView.m
+++ b/wikipedia/View Controllers/MainMenu/MainMenuRowView.m
@@ -2,12 +2,8 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "MainMenuRowView.h"
-#import "UIImage+ColorMask.h"
-#import "QueuesSingleton.h"
@interface MainMenuRowView()
-
-@property (strong, nonatomic) UIColor *imageColor;
@end
@@ -19,31 +15,8 @@
if (self) {
self.translatesAutoresizingMaskIntoConstraints = NO;
self.highlighted = YES;
- self.imageColor = [UIColor clearColor];
}
return self;
-}
-
--(void)setImageName:(NSString *)imageName
-{
- UIColor *rowColor = (self.highlighted) ?
- [UIColor blackColor]
- :
- [UIColor lightGrayColor]
- ;
-
- if (_imageName == imageName){
- if (CGColorEqualToColor(rowColor.CGColor,
self.imageColor.CGColor))return;
- }
-
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0),
^{
- UIImage *image = [[UIImage imageNamed:imageName]
getImageOfColor:rowColor.CGColor];
- dispatch_async(dispatch_get_main_queue(), ^{
- self.thumbnailImageView.image = image;
- });
- });
-
- self.imageColor = rowColor;
}
/*
diff --git a/wikipedia/View Controllers/MainMenu/MainMenuRowView.xib
b/wikipedia/View Controllers/MainMenu/MainMenuRowView.xib
index 1890c0d..3ee7c5f 100644
--- a/wikipedia/View Controllers/MainMenu/MainMenuRowView.xib
+++ b/wikipedia/View Controllers/MainMenu/MainMenuRowView.xib
@@ -11,14 +11,6 @@
<rect key="frame" x="0.0" y="0.0" width="318" height="59"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO"
contentMode="scaleAspectFit" horizontalHuggingPriority="251"
verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO"
id="Z0h-5o-gOE">
- <rect key="frame" x="10" y="6" width="47" height="47"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
- <constraints>
- <constraint firstAttribute="height" constant="47"
id="cUa-Lj-OHi"/>
- <constraint firstAttribute="width" constant="47"
id="mSf-GB-3RW"/>
- </constraints>
- </imageView>
<label opaque="NO" clipsSubviews="YES"
userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251"
verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap"
numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO"
preferredMaxLayoutWidth="233" translatesAutoresizingMaskIntoConstraints="NO"
id="WPC-HU-a4T">
<rect key="frame" x="65" y="1" width="233" height="57"/>
<autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -26,20 +18,30 @@
<color key="textColor"
cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
+ <label opaque="NO" clipsSubviews="YES"
userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251"
verticalHuggingPriority="251" text="X" textAlignment="center"
lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO"
id="cA7-gi-Qv0">
+ <rect key="frame" x="10" y="6" width="47" height="47"/>
+ <autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="47"
id="9Pr-gl-Oz8"/>
+ <constraint firstAttribute="width" constant="47"
id="z3r-eR-8Mr"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system"
pointSize="17"/>
+ <nil key="highlightedColor"/>
+ </label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0"
colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="Z0h-5o-gOE" firstAttribute="leading"
secondItem="iN0-l3-epB" secondAttribute="leading" constant="10"
id="6nL-AU-TSu"/>
- <constraint firstItem="WPC-HU-a4T" firstAttribute="centerY"
secondItem="Z0h-5o-gOE" secondAttribute="centerY" id="csq-77-bti"/>
+ <constraint firstItem="cA7-gi-Qv0" firstAttribute="centerY"
secondItem="WPC-HU-a4T" secondAttribute="centerY" id="1BX-Ct-i1Q"/>
+ <constraint firstItem="WPC-HU-a4T" firstAttribute="leading"
secondItem="cA7-gi-Qv0" secondAttribute="trailing" constant="8" symbolic="YES"
id="VKT-qy-eej"/>
+ <constraint firstItem="cA7-gi-Qv0" firstAttribute="leading"
secondItem="iN0-l3-epB" secondAttribute="leading" constant="10"
id="fgr-qp-h46"/>
<constraint firstItem="WPC-HU-a4T" firstAttribute="top"
secondItem="iN0-l3-epB" secondAttribute="top" constant="1" id="hnC-l4-TFw"/>
- <constraint firstItem="WPC-HU-a4T" firstAttribute="leading"
secondItem="Z0h-5o-gOE" secondAttribute="trailing" constant="8" symbolic="YES"
id="o0F-2w-h8Q"/>
<constraint firstAttribute="bottom" secondItem="WPC-HU-a4T"
secondAttribute="bottom" constant="1" id="roH-8j-kwK"/>
<constraint firstAttribute="trailing" secondItem="WPC-HU-a4T"
secondAttribute="trailing" constant="20" id="xxr-8J-xqL"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
+ <outlet property="iconLabel" destination="cA7-gi-Qv0"
id="cxa-sB-MTo"/>
<outlet property="textLabel" destination="WPC-HU-a4T"
id="Fvl-u9-cgg"/>
- <outlet property="thumbnailImageView" destination="Z0h-5o-gOE"
id="ZH4-bg-ozI"/>
</connections>
</view>
</objects>
diff --git a/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
b/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
index b5983e7..65a4cdc 100644
--- a/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
+++ b/wikipedia/View Controllers/MainMenu/MainMenuViewController.m
@@ -18,7 +18,6 @@
#import "UIViewController+HideKeyboard.h"
#import "UIView+TemporaryAnimatedXF.h"
#import "UIViewController+Alert.h"
-#import "UIImage+ColorMask.h"
#import "NSString+FormattedAttributedString.h"
#import "TabularScrollView.h"
@@ -30,6 +29,9 @@
#define NAV ((NavController *)self.navigationController)
#define BACKGROUND_COLOR [UIColor colorWithWhite:0.97f alpha:1.0f]
+#define MENU_ICON_COLOR [UIColor blackColor]
+#define MENU_ICON_COLOR_DESELECTED [UIColor lightGrayColor];
+#define MENU_ICON_FONT_SIZE 38
typedef enum {
ROW_INDEX_LOGIN = 0,
@@ -181,7 +183,18 @@
rowView.highlighted = ((NSNumber *)row[@"highlighted"]).boolValue;
- rowView.imageName = row[@"imageName"];
+ UIColor *iconColor = rowView.highlighted ? MENU_ICON_COLOR :
MENU_ICON_COLOR_DESELECTED;
+
+ NSDictionary *attributes =
+ @{
+ NSFontAttributeName: [UIFont fontWithName:@"WikiFont-Regular"
size:MENU_ICON_FONT_SIZE],
+ NSForegroundColorAttributeName : iconColor,
+ NSBaselineOffsetAttributeName: @2
+ };
+
+ rowView.iconLabel.attributedText =
+ [[NSAttributedString alloc] initWithString: row[@"icon"]
+ attributes: attributes];
id title = row[@"title"];
if([title isKindOfClass:[NSString class]]){
@@ -219,35 +232,35 @@
@{
@"title": @"",
@"tag": @(ROW_INDEX_LOGIN),
- @"imageName": @"",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@{
@"title": MWLocalizedString(@"main-menu-random", nil),
@"tag": @(ROW_INDEX_RANDOM),
- @"imageName": @"main_menu_dice_white.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@{
@"title": MWLocalizedString(@"main-menu-show-history", nil),
@"tag": @(ROW_INDEX_HISTORY),
- @"imageName": @"main_menu_clock_white.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@{
@"title": MWLocalizedString(@"main-menu-show-saved", nil),
@"tag": @(ROW_INDEX_SAVED_PAGES),
- @"imageName": @"main_menu_bookmark_white.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@{
@"title": saveArticleTitle,
@"tag": @(ROW_INDEX_SAVE_PAGE),
- @"imageName": @"main_menu_save.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@@ -255,28 +268,28 @@
@"domain": [SessionSingleton sharedInstance].domain,
@"title": searchWikiTitle,
@"tag": @(ROW_INDEX_SEARCH_LANGUAGE),
- @"imageName": @"main_menu_foreign_characters_gray.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@{
@"title": MWLocalizedString(@"zero-warn-when-leaving", nil),
@"tag": @(ROW_INDEX_ZERO_WARN_WHEN_LEAVING),
- @"imageName": @"main_menu_flag_white.png",
+ @"icon": @"",
@"highlighted": @([SessionSingleton
sharedInstance].zeroConfigState.warnWhenLeaving),
}.mutableCopy
,
@{
@"title": MWLocalizedString(@"main-menu-send-feedback", nil),
@"tag": @(ROW_INDEX_SEND_FEEDBACK),
- @"imageName": @"main_menu_envelope_white.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@{
@"title": pageHistoryTitle,
@"tag": @(ROW_INDEX_PAGE_HISTORY),
- @"imageName": @"w.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
,
@@ -284,7 +297,7 @@
@"domain": [SessionSingleton sharedInstance].domain,
@"title": MWLocalizedString(@"main-menu-credits", nil),
@"tag": @(ROW_INDEX_CREDITS),
- @"imageName": @"w.png",
+ @"icon": @"",
@"highlighted": @YES,
}.mutableCopy
].mutableCopy;
@@ -300,26 +313,26 @@
-(void)updateLoginRow
{
id loginTitle = nil;
- NSString *loginImageName = nil;
+ NSString *loginIcon = @"";
NSString *userName = [SessionSingleton
sharedInstance].keychainCredentials.userName;
if(userName){
loginTitle = [MWLocalizedString(@"main-menu-account-logout", nil)
stringByAppendingString:@" $1"];
-
+
loginTitle =
[loginTitle attributedStringWithAttributes: nil
- substitutionStrings: @[userName]
- substitutionAttributes:
@[self.highlightedTextAttributes]
+ substitutionStrings: @[userName]
+ substitutionAttributes:
@[self.highlightedTextAttributes]
];
- loginImageName = @"main_menu_face_smile_white.png";
+ loginIcon = @"";
}else{
loginTitle = MWLocalizedString(@"main-menu-account-login", nil);
- loginImageName = @"main_menu_face_sleep_white.png";
+ loginIcon = @"";
}
NSMutableDictionary *row = [self getRowWithTag:ROW_INDEX_LOGIN];
row[@"title"] = loginTitle;
- row[@"imageName"] = loginImageName;
+ row[@"icon"] = loginIcon;
}
#pragma mark - Selection
@@ -415,14 +428,14 @@
NSMutableDictionary *row = [self getRowWithTag:tappedItem.tag];
- NSString *imageName = [row objectForKey:@"imageName"];
-
- if (imageName && (imageName.length > 0) && (animationDuration > 0)) {
- [tappedItem.thumbnailImageView animateAndRewindXF:
CATransform3DMakeScale(animationScale, animationScale, 1.0f)
- afterDelay: 0.0
- duration: animationDuration
- then: performTapAction
- ];
+ NSString *icon = [row objectForKey:@"icon"];
+
+ if (icon && (icon.length > 0) && (animationDuration > 0)) {
+ [tappedItem.iconLabel animateAndRewindXF:
CATransform3DMakeScale(animationScale, animationScale, 1.0f)
+ afterDelay: 0.0
+ duration: animationDuration
+ then: performTapAction
+ ];
}else{
performTapAction();
}
--
To view, visit https://gerrit.wikimedia.org/r/129385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f55eef4a6d8d7f08471a41025c78bdc0c8dab4f
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
