[MediaWiki-commits] [Gerrit] No longer use star icon to avoid future conflict w watchlist. - change (apps...wikipedia)

2014-09-02 Thread Brion VIBBER (Code Review) 
Brion VIBBER has submitted this change and it was merged.

Change subject: No longer use star icon to avoid future conflict w watchlist.
..


No longer use star icon to avoid future conflict w watchlist.

Also bundled font svg conversion scripts.

Removed cruft.

Change-Id: Ib02e9b74d78d523aa491c7a3f1a87b6a7d3b9d19
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Categories/Alerts/UIViewController+Alert.h
M wikipedia/Categories/Alerts/UIViewController+Alert.m
M wikipedia/Defines/WikiGlyph_Chars_iOS.h
M wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
A wikipedia/Fonts/makeFontFromSvgs.py
A wikipedia/Fonts/makeSvgsFromFont.py
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
M wikipedia/MenuLabel/WikiGlyphLabel.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
M wikipedia/assets/abusefilter.css
M wikipedia/assets/preview.css
M wikipedia/assets/styles.css
20 files changed, 380 insertions(+), 137 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index c07e32a..fcc6f92 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1791,7 +1791,6 @@
buildActionMask = 2147483647;
files = (
04D3082C19991CB60034F106 /* 
logo-placeholder-nea...@2x.png in Resources */,
-   0466F44F183A30CC00EA1FD7 /* 
logo-search-placeholder.png in Resources */,
D46CD8C418A1AC4F0042959E /* InfoPlist.strings 
in Resources */,
045EFF1B19A25FEB00D0EDBB /* 
logo-placeholder-sea...@2x.png in Resources */,
D4991454181D51DE00E6073C /* Images.xcassets in 
Resources */,
diff --git a/wikipedia/Categories/Alerts/AlertLabel.m 
b/wikipedia/Categories/Alerts/AlertLabel.m
index 4b0e0c1..ce30f09 100644
--- a/wikipedia/Categories/Alerts/AlertLabel.m
+++ b/wikipedia/Categories/Alerts/AlertLabel.m
@@ -2,6 +2,8 @@
 //  Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license; 
please copy and modify!
 
 #import AlertLabel.h
+#import WMF_Colors.h
+#import Defines.h
 
 @implementation AlertLabel
 
@@ -16,10 +18,10 @@
 self.minimumScaleFactor = 0.2;
 self.font = [UIFont systemFontOfSize:10];
 self.textAlignment = NSTextAlignmentCenter;
-self.textColor = [UIColor darkGrayColor];
+self.textColor = [UIColor colorWithWhite:0.0 alpha:1.0];
 self.numberOfLines = 0;
 self.lineBreakMode = NSLineBreakByWordWrapping;
-self.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
+self.backgroundColor = CHROME_COLOR;
 self.userInteractionEnabled = YES;
 
 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] 
initWithTarget:self action:@selector(tap)];
diff --git a/wikipedia/Categories/Alerts/UIViewController+Alert.h 
b/wikipedia/Categories/Alerts/UIViewController+Alert.h
index 63cbf4f..2004bce 100644
--- a/wikipedia/Categories/Alerts/UIViewController+Alert.h
+++ b/wikipedia/Categories/Alerts/UIViewController+Alert.h
@@ -15,12 +15,4 @@
 
 -(void)hideAlert;
 
-// Shows full screen alert html just beneath the nav bar.
-// Any links open in Safari.
--(void)showHTMLAlert: (NSString *)html
- bannerImage: (UIImage *)bannerImage
- bannerColor: (UIColor *)bannerColor;
-
--(void)hideHTMLAlert;
-
 @end
diff --git a/wikipedia/Categories/Alerts/UIViewController+Alert.m 
b/wikipedia/Categories/Alerts/UIViewController+Alert.m
index 1f1fa59..7fc20ad 100644
--- a/wikipedia/Categories/Alerts/UIViewController+Alert.m
+++ b/wikipedia/Categories/Alerts/UIViewController+Alert.m
@@ -3,7 +3,6 @@
 
 #import UIViewController+Alert.h
 #import AlertLabel.h
-#import AlertWebView.h
 #import UIView+RemoveConstraints.h
 
 @implementation UIViewController (Alert)
@@ -23,6 +22,8 @@
 if (!alertLabel) {
 alertLabel = [[AlertLabel alloc] init];
 alertLabel.translatesAutoresizingMaskIntoConstraints = NO;
+//alertLabel.layer.cornerRadius = 3.0f;
+//alertLabel.clipsToBounds = YES;
 [alertContainer addSubview:alertLabel];
 [self constrainAlertView:alertLabel fullScreen:NO];
 }
