Brion VIBBER has submitted this change and it was merged.
Change subject: Removed extra files.
......................................................................
Removed extra files.
Change-Id: I479e1533039c23a3c0b545bdb5abda0617602df6
---
M wikipedia/View Controllers/Navigation/Center/CenterNavController.h
D wikipedia/View Controllers/Navigation/Center/NavBarContainerView.h
D wikipedia/View Controllers/Navigation/Center/NavBarContainerView.m
D wikipedia/View Controllers/Navigation/Center/NavBarTextField.h
D wikipedia/View Controllers/Navigation/Center/NavBarTextField.m
D wikipedia/View Controllers/Navigation/Center/NavButtonLabel.h
D wikipedia/View Controllers/Navigation/Center/NavButtonLabel.m
D wikipedia/View Controllers/Navigation/Center/NavButtonView.h
D wikipedia/View Controllers/Navigation/Center/NavButtonView.m
9 files changed, 1 insertion(+), 224 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
index 7e6ff88..cf28919 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
@@ -27,4 +27,4 @@
@end
-//TODO: maybe use currentNavBarTextFieldText instead of currentSearchString?
+//TODO: maybe use currentTopMenuTextFieldText instead of currentSearchString?
diff --git a/wikipedia/View Controllers/Navigation/Center/NavBarContainerView.h
b/wikipedia/View Controllers/Navigation/Center/NavBarContainerView.h
deleted file mode 100644
index a232121..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavBarContainerView.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Created by Monte Hurd on 2/6/14.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import <UIKit/UIKit.h>
-
-@interface NavBarContainerView : UIView
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavBarContainerView.m
b/wikipedia/View Controllers/Navigation/Center/NavBarContainerView.m
deleted file mode 100644
index d0758e4..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavBarContainerView.m
+++ /dev/null
@@ -1,17 +0,0 @@
-// Created by Monte Hurd on 2/6/14.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import "NavBarContainerView.h"
-
-@implementation NavBarContainerView
-
-- (void)drawRect:(CGRect)rect {
- CGContextRef context = UIGraphicsGetCurrentContext();
- CGContextMoveToPoint(context, CGRectGetMinX(rect), CGRectGetMaxY(rect));
- CGContextAddLineToPoint(context, CGRectGetMaxX(rect), CGRectGetMaxY(rect));
- CGContextSetStrokeColorWithColor(context, [[UIColor lightGrayColor]
CGColor] );
- CGContextSetLineWidth(context, 1.0f / [UIScreen mainScreen].scale);
- CGContextStrokePath(context);
-}
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavBarTextField.h
b/wikipedia/View Controllers/Navigation/Center/NavBarTextField.h
deleted file mode 100644
index 0e48205..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavBarTextField.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Created by Monte Hurd on 11/23/13.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import <UIKit/UIKit.h>
-
-@interface NavBarTextField : UITextField
-
-@property(nonatomic, copy) NSString *placeholder;
-@property(nonatomic, strong) UIColor *placeholderColor;
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavBarTextField.m
b/wikipedia/View Controllers/Navigation/Center/NavBarTextField.m
deleted file mode 100644
index ccb5735..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavBarTextField.m
+++ /dev/null
@@ -1,77 +0,0 @@
-// Created by Monte Hurd on 11/23/13.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import "NavBarTextField.h"
-#import "Defines.h"
-
-@implementation NavBarTextField
-
-@synthesize placeholder = _placeholder;
-@synthesize placeholderColor = _placeholderColor;
-
-- (id)initWithFrame:(CGRect)frame
-{
- self = [super initWithFrame:frame];
- if (self) {
- self.placeholderColor = SEARCH_FIELD_PLACEHOLDER_TEXT_COLOR;
- }
- return self;
-}
-
-// Adds left padding without messing up leftView or rightView.
-// From: http://stackoverflow.com/a/14357720
-
-- (CGRect)textRectForBounds:(CGRect)bounds {
- CGRect ret = [super textRectForBounds:bounds];
- ret.origin.x = ret.origin.x + 10;
- ret.size.width = ret.size.width - 20;
- return ret;
-}
-
-- (CGRect)editingRectForBounds:(CGRect)bounds {
- return [self textRectForBounds:bounds];
-}
-
--(void)setPlaceholder:(NSString *)placeholder
-{
- _placeholder = placeholder;
- self.attributedPlaceholder = [self
getAttributedPlaceholderForString:(!placeholder) ? @"": placeholder];
-}
-
--(void)setPlaceholderColor:(UIColor *)placeholderColor
-{
- _placeholderColor = placeholderColor;
- self.placeholder = self.placeholder;
-}
-
--(NSAttributedString *)getAttributedPlaceholderForString:(NSString *)string
-{
- NSMutableAttributedString *str = [[NSMutableAttributedString alloc]
initWithString:string];
-
- [str addAttribute:NSFontAttributeName
- value:SEARCH_FONT_HIGHLIGHTED
- range:NSMakeRange(0, str.length)];
-
- [str addAttribute:NSForegroundColorAttributeName
- value:self.placeholderColor
- range:NSMakeRange(0, str.length)];
-
- return str;
-}
-
-/*
-// Draw separator line at bottom for iOS 6.
-
-- (void)drawRect:(CGRect)rect {
- if (NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_6_1) {
- CGContextRef context = UIGraphicsGetCurrentContext();
- CGContextMoveToPoint(context, CGRectGetMinX(rect),
CGRectGetMaxY(rect));
- CGContextAddLineToPoint(context, CGRectGetMaxX(rect),
CGRectGetMaxY(rect));
- CGContextSetStrokeColorWithColor(context, [[UIColor lightGrayColor]
CGColor] );
- CGContextSetLineWidth(context, 1.0);
- CGContextStrokePath(context);
- }
-}
-*/
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavButtonLabel.h
b/wikipedia/View Controllers/Navigation/Center/NavButtonLabel.h
deleted file mode 100644
index fafa97a..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavButtonLabel.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Created by Monte Hurd on 4/27/14.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import "PaddedLabel.h"
-
-@interface NavButtonLabel : PaddedLabel
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavButtonLabel.m
b/wikipedia/View Controllers/Navigation/Center/NavButtonLabel.m
deleted file mode 100644
index a605799..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavButtonLabel.m
+++ /dev/null
@@ -1,33 +0,0 @@
-// Created by Monte Hurd on 4/27/14.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import "NavButtonLabel.h"
-
-@implementation NavButtonLabel
-
-- (instancetype)init
-{
- self = [super init];
- if (self) {
- self.textAlignment = NSTextAlignmentCenter;
- self.adjustsFontSizeToFitWidth = YES;
- self.backgroundColor = [UIColor clearColor];
- }
- return self;
-}
-
--(void)setText:(NSString *)text
-{
- NSDictionary *attributes =
- @{
- NSFontAttributeName: [UIFont fontWithName:@"WikiFont-Regular" size:34],
- NSForegroundColorAttributeName : [UIColor blackColor],
- NSBaselineOffsetAttributeName: @2
- };
-
- self.attributedText =
- [[NSAttributedString alloc] initWithString: text
- attributes: attributes];
-}
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavButtonView.h
b/wikipedia/View Controllers/Navigation/Center/NavButtonView.h
deleted file mode 100644
index 140c87d..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavButtonView.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Created by Monte Hurd on 4/27/14.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import <UIKit/UIKit.h>
-
-@class NavButtonLabel;
-
-@interface NavButtonView : UIView
-
-@property (strong, nonatomic) NavButtonLabel *label;
-
-@property (strong, nonatomic) UIColor *color;
-
-@end
diff --git a/wikipedia/View Controllers/Navigation/Center/NavButtonView.m
b/wikipedia/View Controllers/Navigation/Center/NavButtonView.m
deleted file mode 100644
index 228baeb..0000000
--- a/wikipedia/View Controllers/Navigation/Center/NavButtonView.m
+++ /dev/null
@@ -1,55 +0,0 @@
-// Created by Monte Hurd on 4/27/14.
-// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
-
-#import "NavButtonView.h"
-#import "NavButtonLabel.h"
-
-@implementation NavButtonView
-
-- (instancetype)init
-{
- self = [super init];
- if (self) {
- self.clipsToBounds = YES;
- self.label = [[NavButtonLabel alloc] init];
- self.label.translatesAutoresizingMaskIntoConstraints = NO;
- [self addSubview:self.label];
- [self constrainLabel];
- }
- return self;
-}
-
--(void)setColor:(UIColor *)color
-{
- [self.label setTextColor:color];
-}
-
--(void)constrainLabel
-{
- NSDictionary *metrics = @{
- };
-
- NSDictionary *views = @{
- @"label": self.label
- };
-
- NSArray *constraintArrays = @
- [
-
- [NSLayoutConstraint constraintsWithVisualFormat: @"H:|[label]|"
- options: 0
- metrics: metrics
- views: views],
-
- [NSLayoutConstraint constraintsWithVisualFormat: @"V:|[label]|"
- options: 0
- metrics: metrics
- views: views]
-
- ];
-
- [self addConstraints:[constraintArrays
valueForKeyPath:@"@unionOfArrays.self"]];
-
-}
-
-@end
--
To view, visit https://gerrit.wikimedia.org/r/133861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I479e1533039c23a3c0b545bdb5abda0617602df6
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