@@ -99,61 +100,17 @@
 }
 */
 
--(void)showHTMLAlert: (NSString *)html
-  bannerImage: (UIImage

[MediaWiki-commits] [Gerrit] No longer use star icon to avoid future conflict w watchlist. - change (apps...wikipedia)

2014-08-29 Thread Mhurd (Code Review) 
Mhurd has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/157320

Change subject: No longer use star icon to avoid future conflict w watchlist.
..

No longer use star icon to avoid future conflict w watchlist.

Also bundled font build scripts and svgs.

Removed cruft.

Change-Id: Ib02e9b74d78d523aa491c7a3f1a87b6a7d3b9d19
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Categories/Alerts/UIViewController+Alert.h
M wikipedia/Categories/Alerts/UIViewController+Alert.m
M wikipedia/Defines/WikiGlyph_Chars_iOS.h
A wikipedia/Fonts/Font Svg Import Export/extract/extract.py
A wikipedia/Fonts/Font Svg Import Export/extract/font.ttf
A wikipedia/Fonts/Font Svg Import Export/import/import.py
A wikipedia/Fonts/Font Svg Import Export/import/output/WikiFont-Glyphs-iOS.ttf
A wikipedia/Fonts/Font Svg Import Export/import/output/demo-glyphs.css
A wikipedia/Fonts/Font Svg Import Export/import/output/demo.html
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e950 
IOS_WIKIGLYPH_W 10 10 -155.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e951 
IOS_WIKIGLYPH_SHARE 0 0 -200.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e952 
IOS_WIKIGLYPH_MAGNIFY 0 0 -230.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e953 
IOS_WIKIGLYPH_FORWARD 0 0 -190.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e954 
IOS_WIKIGLYPH_BACKWARD 0 0 -190.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e955 
IOS_WIKIGLYPH_DOWN 0 0 0.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e956 
IOS_WIKIGLYPH_HEART 0 0 -200.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e957 
IOS_WIKIGLYPH_HEART_OUTLINE 0 0 -200.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e958 
IOS_WIKIGLYPH_TOC_COLLAPSED 0 0 -150.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e959 
IOS_WIKIGLYPH_TOC_EXPANDED 0 0 -150.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e95a 
IOS_WIKIGLYPH_RELOAD 0 0 -270.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e95b 
IOS_WIKIGLYPH_STAR 0 0 -220.svg
A wikipedia/Fonts/Font Svg Import Export/import/svgs to import/e95c 
IOS_WIKIGLYPH_STAR_OUTLINE 0 0 -220.svg
M wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
M wikipedia/MenuLabel/WikiGlyphLabel.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
34 files changed, 880 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/20/157320/1

diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index c07e32a..fcc6f92 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1791,7 +1791,6 @@
buildActionMask = 2147483647;
files = (
04D3082C19991CB60034F106 /* 
logo-placeholder-nea...@2x.png in Resources */,
-   0466F44F183A30CC00EA1FD7 /* 
logo-search-placeholder.png in Resources */,
D46CD8C418A1AC4F0042959E /* InfoPlist.strings 
in Resources */,
045EFF1B19A25FEB00D0EDBB /* 
logo-placeholder-sea...@2x.png in Resources */,
D4991454181D51DE00E6073C /* Images.xcassets in 
Resources */,
diff --git a/wikipedia/Categories/Alerts/AlertLabel.m 
b/wikipedia/Categories/Alerts/AlertLabel.m
index 4b0e0c1..ce30f09 100644
--- a/wikipedia/Categories/Alerts/AlertLabel.m
+++ b/wikipedia/Categories/Alerts/AlertLabel.m
@@ -2,6 +2,8 @@
 //  Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license; 
please copy and modify!
 
 #import AlertLabel.h
+#import WMF_Colors.h
+#import Defines.h
 
 @implementation AlertLabel
 
@@ -16,10 +18,10 @@
 self.minimumScaleFactor = 0.2;
 self.font = [UIFont systemFontOfSize:10];
 self.textAlignment = NSTextAlignmentCenter;
-self.textColor = [UIColor darkGrayColor];
+self.textColor = [UIColor colorWithWhite:0.0 alpha:1.0];
 self.numberOfLines = 0;
 self.lineBreakMode = NSLineBreakByWordWrapping;
-self.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
+self.backgroundColor = CHROME_COLOR;
 self.userInteractionEnabled = YES;